diff -Nru konversation-1.0.1/acinclude.m4 konversation-1.1/acinclude.m4 --- konversation-1.0.1/acinclude.m4 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/acinclude.m4 2008-08-06 16:57:48.000000000 +0100 @@ -983,7 +983,7 @@ X_INCLUDES="-I$x_includes" fi -if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then +if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then X_LDFLAGS="" x_libraries="/usr/lib"; dnl better than nothing :- else @@ -1226,7 +1226,15 @@ kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" fi if test $kde_qtver = 3; then - kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" + kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3" + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`" + fi + fi fi if test $kde_qtver = 2; then kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt" @@ -1443,6 +1451,14 @@ for dir in $kde_qt_dirs; do qt_incdirs="$qt_incdirs $dir/include $dir" done +if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +fi +if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`" + fi +fi qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" if test ! "$ac_qt_includes" = "NO"; then qt_incdirs="$ac_qt_includes $qt_incdirs" @@ -1459,8 +1475,16 @@ qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir" done +if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +fi +if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`" + fi +fi qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then qt_libdir=$ac_qt_libraries @@ -2631,6 +2655,7 @@ AC_TRY_LINK(dnl [ #include +#include ], [ char buf[42]; @@ -2638,7 +2663,7 @@ /* this would segfault.. but we only link, don't run */ (void) gzgets(f, buf, sizeof(buf)); - return (zlibVersion() == ZLIB_VERSION); + return (strcmp(zlibVersion(), ZLIB_VERSION) == 0); ], eval "ac_cv_lib_z='-lz'", eval "ac_cv_lib_z=no") @@ -2738,11 +2763,11 @@ echo "*** to the full path to pkg-config." echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." else - if !(`$PKG_CONFIG --exists OpenEXR`) ; then + if ! $PKG_CONFIG --exists OpenEXR ; then AC_MSG_RESULT(no) EXRSTATUS=no else - if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then + if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then AC_MSG_RESULT(no) EXRSTATUS=old else @@ -3198,7 +3223,7 @@ case $host in *-*-linux-gnu) CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" - CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS" + CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"]) KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"]) ;; @@ -5215,9 +5240,10 @@ for dir in $javadirs; do dnl Check for the java executable if test -x "$dir/java"; then + sane_path=$(cd $dir; /bin/pwd) dnl And also check for a libjvm.so somewhere under there dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big. - if test "$dir" != "/usr/bin"; then + if test "$sane_path" != "/usr/bin"; then libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` if test ! -f $libjvmdir/libjvm.so; then continue; fi jredirs="$jredirs $dir" @@ -7395,7 +7421,7 @@ libsuff= if test "x$LINUX_64_MODE" = x64; then # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64; then + if test -d /lib64 -a ! -h /lib64; then libsuff=64 fi fi diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/aclocal.m4 /tmp/ZeUXpSU1gs/konversation-1.1/aclocal.m4 --- konversation-1.0.1/aclocal.m4 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/aclocal.m4 2008-08-06 16:57:51.000000000 +0100 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,7 +11,15 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,14 +29,31 @@ # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.10' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.10.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -85,14 +110,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -101,8 +126,10 @@ [AC_PREREQ(2.52)dnl ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -116,15 +143,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -152,6 +178,7 @@ ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -217,6 +244,7 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -269,7 +297,8 @@ AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -294,8 +323,9 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -354,14 +384,14 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -378,16 +408,20 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl +[AC_PREREQ([2.60])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi fi # test whether we have cygpath @@ -407,6 +441,9 @@ AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl @@ -442,6 +479,10 @@ [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) ]) @@ -455,16 +496,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -477,7 +519,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -555,14 +597,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -578,6 +620,7 @@ # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then @@ -588,7 +631,7 @@ fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -596,60 +639,23 @@ # AM_PROG_MKDIR_P # --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) +# Check for `mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) # Helper functions for option handling. -*- Autoconf -*- @@ -761,9 +767,21 @@ if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/admin/acinclude.m4.in /tmp/ZeUXpSU1gs/konversation-1.1/admin/acinclude.m4.in --- konversation-1.0.1/admin/acinclude.m4.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/admin/acinclude.m4.in 2008-08-06 16:53:17.000000000 +0100 @@ -983,7 +983,7 @@ X_INCLUDES="-I$x_includes" fi -if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then +if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then X_LDFLAGS="" x_libraries="/usr/lib"; dnl better than nothing :- else @@ -1226,7 +1226,15 @@ kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" fi if test $kde_qtver = 3; then - kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" + kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3" + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`" + fi + fi fi if test $kde_qtver = 2; then kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt" @@ -1443,6 +1451,14 @@ for dir in $kde_qt_dirs; do qt_incdirs="$qt_incdirs $dir/include $dir" done +if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +fi +if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`" + fi +fi qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" if test ! "$ac_qt_includes" = "NO"; then qt_incdirs="$ac_qt_includes $qt_incdirs" @@ -1459,8 +1475,16 @@ qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir" done +if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +fi +if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`" + fi +fi qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then qt_libdir=$ac_qt_libraries @@ -2631,6 +2655,7 @@ AC_TRY_LINK(dnl [ #include +#include ], [ char buf[42]; @@ -2638,7 +2663,7 @@ /* this would segfault.. but we only link, don't run */ (void) gzgets(f, buf, sizeof(buf)); - return (zlibVersion() == ZLIB_VERSION); + return (strcmp(zlibVersion(), ZLIB_VERSION) == 0); ], eval "ac_cv_lib_z='-lz'", eval "ac_cv_lib_z=no") @@ -2738,11 +2763,11 @@ echo "*** to the full path to pkg-config." echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." else - if !(`$PKG_CONFIG --exists OpenEXR`) ; then + if ! $PKG_CONFIG --exists OpenEXR ; then AC_MSG_RESULT(no) EXRSTATUS=no else - if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then + if ! $PKG_CONFIG --atleast-version="1.1.1" OpenEXR ; then AC_MSG_RESULT(no) EXRSTATUS=old else @@ -3198,7 +3223,7 @@ case $host in *-*-linux-gnu) CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" - CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS" + CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"]) KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"]) ;; @@ -5215,9 +5240,10 @@ for dir in $javadirs; do dnl Check for the java executable if test -x "$dir/java"; then + sane_path=$(cd $dir; /bin/pwd) dnl And also check for a libjvm.so somewhere under there dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big. - if test "$dir" != "/usr/bin"; then + if test "$sane_path" != "/usr/bin"; then libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1` if test ! -f $libjvmdir/libjvm.so; then continue; fi jredirs="$jredirs $dir" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/admin/cvs.sh /tmp/ZeUXpSU1gs/konversation-1.1/admin/cvs.sh --- konversation-1.0.1/admin/cvs.sh 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/admin/cvs.sh 2008-08-06 16:53:17.000000000 +0100 @@ -68,7 +68,7 @@ echo "*** KDE requires automake $required_automake_version" exit 1 ;; - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*) + automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) echo "*** $AUTOMAKE_STRING found." UNSERMAKE=no ;; @@ -316,7 +316,7 @@ fi fi if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then - VERSION="\"3.5.5\"" + VERSION="\"3.5.9\"" fi if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then modulename=`pwd`; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/admin/detect-autoconf.pl /tmp/ZeUXpSU1gs/konversation-1.1/admin/detect-autoconf.pl --- konversation-1.0.1/admin/detect-autoconf.pl 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/admin/detect-autoconf.pl 2008-08-06 16:53:17.000000000 +0100 @@ -21,6 +21,73 @@ return ""; } +# Subroutine to lexicographically compare two version strings, a and b. +# If a > b, 1 is returned. +# If a == b, 0 is returned. +# If a < b, -1 is returned. +# +# If the strings are of uneven number length then the shorter string is +# prepended by enough zeroes to make the two string lengths equal in order to +# allow an accurate comparison. Note that the zero-padding only occurs in +# between version separators (i.e. 1.6 and 1.10, results in 1.06 vs. 1.10). +# Parts of the version ending in -foo (or any other text) are not considered +# when doing the compare. (i.e. 2.53a vs 2.53 doesn't end up in 2.53a vs. +# 2.053) +sub compareVersions +{ + my ($a, $b) = @_; + + # Split the strings up by '.' (version separator) and start comparing digit + # length. + + my @aParts = split(/\./, $a); + my @bParts = split(/\./, $b); + + # Make the arrays equal in length by adding missing zeroes to the end of the + # version. + push @aParts, '0' while scalar @aParts < scalar @bParts; + push @bParts, '0' while scalar @bParts < scalar @aParts; + + # Now compare each individual portion. + for (my $i = 0; $i < scalar @aParts; ++$i) + { + # Make sure that any portion that has numbers is contiguous. I'm sure + # there's a technique for saving stuff like 2.52a2 but I don't feel + # like implementing it. + if ($aParts[$i] !~ /^[^\d]*\d+[^\d]*$/ or + $bParts[$i] !~ /^[^\d]*\d+[^\d]*$/) + { + die "Not able to compare $a to $b!\n"; + } + + my ($aDigits) = ($aParts[$i] =~ /(\d+)/); + my ($bDigits) = ($bParts[$i] =~ /(\d+)/); + + # Perl is $MODERATELY_INSULTING_TERM, don't remove the parentheses in + # the delta calculation below. + my $delta = (length $aDigits) - (length $bDigits); + if ($delta < 0) # b is longer + { + my $replacement = ('0' x (-$delta)) . $aDigits; + $aParts[$i] =~ s/$aDigits/$replacement/; + } + elsif ($delta > 0) # a is longer + { + my $replacement = ('0' x $delta) . $bDigits; + $bParts[$i] =~ s/$bDigits/$replacement/; + } + } + + # Arrays now have standardized version components, let's re-merge them + # to strings to do the compare. + my $newA = join('.', @aParts); + my $newB = join('.', @bParts); + + return 1 if ($newA gt $newB); + return -1 if ($newA lt $newB); + return 0; +} + # Subroutine to determine the highest installed version of the given program, # searching from the given paths. sub findBest @@ -29,9 +96,10 @@ my $best_version_found = '0'; # Deliberately a string. my %versions; my %minimumVersions = ( - 'autoconf' => '2.5', + 'autoconf' => '2.5', 'automake' => '1.6', ); + my $sgn; # Used for compareVersions results. # Allow user to use environment variable to override search. return $ENV{uc $program} if $ENV{uc $program}; @@ -45,7 +113,11 @@ next unless -x $file; ($version) = $file =~ /$prefix\/$program-?(.*)$/; - $version =~ s/-|\.//g; + + # Don't check the -wrapper ones (or any other non program one). + # The real deal should start with a version number, or have no + # suffix at all. + next if $version =~ /^[^\d]/; # Special case some programs to make sure it has a minimum version. if (not $version and exists $minimumVersions{$program}) @@ -54,15 +126,20 @@ my $versionOutput = `$program --version 2>/dev/null | head -n 1`; # If we can't run the script to get the version it likely won't work later. - next unless $versionOutput; + next unless $versionOutput; # Use number.number for version (we don't need the excess in general). - ($versionOutput) = ($versionOutput =~ /(\d\.\d)/); + ($versionOutput) = ($versionOutput =~ /(\d+\.\d+)/); + + # compareVersions returns -1 if the left argument is less than + # the right argument. It can also die for invalid input so + # wrap with eval. + eval { + $sgn = compareVersions($versionOutput, $min_version); + }; - # Use lt to do lexicographical comparison of strings (which should be - # equivalent and doesn't involve issues with floating point conversions). - if (not $versionOutput or $versionOutput lt $min_version) - { + # $@ would be set if an error was encountered. + if ($@ or not $versionOutput or $sgn == -1) { next; } } @@ -78,7 +155,12 @@ $versions{$version} = $file; # Use string comparison so that e.g. 253a will be > 253 but < 254. - if ($version gt $best_version_found) + # See above about the need for eval. + eval { + $sgn = compareVersions($version, $best_version_found); + }; + + if (not $@ and $sgn == 1) { $best_version_found = $version; } @@ -138,12 +220,12 @@ ($automake_suffix) = $automake =~ /.*automake(.*)$/; -# Use unsermake if we found it. -$automake = "$unsermake -c" if $unsermake; - # Find matching automake companions. $aclocal = findProgram('aclocal', $automake_suffix); +# Use unsermake if we found it. +$automake = "$unsermake -c" if ($unsermake and $aclocal); + $which = findWhich(); # Make sure we have all of the needed programs. @@ -151,8 +233,7 @@ { unless(${$i}) { - print "# Unable to find $i!!\n"; - exit 1; + print STDERR "# Unable to find $i!!\n"; } } @@ -171,3 +252,5 @@ EOF exit 0; + +# vim: set noet ts=8 sw=4: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/admin/Doxyfile.am /tmp/ZeUXpSU1gs/konversation-1.1/admin/Doxyfile.am --- konversation-1.0.1/admin/Doxyfile.am 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/admin/Doxyfile.am 2008-08-06 16:53:17.000000000 +0100 @@ -72,11 +72,11 @@ uninstall-apidox: @if test "$(subdir)" != "."; then \ if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \ - rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \ + rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \ fi \ else \ if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \ - rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ + rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ fi \ fi diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/admin/libtool.m4.in /tmp/ZeUXpSU1gs/konversation-1.1/admin/libtool.m4.in --- konversation-1.0.1/admin/libtool.m4.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/admin/libtool.m4.in 2008-08-06 16:53:17.000000000 +0100 @@ -1424,7 +1424,7 @@ libsuff= if test "x$LINUX_64_MODE" = x64; then # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64; then + if test -d /lib64 -a ! -h /lib64; then libsuff=64 fi fi diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/ChangeLog /tmp/ZeUXpSU1gs/konversation-1.1/ChangeLog --- konversation-1.0.1/ChangeLog 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/ChangeLog 2008-08-06 16:56:27.000000000 +0100 @@ -1,3 +1,470 @@ +Changes from 1.0.1 to 1.1: +We are extremely pleased to announce Konversation's newest major release, v1.1. +Konversation 1.1 is a special release for us in multiple ways: It's our farewell +to KDE 3, by way of being the last major release built upon that venerable +platform. It's also our biggest release yet, in terms of the number and +magnitude of the changes. + +The additions and improvements in this release are both user-visible and under +the hood. Some of the highlights are rewritten connection handling (robustness +and correctness improvements, better support for IRC URLs, bookmarking and +more), redone DCC with better UI and Passive/Reverse DCC support, a redone away +system with the addition of auto-away support, redone and much more useful +remember / marker line support, a new outbound traffic scheduler that is capable +of aggressive throttling to avoid flooding while smartly reordering messages to +improve latencies, great convenience additions like a "Next Active Tab" shortcut, +and much, much more, along with a large number of bugfixes and tweaks to round +things out. Note: All fixes made since RC1 are marked with a "[New since RC1]" +label in the changelog. + +We're confident that this release is the best and most robust version of +Konversation published so far, and upgrading comes highly recommended to all +users. Enjoy! + + +Text views +* Added an option to hide the scrollbar in chat windows. +* Don't scroll to bottom if the view was scrolled up before resizing. +* Fixed chat views occassionally not being scrolled to the bottom at their + inception with long backlog appends. +* Fixed an off-by-one error in scrollback culling. +* Fixed a bug that lead to single leading whitespace characters in lines being + omitted from display in chat windows. +* Now preserving trailing whitespace in raw log tabs. +* Fixed display of '<' and '>' in backlog lines. +* Fixed copy/paste with shortcuts other than the default Ctrl+C/V ones. +* Fixed onotice display. +* Fixed middle-click-to-open-in-new-tab on chat window URLs when Konqueror + wasn't running. +* Fixed superfluous closing parenthesis being inserted after links in lines + which contain multiple links followed by closing parenthesis. +* Fixed URLs with encoded hash mark %23 being incorrectly passed off to handler. +* Fixed variable expansion causing certain URLs to be corrupted when pasted. +* Added a "Save Link As" item to the context menu of links in the chat window. +* Have the "Save as..." dialog suggest a file name. +* Implemented Shift+Click to "Save as..." URLs.. +* Made the channel links context menu work in server status views. +* Fixed nickname links in chat view messages created as a result of '/msg + ' commands erroneously prepending '->' to nicknames. +* Fixed operations on nicknames containing "\" characters from the nickname + context menu. +* Fixed query view context menus operating on the wrong nickname under certain + circumstances. +* Fixed a bug that caused the "Send File..." action in the generic query context + menu to pick the wrong recipient after hovering the user's own nick in the + chat display. +* Fixed date display not using the locale's date format. +* Fixed IRC color parsing so that the colors gets reset to default if no color + numbers were given. +* Fixed a bug that could cause the text selection in a chat window to be messed + up when new text was appended. + +Marker/Remember Lines +* Konversation now distinguishes between manually and automatically inserted + marker lines, making the "show line in all chat windows" preference less + confusing. +* The automatically inserted remember lines when chat windows are hidden are now + "sliding", i.e. there is only one per chat window, and it moves. +* Automatically inserted remember lines will now optionally only be inserted + when there's actually new text being appended to the chat window (enabled by + default). +* The automatic remember line will now also be inserted when the window has lost + focus. +* Added an action to clear all marker lines in a chat window. +* Improved marker lines-related preferences and terminology. +* Improved the appearance of marker lines in the chat window. +* Made the (marker line-related and other) identity default settings consistent + between the initial identity and additional newly created identities. +* Fixed hidden join/part/quit events marking tabs as dirty, allowing multiple + consecutive remember lines to appear. +* Fixed crash when minimizing or closing the application window prior to any tab + switch when the auto-insertion of remember lines is enabled. + +Input line +* Fixed input line contents rather than actual sent text being appended to the + input history upon a multi-line paste edit. +* Special characters and IRC color codes will now be inserted at the cursor + position rather than the end of the input line contents. + +Nickname list +* Implemented an additional "Sort by activity" nicklist sorting mode. +* Added Oxygen nicklist icon theme by Nuno Pinheiro. +* The list of nickname list themes is now sorted alphabetically. +* Fixed race condition when removing a nicklist theme (listview would be + repopulated before deletion was complete). +* Fixed using the wrong palette for the disabled text color in the nickname + list. +* Fixed moving back from the custom alternate background color to system colors + in the channel nickname listviews when disabling the "Use custom colors for + lists, [...]" preference. +* Cleanups in the nicklist item code. + +Tab bar / Tree list +* Added option to add and remove a channel from its network's auto-join list + from the tab context menu. +* Added option to close tabs using middle-mouse. +* Slightly sped up tab switching by eliminating some redundant UI action state + updates. +* Channel tabs will no longer close when kicked, but rather grey out on the tab + bar and offer context menu actions to rejoin. +* Channel and query tabs will now grey out on the tab bar when disconnected and + no higher priority notification is present. Channel tabs will only ungrey if + and when the channel is successfully rejoined after reconnect; query tabs + ungrey immediately once reconnected. +* Display tooltips for truncated treelist items. +* Fixed forwarding keyboard events received by the treelist to Konsole widgets + and focus adjustment thereafter as well as generally after switching to + Konsole tabs by other means. +* Fixed treelist scrollbar not picking up on new palette when the KDE color + scheme changes. +* Fixed a bug that could cause a crash when the view treelist would receive + keypress events during application shutdown. +* [New since RC1] Fixed a corner case where a server status item could become a + child item of another server status item when dragging it below an special + application pane item such as DCC Status or Watched Nicks Online. +* [New since RC1] Fixed a crash when using the mouse wheel on the list within + ~150ms of a drag and drop operation. + +System Tray icon +* Remember and recreate minimized-to-tray state across sessions. +* Added option for hidden-to-tray startup. +* Reload tray icons when the icon theme changes at runtime. +* Added option to not blink the systray icon, but just light it up. + +Channel Settings Dialog +* Added a search line to the ban list. +* Fixed sorting the ban list by time set. +* Made the ban list's "Time Set" column use KDE locale settings for the date + format. +* Fixed OK'ing/Cancel'ing/closing the Channel Settings Dialog not dealing with + open ban list in-line edits correctly. +* Reset topic editbox when the channel options dialog has been dismissed with + cancel. +* Fixed incorrect time display in the topic history list in the Channel Settings + dialog. + +Server List Dialogs +* Moved the "Show at application startup" option for the Server List dialog to + the dialog itself. +* Auto-correct hostnames and passwords entered with preceding or trailing spaces + in the Server List dialog. +* Don't allow impossible ports to be set for servers. +* Sensible default focus in the server list dialog. +* Fixed unresponsive, defective Server List dialog window appearing at + application startup using the Beryl or Compiz compositing window managers. + +Interface Misc +* Added a "Next Active Tab" keyboard shortcut to jump to the next active tab with + the highest priority notification. +* Added a Find Previous standard action. +* Have the "Insert Character" dialog pick up on text view font changes. +* Show correct number of colors in the color chooser dialog. +* Made "Alternate Background" colorchooser disable when unneeded. +* Fixed crash when changing the KDE color scheme while a non-chat tab is open. +* The encoding selection now allows returning to the used identity's default + encoding setting. +* Update actions on charset changes. +* Added Notifications Toggle and Encoding sub-menu to the window menu. +* Moved "Hide Nicklist" menu action from Edit to Settings. +* Fixed the "Automatically join channel on invite" setting not to show an + inquiring dialog anyway. +* Fixed saving the state of the invitation dialog option in the Warning Dialogs + preferences. +* Added a warning dialog for quitting with active DCC file transfers. +* Return focus to the text display widget after closing the search bar in a log + reader view. +* Made pressing Return or Enter in the Log File Viewer's size spinbox apply the + setting, just as pressing the Return button. +* Fixed a bug where the SSL padlock icon would be shown on a non-SSL connection + (and clicking would cause a crash). +* Empty topic labels will no longer show empty tooltips, but rather none at all. +* Added a sample 12-hour clock format string to the timestamp format combobox. +* Timestamp format list is no longer localized. +* Robustness improvements and less UI quirks around channel password handling. +* Improved general layout and consistency of tab, chat view, query and topic + context menus. Added some missing icons. +* Fixed some bugs of UI actions not being appropriately as their context + changes. +* Fixed enabled state of "Close All Open Queries" action not being updated + correctly when queries are closed by way of closing a status view tab. +* The window caption is now properly being reset when the last tab is closed. +* Made units in spinboxen in the identity and app preferences UI more + consistent. +* Minor fixes to accelerators and tabbing order in various dialogs. + +Commands +* Support command aliases in network connect commands. +* Turned parameter-less '/away' into a toggle: Sets away state with default + message initially, and unsets away state if already away. +* Added an '/aunaway' command to complement '/aaway' (previously, there was only + '/aback'). +* Added support for '/kill'. +* A '/join' command for an already-joined channel will now focus it. +* Added an '/encoding' command as an alias to '/charset'. +* '/charset' and '/encoding' now accept 'latin-1' as an alias for 'iso-8859-1'. +* Improved messages for the '/charset' and '/encoding' commands. +* Rewrote /me parsing to be less hackish and display usage info with an empty + parameter. +* '/msg ' is no longer treated as equivalent to '/query '. +* '/msg ' will now error out when lacking a message parameter. +* '/query [message]' will now error out when recipient is a channel. +* Added a '/queuetuner' command to bring up the outbound traffic scheduler's + tuning/debug pane. + +Notifications +* Seperated query messages and messages containing the user's nickname into two + distinct KNotify events. +* Made the tab notification color of private messages configurable independently + from normal messages. +* Don't highlight own nick on topic created by messages. +* Fixed disabling notifications for a tab not cancelling highlight sounds. +* Fixed a race condition where a highlight's autotext reply would outrun the + original line's tab notification. +* Fixed actions in queries and DCC chats producing message notification events + (rather than the correct private message ones). +* Changed the OSD screensaver check logic to work in KDE 4. +* [New since RC1] Fixed on screen display occassionally reverting to the default + position when using the settings dialog to change unrelated settings. + +Connection handling +* Improved behavior with regard to reusing existing connections in connection + attempts that provide an initial channel to join, such as command line + arguments, the DCOP interface, the bookmark system or irc:// links). + Previously, the application would have inconsistently either reused an + existing or created a new connection. +* Better dialog messages in the interactive variant of the decision to either + reuse or create a new connection (from the Server List dialog and the Quick + Connect dialog). +* Improved and more consistent display of connection names (i.e. network or + server host name) throughout the application. +* Much improved irc:// URL support for connection intanciation, with support + added for IPv6 host names and many of the features proposed by the Mirashi + specification. +* Eliminated redundant irc:// URL parsing codepaths in favor of a single one. +* Added support for irc:// URLs to the chat views. +* Removed "konversationircprotocolhandler" shell script. The Konversation + executable now understands irc:// URLs directly. +* Initiating connections from command line arguments and options now works also + when the application is already running. +* Fixed a bug that would cause a connection initiated from command line options + not to get past the identity validation stage when the configuration file was + unitialized and empty. +* The server list dialog will now always be closed when starting Konversation + with command line arguments to initiate a connection, consistent with the + configuration-based auto-connect behavior. +* Providing a channel in the creation of a new connection (i.e. via command line + arguments, the DCOP interface, the Quick Connect dialog, the bookmark system + or irc:// links) now consistently pre-empts the stored auto-join channel list + if the target of the connection is a network or the hostname is found to be + part of a configured network. Previously, this would only work for Quick + Connect and the bookmark system (which caused the infamous Sabayon user flood + in #kde due to their "Get Support" desktop link connecting to Freenode, which + in an unconfigured Konversation has #kde in its auto-join list). +* Connections now have globally unique IDs. +* The DCOP interface now understands connection IDs in addition to host names. +* The scripting systems now uses globally unique connection IDs rather than + server host names to refer to connections, fixing a bug where scripted + responses were being handed to all connections sharing a hostname (which was + actually intentional in the absence of connection IDs, but undesirable for + users). +* Improved iteration behavior over a network's server list on connection losses. +* The "Reconnect" action now works also when Konversation doesn't consider the + connection to be in a disconnected state. +* Improved the server status view messages related to reconnection attempts. +* Consistently apply the "Reconnect delay" setting (previously confusingly named + "Reconnect timeout"), which wasn't done before. +* Fixed a bug that could cause the connection process to claim that a DNS lookup + was successful when it actually wasn't. +* Fixed opening bookmarks with spaces in the target address name (which may be a + network name, and networks may have spaces in their name). +* Properly update the state of the "Add/Remove to Watched Nicknames" nickname + context menu actions when the connection isn't to a config-backed network, in + which case there's no way to store and make use of those list entries. +* Fixed a crash when quitting the application with a resident connection that + disconnected due to an SSL error. +* Fixed crashes in the DCOP interface if no connection was present. +* Make the "Reconnect" action available even while ostensibly in the process of + connecting. +* Fix possible crash when closing all views and subsequently creating a new + connection. +* Fixed crash upon auto-connect at application startup. +* Improved the naming of preferences related to automatic reconnection attempts + to be less confusing. +* Made it possible to set the number of automatic reconnection attempts to + unlimited. +* Provided better default values to the preferences related to automatic + reconnection attempts. +* Fixed crash when opening a Konsole tab and Konsole was not installed. +* Fixed allowing the user to create an infinite loop of showing the SSL + connection details dialog upon being presented with the invalid certificate + multiple choice dialog at connection time by checking "Do not ask again" and + then clicking "Details". + +Identities +* Made it possible to set a Quit message independently from the Part message. +* Saving a newly-created identity is no longer allowed without entering a real + name. +* Apply switching the identity in the identity dialog as opened from the network + dialog to the network's settings. +* Have the Edit/Delete/Up/Down buttons for the nickname list of an Identity + correctly change state according to the selection + +Away system +* Added per-identity support for automatic away on a configurable amount of user + desktop inactivity and/or screensaver activation, along with support for + automatic return on activity. +* Fixed the "Global Away" toggle to make sense and update its state properly. +* Turned parameter-less '/away' into a toggle: Sets away state with default + message initially, and unsets away state if already away. +* Added an '/aunaway' command to complement '/aaway' (previously, there was only + '/aback'). +* Broadly rewrote away management related code for improved robustness and less + duplication and hacks (e.g. no more abuse of multiServerCommand for global + away). + +DCC +* Massive DCC refactoring and improved reliability. +* Passive DCC support (Reverse DCC RECV, SEND). +* Replaced the DCC Transfer Details dialog with a retractable transfer details + pane directly in the DCC Status tab. +* Added DCC transfer average speed reading to the DCC transfer details panel. +* The DCC Status tab now remembers its column widths across sessions. +* Fixed duplicated quotation marks around file names in DCC transfer status + messages. +* Fixed "Open File" DCC dialog remembering the last viewed location incorrectly. +* Added an "Open Folder" button to the DCC transfer details panel. +* Added check for whether the URL is well-formed before initiating a DCC send. + Fixes a bug of dragging a nickname link in the chat view onto the query chat + view drop target starting a DCC transfer that cannot succeed. +* Ported the DCC code away from relying on server group IDs to refer to + connections, made it use connection IDs instead. Fixes potential bugs with + multiple concurrent connections to the same network. +* Fixed queued DCC transfer items not picking up on download destination + directory changes. +* Fixed bug leading to crash upon initiating DCC Chat when "Focus new tabs" was + enabled. +* [New since RC1] New transfer items added to the DCC panel's transfer list are no + longer automatically selected, meaning work on other items in the list occuring + at the same time no longer gets interrupted. +* [New since RC1] The "Filename:" line in the DCC panel's detailed info pane is + now using text squeezing to avoid an increase in minimum window width with long + file names. +* [New since RC1] Failed receives now longer show 833TB/s as their transfer + speed. + +Blowfish support +* Fixed FiSH-style +p prefix to send clear text to channel despite an encryption + key being set. +* Text encoding is now being applied to the cleartext, rather than the + ciphertext. This fixes using characters outside the ASCII range with blowfish + encryption. +* Fixed CTCP (and thus DCC) requests to nicknames for whom an encryption key is + set. +* Added support for encrypted topics. +* If an encryption key is set, a lock icon will now be shown next to the input + box. +* Added a '/showkey ' command to show the encryption key for the + target in a popup dialog. + +Auto-replace +* Improved auto-replace behavior with multiple matches in one line (fixes + multiple Wikipedia links). +* Fixed bug that could cause auto-replace to replace the wrong group of the + matching string. +* Auto-replace is now case-sensitive in regular expression mode. +* Added regular expression editor button to auto-replace preferences. +* Fixed conditional enabling of the RegExpEditor button in the auto-replace + preferences page. + +Ignore +* Fixed being asked twice whether to close a query upon ignoring the opponent. +* Fixed crash when opting to close a query upon chosing to ignore the opponent + from the context menu of his nickname. + +Watched Nicknames +* Improved robustness of the Watched Nicknames Online system. +* The "Offline" branches in the "Watched Nicks Online" list will now be omitted + when there are no offline nicks for the respective network. +* Fixed display of WHOIS spam prompted by the Watch List's WHOIS activity. +* Connections to non-config-backed targets no longer show in Watched Nicks + Online. +* [New since RC1] Actually honor the preference to enable/disable the Watched + Nicknames Online system, and apply it at runtime. +* [New since RC1] Make sure the periodic Watched Nicknames Online check actually + starts running within the same session after adding the first nickname to the + list. +* [New since RC1] Fixed a crash on quit with the Watched Nicks Online tab open and + there being an open connection to a network that nicks are being watched for. + +Channel List +* IRC markup is now removed from content in the Channel List view. +* Speed improvements in Channel List views. +* Fixed keyboard accelerator collisions in Channel List views. +* Allow higher values than 99 in the min/max users filter spin boxes in Channel + List views. + +Under the Hood / Protocol +* Rewrote the outbound queue scheduling system to be smart enough to reorder + outbound traffic to reduce interactive latency while aggressively throttling + the rate to prevent flooding. Use '/queuetuner' to tweak. +* Rearranged when and how auto-who is triggered upon channel join a bit, to + avoid excessive flooding on multiple concurrent joins in some cases. +* Auto-Who reliability improvements. +* Fixed auto-join with very many channels (the auto-join command would exceed + the maximum buffer length; it is now split into multiple commands as needed). +* Fixed bugs around rejoining channels after reconnects related to the cause of + the disconnect, channel passwords and picking the actual list of joined + channels over the network's auto-join list. +* Improved behavioral consistency in situations where the auto-join list is + preempted by a transitory auto-join channel (bookmarks, etc.). +* Fixed bug that caused the topic state not to be cleared properly prior to + rejoining channels during reconnects. +* Fixed onotice payload being cut off after the first word. +* Changed RPL_WHOISOPERATOR handling to internationalize the common case ("is an + IRC Operator") and otherwise passthrough the string sent by the server. +* Fixed parsing of alternate invite format on Asuka ircds (QuakeNet). +* Added support for PRIVMSG from the server. +* Support RPL_UMODEIS. +* Announce 'k' channel mode (i.e. channel key) changes in non-raw mode as well. +* The command part of CTCP requests is now always converted to uppercase before + sending, as some clients don't like lower- or mixed-case commands as the user + may have entered them. +* Display mode for your nick and channels you're not in. +* Fixed per-channel encoding settings for the channels of a network being lost + when the network is renamed. +* Fixed crash when receiving actions for channels the client is not attending. +* Made newline handling in the DCOP interface more robust, fixing a potential + security problem (CVE-2007-4400). +* A few speed optimizations and memory leak fixes. +* [New since RC1] Fixed a crash on quit during KDE logout or when quitting by + DCOP. + +Included scripts +* Support for KMPlayer in the 'media' script (based on the window caption, as + KMPlayer has no proper appropriate DCOP interface). +* Added KPlayer support to the 'media' script (also caption-based). +* Added support for Audacious to the 'media' script. +* Fixed problems in disk space calculation in the 'sysinfo' script caused by + wrapped df(1) output. +* Added KDE 4 support to the 'sysinfo' script. +* Removed some bashisms from the 'sysinfo' script. +* Rewrote 'weather' script for increased reliability in error handling and + better readability. +* Removed broken 'qurl' script in favor of new 'tinyurl' one. +* Fixed the 'fortune' script not working properly when variable expansion is + turned off in the preferences. +* [New since RC1] Fixed a bug in the 'media' script that caused it to break when + querying Audacious with audtool not being available. + +Packaging +* [New since RC1] Standards compliancy fixes in the application .desktop file and + the nicklist icon theme .desktop files. + +Build +* Fixed build with --enable-final. + +------------------------------------------------------------------------------- + Changes from 1.0 to 1.0.1 We are pleased to announce the immediate availability of Konversation 1.0.1, a maintenance release featuring notable improvements for users of right-to- @@ -57,7 +524,8 @@ User Interface -* It is now possible to place the tabs on the left side of the application window. +* It is now possible to place the tabs on the left side of the application +window. This has been implemented as a treelist of tabs. The treelist supports all of the cosmetic and interactive properties of the original horizontal tab bar, including colored notifications, LED icons, (hover) close buttons with delayed @@ -70,7 +538,8 @@ * The grouping behavior of Channel List and Raw Log tabs in the tab bar has been improved. * Disabling notification for a tab will now unset the active notification. -* The enabled/disabled state of the notifications for connection status tabs will +* The enabled/disabled state of the notifications for connection status tabs +will now be remembered across sessions for configured networks. * The speed of switching tabs in quick succession with the auto-spellchecking preference enabled has been improved. @@ -86,8 +555,10 @@ * The number of Quick Buttons to show below the nickname list in channel tabs is now configurable. Additional buttons may be added or existing buttons removed. * Konversation now supports auto-replacing words in incoming and outgoing - messages. Regular expressions are supported. The auto-replace configuration can - be found in the preferences dialog. The static Wiki link feature found in older + messages. Regular expressions are supported. The auto-replace configuration +can + be found in the preferences dialog. The static Wiki link feature found in +older versions has been retired in favor of an auto-replace rule. * The search bar has been redesigned to provide a better user experience. * The "Find Next" action will now open the search bar when there is no active @@ -103,19 +574,23 @@ * The behavior of the input box on pasting text including leading or trailing newline characters has been improved never to cause lines being sent without user acknowledgement. -* The input box of connection status, channel and query tabs will now be disabled +* The input box of connection status, channel and query tabs will now be +disabled and the nickname list of channel tabs cleared when the respective server connection is closed. -* Konversation can now optionally insert a remember line whenever a tab is hidden, +* Konversation can now optionally insert a remember line whenever a tab is +hidden, either by switching to a different tab or minimizing the window. * Multiple consecutive remember lines will no longer be inserted. * Remember lines can now also be inserted into the chat windows of connection status and DCC Chat tabs. -* The Colored Nicknames feature will now always assign the same color to the same +* The Colored Nicknames feature will now always assign the same color to the +same nickname. * The number of backlog lines to show in the chat window is now configurable. * The recognition of URLs in the chat window has been improved to cope better - with URLs containing or being surrounded by parenthesis and to exclude trailing + with URLs containing or being surrounded by parenthesis and to exclude +trailing dots and commas. * Channel links following mode characters or surrounded by interpunctuation are now properly recognized in the chat window. @@ -129,14 +604,17 @@ * A bug that could lead to the chat window nickname context menu actions ceasing to function after the targeted user left the channel has been fixed. * The Server List dialog now allows connecting to a specific server in a network - even when a connection to that network has been previously established. If that + even when a connection to that network has been previously established. If +that connection is active, a dialog box will verify whether to disconnect from the current server and connect to the chosen one instead, otherwise the connection will simply be reestablished using the newly chosen server. * The Quick Connect feature will now properly warn when the identity to be used in the connection attempt is not set up properly. -* The appearance and behavior of the warning about an incorrectly set-up identity - have been improved. A prior connection attempt will now be automatically resumed +* The appearance and behavior of the warning about an incorrectly set-up +identity + have been improved. A prior connection attempt will now be automatically +resumed after the identity settings have been corrected. * Many of the pages in the Konversation preferences dialog have been redesigned and rewritten for improved consistency, reliability and clarity. The general @@ -148,48 +626,63 @@ * The nickname list now longer allows drag'n'drop of channel or user links from the chat window onto list entries, as a DCC transfer of those data sources cannot succeed. -* The preference to show or hide the real names of users in the nickname list will +* The preference to show or hide the real names of users in the nickname list +will now be applied immediately. * The columns of the nickname list will no longer resize erratically when the preferences to show or hide real names and hostmasks are changed at runtime. * A bug that could lead to nicknames being sent as messages when double-clicking a selection of multiple nicknames in the nickname list has been fixed. * The placement of actions in the application menus has been improved. -* The shown/hidden state of the application menubar will now be remembered across - sessions. When the menubar is hidden, a menu action to show it again will now be +* The shown/hidden state of the application menubar will now be remembered +across + sessions. When the menubar is hidden, a menu action to show it again will now +be added to the chat window context menu. -* The "Close All Open Queries" menu action is now be disabled properly when there +* The "Close All Open Queries" menu action is now be disabled properly when +there are no open queries. * A bug that could lead to the "Close All Open Queries" menu action failing to properly close all open queries has been fixed. -* A bug that could lead to an application crash when closing the tab after choosing +* A bug that could lead to an application crash when closing the tab after +choosing to ignore someone in a query has been fixed. -* The "Hide Nicklist" menu action will now be disabled properly when the tab shown +* The "Hide Nicklist" menu action will now be disabled properly when the tab +shown does not have a nickname list has been fixed. -* The actions in the "Insert" menu will now be disabled properly when the current +* The actions in the "Insert" menu will now be disabled properly when the +current tab does not support them. -* The default double-click action in the "Watched Nicks Online" tab is now to open +* The default double-click action in the "Watched Nicks Online" tab is now to +open a query to the respective contact. -* The sorting in the Watched Nicks Online tab has been improved: Offline users are +* The sorting in the Watched Nicks Online tab has been improved: Offline users +are now always sorted at the bottom. -* Several bugs in the "Watched Nicknames Online" tab that could lead to application +* Several bugs in the "Watched Nicknames Online" tab that could lead to +application crashes have been fixed. -* Several errors in the chat window status messages produced by the Watched Nicks +* Several errors in the chat window status messages produced by the Watched +Nicks Online system have been corrected. -* A bug that could lead the the columns in the "Watched Nicks Online" list resizing +* A bug that could lead the the columns in the "Watched Nicks Online" list +resizing erratically has been fixed. -* A bug that could lead to the status bar not being cleared properly when the last +* A bug that could lead to the status bar not being cleared properly when the +last tab was closed or the application window lost focus after a link was launched from the chat window has been fixed. * The display of temporary and static info texts in the status bar has been improved not to interfere with each other and provide more useful information. - Also, the status bar lag info section is now updated more consistently to avoid + Also, the status bar lag info section is now updated more consistently to +avoid jumping around of the other status bar sections. * A bug that could lead to a wrong nickname count being shown in the status bar of channel tabs has been fixed. * Repeated triggering of the "Open URL Catcher" menu action will now properly show and hide the URL Catcher tab. -* The warning about pasting text with multiple lines can now be properly disabled +* The warning about pasting text with multiple lines can now be properly +disabled and reenabled from the Warning Dialogs preferences page. * A bug that could lead to IRC bookmarks showing up as actions in the Configure Shortcuts dialog has been fixed. @@ -246,7 +739,8 @@ can now be optionally disabled in the DCC preferences. * File names are no longer being needlessly lower-cased during DCC transfers. * The DCC file transfer and DCC Chat info messages shown in the chat window have - been significantly improved to provide more useful information while being less + been significantly improved to provide more useful information while being +less excessively verbose. * DCC Chats will now be logged properly. * It is now possible to select multiple files in the DCC Status tab. @@ -262,14 +756,17 @@ * A bug that could lead to Konversation's CPU usage spiking to 100% after a DCC Chat was closed from the remote side has been fixed. * Several bugs that could lead to application crashes in DCC Chat tabs after the - server connection from which the DCC Chat originated was closed have been fixed. + server connection from which the DCC Chat originated was closed have been +fixed. Technology * Konversation will now properly split up very long lines into multiple messages - by calculating the length of the message preamble and the number of bytes of the + by calculating the length of the message preamble and the number of bytes of +the text payload. Encodings that use multiple or variable numbers of bytes per character are accounted for. -* The Disconnect and Reconnect menu actions and the respective input box commands +* The Disconnect and Reconnect menu actions and the respective input box +commands have been rewritten for increased reliability. Their state will now be updated properly, and they will quit the IRC server in the correct manner. * A previous away state will now be recreated upon reconnection to a server. @@ -297,29 +794,36 @@ * A bug that could lead to iterating over a configured network's servers failing after a connection failure has been fixed. * A bug that could lead to Konversation connecting to the wrong server in a - network when choosing to connect to a specific server from the Server List dialog + network when choosing to connect to a specific server from the Server List +dialog has been fixed. * A dialog will now ask the user for an additional nickname when all nicknames configured in the identity where tried unsuccessfully during a connection - attempt. This replaces the previous behavior of repeatedly appending underscores - to the last nickname, which eventually ran into the nickname length limit on the + attempt. This replaces the previous behavior of repeatedly appending +underscores + to the last nickname, which eventually ran into the nickname length limit on +the server. * A bug that could lead to unnecessary nick changes immediately after connecting to a server has been fixed. * A bug that could lead to Konversation trying to auto-identify multiple times upon connect on certain servers has been fixed. * A bug that could lead to Konversation not picking up on users leaving a - channel without providing a part or quit message on UnrealIRCD servers has been + channel without providing a part or quit message on UnrealIRCD servers has +been fixed. * Changes to the list of auto-join channels for a network will now be applied immediately. * The auto-reconnect preference will now be properly applied at runtime. -* Konversation will no longer enable IDENTIFY-MSG mode on servers that support it, - but continues to be able to process messages with IDENTIFY-MSG prefixes in case +* Konversation will no longer enable IDENTIFY-MSG mode on servers that support +it, + but continues to be able to process messages with IDENTIFY-MSG prefixes in +case an involved IRC proxy chose to enable IDENTIFY-MSG mode. * The broken default for the Custom Web Browser preference has been fixed. * Konversation will no longer allow Konsole tabs to be opened in KDE - environments in which the use of terminals is prohibited by the KIOSK framework. + environments in which the use of terminals is prohibited by the KIOSK +framework. * A bug that could lead to an application crash when a Konsole tab was closed from the Konsole component's context menu has been fixed. * A bug that could lead to an application crash when a channel was joined while @@ -328,155 +832,222 @@ ------------------------------------------------------------------------------- Changes from 0.18 to 0.19 -We are extremely pleased to announce the immediate release of Konversation 0.19. The focus -of this release is on extending and improving upon established functionality. Most notable -in this regard are significantly improved management of IRC networks and servers all across -the application, a redesigned tab bar and better support for common IRC commands. A long -list of further additions and improvements has us confident of this being the best version +We are extremely pleased to announce the immediate release of Konversation 0.19. +The focus +of this release is on extending and improving upon established functionality. +Most notable +in this regard are significantly improved management of IRC networks and servers +all across +the application, a redesigned tab bar and better support for common IRC +commands. A long +list of further additions and improvements has us confident of this being the +best version of Konversation yet. Enjoy! User Interface -* The Server List dialog has been rewritten to allow direct manipulation of a network's - servers and features more intelligent sorting behavior. Reordering networks via drag - and drop is now possible. A behavioral audit of all actions in the dialog resulted in +* The Server List dialog has been rewritten to allow direct manipulation of a +network's + servers and features more intelligent sorting behavior. Reordering networks +via drag + and drop is now possible. A behavioral audit of all actions in the dialog +resulted in numerous improvements. -* A redesigned tab bar sports highly configurable text- and LED icon-based notifications +* A redesigned tab bar sports highly configurable text- and LED icon-based +notifications as well as more intelligent scaling behavior under space-critical conditions. -* Tabs are now intelligently grouped around their respective connection status tab. -* Status tab labels now display the user-configured network name where appropriate. -* The Find Text dialog has been replaced by a search bar that no longer interrupts your +* Tabs are now intelligently grouped around their respective connection status +tab. +* Status tab labels now display the user-configured network name where +appropriate. +* The Find Text dialog has been replaced by a search bar that no longer +interrupts your workflow. -* Channel links in the chat area now feature a context menu for quick access to common +* Channel links in the chat area now feature a context menu for quick access to +common actions. -* Usage of the status bar has been extended to show context-relevant information as the - cursor passes over various interface elements. The lag information segment is now +* Usage of the status bar has been extended to show context-relevant information +as the + cursor passes over various interface elements. The lag information segment is +now only shown where appropriate. -* A channel's topic can now be cleared by setting an empty text in the Channel Options +* A channel's topic can now be cleared by setting an empty text in the Channel +Options dialog. -* The Channel Options dialog has been redesigned to allow editing the current topic +* The Channel Options dialog has been redesigned to allow editing the current +topic while browsing a channel's topic history. -* The Watched Nicknames interface has been fully integrated with network management. -* Pressing the Arrow Down key in the input line now preserves any input entered by +* The Watched Nicknames interface has been fully integrated with network +management. +* Pressing the Arrow Down key in the input line now preserves any input entered +by adding it to the history. * Commands may now be sent as regular messages by typing Ctrl+Enter. -* The multi-line paste editor window now highlights whitespace characters and prepends +* The multi-line paste editor window now highlights whitespace characters and +prepends the existing content of the input line. -* The Colored Nicknames feature has been improved to better handle nickname changes and +* The Colored Nicknames feature has been improved to better handle nickname +changes and immediately apply any changes to the color palette. -* Some previously not configurable notification events have been made configurable. -* Users leaving a server will now be announced in any query you have open with them. -* Query tab labels will now update when a user you have a query open with changes +* Some previously not configurable notification events have been made +configurable. +* Users leaving a server will now be announced in any query you have open with +them. +* Query tab labels will now update when a user you have a query open with +changes his/her name. -* The DCC file transfer dialogs have seen a number of cosmetic improvements. Among other - things, in the event of a file being renamed on save, the local file name is now shown +* The DCC file transfer dialogs have seen a number of cosmetic improvements. +Among other + things, in the event of a file being renamed on save, the local file name is +now shown across the application. -* Various status and error messages have been rewritten for improved consistency and +* Various status and error messages have been rewritten for improved consistency +and clarity. -* The KDE standard text font will now be correctly set as initial default chat font. +* The KDE standard text font will now be correctly set as initial default chat +font. * It is now possible to skip displaying a server's MOTD on connect. -* If the application is set to display a server's MOTD in a fixed-width font and the - previously configured default chat font is already a fixed-width font, the chat font +* If the application is set to display a server's MOTD in a fixed-width font and +the + previously configured default chat font is already a fixed-width font, the +chat font will now be used rather than the global KDE default fixed-width font. -* The state of the automatic spell checking functionality is now remembered across +* The state of the automatic spell checking functionality is now remembered +across sessions and set for all tabs. * Networks no longer lose their channel history when their settings are changed. -* The Server List dialog will no longer close when a connection attempt fails due to +* The Server List dialog will no longer close when a connection attempt fails +due to the identity not being set up correctly. -* After changing your nickname using the optional drop-down menu to the left of the +* After changing your nickname using the optional drop-down menu to the left of +the input line, focus will now be returned to the input line. -* The configuration dialog has been rewritten to correctly update the button state of +* The configuration dialog has been rewritten to correctly update the button +state of its primary actions and improve consistency with the KDE style guide. -* The vertical and horizontal splitters in channel tabs now behave better when the - application window is resized and correctly retain their positions across sessions. +* The vertical and horizontal splitters in channel tabs now behave better when +the + application window is resized and correctly retain their positions across +sessions. * The OSD preview in the OSD settings page is now always shown correctly. * The OSD will no longer be shown when the desktop is locked. -* A bug that prevented copying text from the chat area under certain circumstances has +* A bug that prevented copying text from the chat area under certain +circumstances has been fixed. * Keyboard search in the channel nickname list has been fixed. -* A number of issues affecting nickname context menus in the chat area have been fixed. +* A number of issues affecting nickname context menus in the chat area have been +fixed. * A bug leading to a wrong operator count in the status bar has been fixed. -* It is no longer possible to add nameless networks or hostless servers in the respon- +* It is no longer possible to add nameless networks or hostless servers in the +respon- sible management dialogs. -* Bugs that led to parts of the interface not reacting to KDE color scheme changes have +* Bugs that led to parts of the interface not reacting to KDE color scheme +changes have been fixed. * The status bar now correctly reacts to KDE font size changes. -* A bug that led to the application window resizing on overly long status bar contents +* A bug that led to the application window resizing on overly long status bar +contents has been fixed. -* A bug that led to multiple remember lines being inserted into the frontmost tab when +* A bug that led to multiple remember lines being inserted into the frontmost +tab when away mode was activated has been fixed. -* A bug that led to wrong link addresses being opened from the chat area has been fixed. -* Bugs that led to wrong URLs being produced by dragging a link from the chat area to +* A bug that led to wrong link addresses being opened from the chat area has +been fixed. +* Bugs that led to wrong URLs being produced by dragging a link from the chat +area to the input line have been fixed. * Channel names are now better recognized as such by the chat area. Bookmarking * Bookmark titles now default to the channel name. -* Bookmarks now store the network name rather than the server address where available. +* Bookmarks now store the network name rather than the server address where +available. * Bookmarks now support IPv6 addresses. Commands -* The '/server' command now recognizes a greater variety of address notations including +* The '/server' command now recognizes a greater variety of address notations +including network names. -* The '/names' command now always succeeds in returning the user list of a channel. +* The '/names' command now always succeeds in returning the user list of a +channel. * The '/topic' command now always succeeds in returning the topic of a channel. -* A '/dns' command has been added that facilitates resolving the host name of a user on - the server as well as generic host names. Reverse resolve is supported on KDE 3.5.1+. +* A '/dns' command has been added that facilitates resolving the host name of a +user on + the server as well as generic host names. Reverse resolve is supported on KDE +3.5.1+. * An '/unignore' command has been added. * A '/disconnect' command has been added. -* A '/reconnect' command has been added that disconnects and then reconnects the respec- +* A '/reconnect' command has been added that disconnects and then reconnects the +respec- tive server. -* A '/setkey' command has been added to set the Blowfish encryption/decryption key for +* A '/setkey' command has been added to set the Blowfish encryption/decryption +key for the respective context. * The '/list' command now correctly opens the Channel List tab. * A bug in parsing the arguments of the '/join' command has been fixed. -* Usage information and error reporting for various commands has been rewritten for +* Usage information and error reporting for various commands has been rewritten +for improved consistency and clarity. -* A bug that led to a 'clear' command being sent to the server when using the '/clear' +* A bug that led to a 'clear' command being sent to the server when using the +'/clear' command to clear the contents of a query tab has been fixed. Miscellaneous -* The 'media' script has been rewritten and now features improved compatibility with - common character sets, greatly enhanced support for the Kaffeine media player and +* The 'media' script has been rewritten and now features improved compatibility +with + common character sets, greatly enhanced support for the Kaffeine media player +and newly added support for the Yammi media player. -* The 'sysinfo' script has been rewritten to produce more concise output and better +* The 'sysinfo' script has been rewritten to produce more concise output and +better handle a variety of storage scenarios. -* The convenience feature expanding [[term]] into a Wikipedia link is now localizable - and generates a link that performs an intelligent lookup for the term in the Wiki- +* The convenience feature expanding [[term]] into a Wikipedia link is now +localizable + and generates a link that performs an intelligent lookup for the term in the +Wiki- pedia rather than assume a correct direct link. Technology * Konversation now depends on KDE 3.4+. -* The preferences storage system has been rewritten to facilitate easier maintenance +* The preferences storage system has been rewritten to facilitate easier +maintenance and faster development in future release cycles. * Localized support for a long list of IRC protocol primitives has been added. -* The application will now correctly iterate over a network's servers on successive +* The application will now correctly iterate over a network's servers on +successive failed connection attempts. * When the '/server' command or the Quick Connect dialog is used to connect to a - server that has previously been added to a network in the Server List dialog, it + server that has previously been added to a network in the Server List dialog, +it will be recognized as being part of the network and the respective identity settings will be applied. -* The automated reply to a highlight event can now reference the groups of the matched +* The automated reply to a highlight event can now reference the groups of the +matched pattern by the identifiers %1-%9 and the entire match by the identifier %0. * The CABAP IDENTIFY-MSG technology is now supported. * Compatibility with the Unreal IRC server has been improved. -* Initial support for Blowfish encryption (compatible with mIRCryption and FiSH) has +* Initial support for Blowfish encryption (compatible with mIRCryption and FiSH) +has been added. Note that Diffie-Hellman key exchange (DHX) is not yet supported. * The Watched Nicknames reporting has been made more reliable. * Socket handling in the DCC file transfer feature has been improved. * Alpha-blending of icons in the channel nickname list has been fixed. * Support for the iso-2022-jp encoding has been enhanced. -* The custom web browser feature will now automatically append the URL as a parameter +* The custom web browser feature will now automatically append the URL as a +parameter to the specified command when the %u identifier is missing. -* Channel modes are now correctly cleared and updated in the internal representation +* Channel modes are now correctly cleared and updated in the internal +representation on rejoin. -* A bug that led to an infinite loop during a connection attempt when all nicknames +* A bug that led to an infinite loop during a connection attempt when all +nicknames configured in the identity were in use has been fixed. -* A bug that could lead to a crash when opening the log file for a closed connection has +* A bug that could lead to a crash when opening the log file for a closed +connection has been fixed. ------------------------------------------------------------------------------- @@ -486,12 +1057,16 @@ - /cycle now works as expected - /gauge script was not working correctly when given a bigger than 100 argument - /mail script has been added -- Button to invoke Regular Expression Editor (if installed) in Settings -> Highlight. +- Button to invoke Regular Expression Editor (if installed) in Settings -> +Highlight. - Complete command line argument system for connection -- An option to disable clickable nicks . Add ClickableNicks=false to konversationrc to disable it. +- An option to disable clickable nicks . Add ClickableNicks=false to +konversationrc to disable it. - Fixed a big memory leak in message processing -- Nicklist slider now correctly resizes in all channels when its resized and correctly restores on startup -- [[foo]] is now a link to http://en.wikipedia.org/wiki/foo . We will expand this to local wikipedia's in a later release [Update: Now fixed in 0.19] +- Nicklist slider now correctly resizes in all channels when its resized and +correctly restores on startup +- [[foo]] is now a link to http://en.wikipedia.org/wiki/foo . We will expand +this to local wikipedia's in a later release [Update: Now fixed in 0.19] Changes from 0.16 to 0.17 @@ -525,7 +1100,8 @@ - A media script added to replace amarok,juk,noatun,kaffeine scripts. Use /media instead of using /amarok,/juk etc. - Links can now be dragged & dropped from channels -- Midde clicking urls now opens them in new tab in konqueror ( if konqueror is used for links ) +- Midde clicking urls now opens them in new tab in konqueror ( if konqueror is +used for links ) - Improved unicode detection - Fix unicode detection for strings containing color markup - /omsg,/onotice support @@ -557,7 +1133,8 @@ - display away status of nicks in nick list Changes from 0.13 to 0.14 -- Added irc "pseudo" command /prefs for changing settings without settings dialog. +- Added irc "pseudo" command /prefs for changing settings without settings +dialog. - Measure away time and make it available via placeholder (%t) - (Very much) Improved OSD. - New application icons by luciash d' being . Thanks! @@ -604,7 +1181,8 @@ - Nicks Online is now a tabbed panel, rather than separate window. - Added sound support to the highlight list - Added regular expression support to the highlight list^ -- Follow the style guide when the tray icon is enabled by minimizing to tray when +- Follow the style guide when the tray icon is enabled by minimizing to tray +when the close button is clicked. - Auto text feature on highlight events - DCC resume offers to rename a transfer now @@ -636,8 +1214,10 @@ - Channel list update is now more CPU friendly - Tell the user why the channel list could not be opened - Channel list now sorts correctly when number column is clicked -- Applied a patch by Christian Muehlhaeuser to enable bigger mode changes (thanks) -- Applied a patch by Christian Muehlhaeuser to right-align close widgets (thanks) +- Applied a patch by Christian Muehlhaeuser to enable bigger mode changes +(thanks) +- Applied a patch by Christian Muehlhaeuser to right-align close widgets +(thanks) - Info button on dcc panel now works - Added /unban command - Applied a patch by Christian Muehlhaeuser for OSD functions (thanks) @@ -670,7 +1250,8 @@ - Added konsole panel (thanks to Mickael Marchand) Changes from 0.10 to 0.11 -- Added a patch by Bart Verwilst to provide automatic service registration (thanks!) +- Added a patch by Bart Verwilst to provide automatic service registration +(thanks!) - Added "Hide Menu" function - Improved server connection code to stop konversation freezes at startup - Server lag calculation after reconnect fixed @@ -717,7 +1298,8 @@ - Added ignore list functionality - Added away / unaway messages - DCC folder can now be selected vial GUI -- Applied a patch by Barak Bloch to fix foreign character set behaviour (thanks!) +- Applied a patch by Barak Bloch to fix foreign character set behaviour +(thanks!) - Updated German translation Changes from 0.7 to 0.8: @@ -740,7 +1322,8 @@ - You can now hilight all your own lines independently - Fixed the problem in the appearance dialog with font names - Added DCC error dialogs -- Quit/Nickchange/Kicks are now only reported in channels where the nick actually is in +- Quit/Nickchange/Kicks are now only reported in channels where the nick +actually is in - Fixed bug with lockups on defective logfiles - Added support for EUR currency symbol - Added keyboard handling to navigate between pages diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/config.h.in /tmp/ZeUXpSU1gs/konversation-1.1/config.h.in --- konversation-1.0.1/config.h.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/config.h.in 2008-08-06 16:57:53.000000000 +0100 @@ -84,12 +84,18 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H +/* Define to 1 if you have the header file. */ +#undef HAVE_TGMATH_H + /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF +/* Define if you have the XScreenSaver extension */ +#undef HAVE_XSCREENSAVER + /* Suffix for lib directories */ #undef KDELIBSUFF @@ -111,22 +117,22 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* The size of a `char *', as computed by sizeof. */ +/* The size of `char *', as computed by sizeof. */ #undef SIZEOF_CHAR_P -/* The size of a `int', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of a `short', as computed by sizeof. */ +/* The size of `short', as computed by sizeof. */ #undef SIZEOF_SHORT -/* The size of a `size_t', as computed by sizeof. */ +/* The size of `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of a `unsigned long', as computed by sizeof. */ +/* The size of `unsigned long', as computed by sizeof. */ #undef SIZEOF_UNSIGNED_LONG /* Define to 1 if you have the ANSI C header files. */ diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/configure /tmp/ZeUXpSU1gs/konversation-1.1/configure --- konversation-1.0.1/configure 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/configure 2008-08-06 16:57:53.000000000 +0100 @@ -1,25 +1,54 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.61. # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -29,8 +58,43 @@ fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -44,18 +108,19 @@ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -63,157 +128,388 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no fi + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || + chmod +x "$as_me.lineno" || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -222,7 +518,28 @@ as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -231,15 +548,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - # Check that we are running under the correct shell. @@ -395,29 +703,26 @@ tagnames=${tagnames+${tagnames},}F77 +exec 7<&0 &1 + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME= PACKAGE_TARNAME= @@ -430,42 +735,319 @@ # Factoring default headers for most tests. ac_includes_default="\ #include -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include # include #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include # endif # include #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include -#else -# if HAVE_STDINT_H -# include -# endif #endif -#if HAVE_UNISTD_H +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H # include #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 LIB_ARTS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIB_KIMIFACE TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE konversation_SUBDIR_included_TRUE konversation_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +target +target_cpu +target_vendor +target_os +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +am__isrc +CYGPATH_W +PACKAGE +VERSION +ACLOCAL +AUTOCONF +AUTOMAKE +AUTOHEADER +MAKEINFO +install_sh +STRIP +INSTALL_STRIP_PROGRAM +mkdir_p +AWK +SET_MAKE +am__leading_dot +AMTAR +am__tar +am__untar +KDECONFIG +kde_libs_prefix +kde_libs_htmldir +CONF_FILES +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +DEPDIR +am__include +am__quote +AMDEP_TRUE +AMDEP_FALSE +AMDEPBACKSLASH +CCDEPMODE +am__fastdepCC_TRUE +am__fastdepCC_FALSE +CPP +CXX +CXXFLAGS +ac_ct_CXX +CXXDEPMODE +am__fastdepCXX_TRUE +am__fastdepCXX_FALSE +WOVERLOADED_VIRTUAL +HAVE_GCC_VISIBILITY +unsermake_enable_pch_TRUE +unsermake_enable_pch_FALSE +USE_EXCEPTIONS +USE_RTTI +CXXCPP +NOOPT_CXXFLAGS +NOOPT_CFLAGS +ENABLE_PERMISSIVE_FLAG +LDFLAGS_AS_NEEDED +LDFLAGS_NEW_DTAGS +KDE_USE_FINAL_TRUE +KDE_USE_FINAL_FALSE +KDE_USE_CLOSURE_TRUE +KDE_USE_CLOSURE_FALSE +KDE_NO_UNDEFINED +KDE_USE_NMCHECK_TRUE +KDE_USE_NMCHECK_FALSE +GREP +EGREP +LN_S +ECHO +AR +RANLIB +F77 +FFLAGS +ac_ct_F77 +LIBTOOL +KDE_PLUGIN +KDE_CHECK_PLUGIN +MSGFMT +GMSGFMT +XGETTEXT +PKG_CONFIG +LIBUTIL +LIBCOMPAT +LIBCRYPT +LIBRESOLV +LIB_POLL +FRAMEWORK_COREAUDIO +LIBSOCKET +X_EXTRA_LIBS +LIBUCB +LIBDL +KDE_USE_FPIE +KDE_USE_PIE +include_x11_TRUE +include_x11_FALSE +XMKMF +X_PRE_LIBS +LIB_X11 +LIB_XRENDER +LIBSM +X_INCLUDES +X_LDFLAGS +x_includes +x_libraries +QTE_NORTTI +LIB_XEXT +LIBPTHREAD +USE_THREADS +KDE_MT_LDFLAGS +KDE_MT_LIBS +USER_INCLUDES +USER_LDFLAGS +LIBZ +LIBPNG +LIBJPEG +qt_libraries +qt_includes +QT_INCLUDES +QT_LDFLAGS +PERL +MOC +UIC +UIC_TR +LIB_QT +LIB_QPE +kde_qtver +KDE_EXTRA_RPATH +KDE_RPATH +X_RPATH +kde_libraries +kde_includes +KDE_LDFLAGS +KDE_INCLUDES +all_includes +all_libraries +AUTODIRS +include_ARTS_TRUE +include_ARTS_FALSE +MAKEKDEWIDGETS +KCONFIG_COMPILER +KCFG_DEPENDENCIES +DCOPIDLNG +DCOPIDL +DCOPIDL2CPP +DCOP_DEPENDENCIES +MCOPIDL +ARTSCCONFIG +MEINPROC +KDE_XSL_STYLESHEET +XMLLINT +kde_htmldir +kde_appsdir +kde_icondir +kde_sounddir +kde_datadir +kde_locale +kde_confdir +kde_kcfgdir +kde_mimedir +kde_wallpaperdir +kde_bindir +xdg_appsdir +xdg_menudir +xdg_directorydir +kde_templatesdir +kde_servicesdir +kde_servicetypesdir +kde_moduledir +kdeinitdir +kde_styledir +kde_widgetdir +LIB_KDED +LIB_KDECORE +LIB_KDEUI +LIB_KIO +LIB_KJS +LIB_SMB +LIB_KAB +LIB_KABC +LIB_KHTML +LIB_KSPELL +LIB_KPARTS +LIB_KDEPRINT +LIB_KUTILS +LIB_KDEPIM +LIB_KIMPROXY +LIB_KNEWSTUFF +LIB_KDNSSD +LIB_KUNITTEST +LIB_KSYCOCA +LIB_KFILE +LIB_KFM +LIB_ARTS +QTDOCDIR +KDE_HAVE_DOT +DOXYGEN +DOXYGEN_PROJECT_NAME +DOXYGEN_PROJECT_NUMBER +KDE_HAS_DOXYGEN +LIB_KIMIFACE +LIB_XSS +TOPSUBDIRS +doc_SUBDIR_included_TRUE +doc_SUBDIR_included_FALSE +konversation_SUBDIR_included_TRUE +konversation_SUBDIR_included_FALSE +po_SUBDIR_included_TRUE +po_SUBDIR_included_FALSE +LIBOBJS +LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP +CXX +CXXFLAGS +CCC +CXXCPP +F77 +FFLAGS +XMKMF' + # Initialize some variables set by options. ac_init_help= @@ -492,34 +1074,48 @@ # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -541,33 +1137,45 @@ --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -594,6 +1202,12 @@ -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -618,13 +1232,16 @@ | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -689,6 +1306,16 @@ | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -741,24 +1368,20 @@ -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -789,8 +1412,7 @@ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) @@ -810,27 +1432,19 @@ { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -857,22 +1471,43 @@ test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$0" : 'X\(//\)[^/]' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. @@ -881,70 +1516,31 @@ ac_srcdir_defaulted=no fi if test ! -r "$srcdir/$ac_unique_file"; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } - fi fi -(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP -ac_env_F77_set=${F77+set} -ac_env_F77_value=$F77 -ac_cv_env_F77_set=${F77+set} -ac_cv_env_F77_value=$F77 -ac_env_FFLAGS_set=${FFLAGS+set} -ac_env_FFLAGS_value=$FFLAGS -ac_cv_env_FFLAGS_set=${FFLAGS+set} -ac_cv_env_FFLAGS_value=$FFLAGS +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -973,9 +1569,6 @@ -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] @@ -993,15 +1586,22 @@ --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1042,10 +1642,8 @@ of memory) --enable-closure delay template instantiation --enable-nmcheck enable automatic namespace cleanness check - --enable-shared[=PKGS] - build shared libraries [default=yes] - --enable-static[=PKGS] - build static libraries [default=no] + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=no] --enable-libsuffix /lib directory suffix (64,32,none,auto=default) --enable-fast-install[=PKGS] optimize for fast installation [default=yes] @@ -1065,8 +1663,7 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-pic try to use only PIC/non-PIC objects [default=use both] - --with-tags[=TAGS] - include additional configurations [automatic] + --with-tags[=TAGS] include additional configurations [automatic] --with-extra-includes=DIR adds non standard include paths --with-extra-libs=DIR adds non standard library paths @@ -1080,131 +1677,101 @@ CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags + XMKMF Path to xmkmf, Makefile generator for X Window System Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || continue ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +configure +generated by GNU Autoconf 2.61 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF +cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1223,7 +1790,7 @@ /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -1237,6 +1804,7 @@ test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1258,7 +1826,6 @@ ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1269,7 +1836,7 @@ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1291,9 +1858,7 @@ -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac done @@ -1304,8 +1869,8 @@ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -1318,20 +1883,34 @@ _ASBOX echo # The following way of writing the cache mishandles newlines in values, -{ +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo cat <<\_ASBOX @@ -1342,22 +1921,28 @@ echo for ac_var in $ac_subst_vars do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## +## ------------------- ## +## File substitutions. ## +## ------------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1369,26 +1954,24 @@ ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + cat confdefs.h echo fi test "$ac_signal" != 0 && echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h # Predefined preprocessor variables. @@ -1419,14 +2002,17 @@ # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +do if test -r "$ac_site_file"; then { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} @@ -1442,8 +2028,8 @@ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else @@ -1455,12 +2041,11 @@ # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 @@ -1485,8 +2070,7 @@ # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1503,12 +2087,6 @@ { (exit 1); exit 1; }; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - @@ -1525,110 +2103,165 @@ +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_aux_dir= -for ac_dir in admin $srcdir/admin; do - if test -f $ac_dir/install-sh; then +for ac_dir in admin "$srcdir"/admin; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;} { (exit 1); exit 1; }; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + unset CDPATH # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6; } if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_target_alias=$target_alias -test "x$ac_cv_target_alias" = "x" && - ac_cv_target_alias=$ac_cv_host_alias -ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + if test "x$target_alias" = x; then + ac_cv_target=$ac_cv_host +else + ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6; } +case $ac_cv_target in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 +echo "$as_me: error: invalid value of canonical target" >&2;} + { (exit 1); exit 1; }; };; +esac target=$ac_cv_target -target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_target +shift +target_cpu=$1 +target_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +target_os=$* +IFS=$ac_save_IFS +case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac # The aliases save the names the user supplied, while $host etc. @@ -1638,20 +2271,21 @@ NONENONEs,x,x, && program_prefix=${target_alias}- test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" + program_transform_name="s&\$&$program_suffix&;$program_transform_name" # Double any \ or $. echo might interpret backslashes. # By default was `s,x,x', remove it if useless. cat <<\_ACEOF >conftest.sed s/[\\$]/&&/g;s/;s,x,x,$// _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +rm -f conftest.sed -am__api_version="1.9" +am__api_version='1.10' + test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL @@ -1670,8 +2304,8 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1693,7 +2327,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1712,21 +2346,22 @@ ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -1740,8 +2375,8 @@ if test -z "$kde_save_INSTALL_given" ; then # OK, user hasn't given any INSTALL, autoconf found one for us # now we test, if it supports the -p flag - echo "$as_me:$LINENO: checking for -p flag to install" >&5 -echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for -p flag to install" >&5 +echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; } rm -f confinst.$$.* > /dev/null 2>&1 echo "Testtest" > confinst.$$.orig ac_res=no @@ -1753,8 +2388,8 @@ fi fi rm -f confinst.$$.* - echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6 + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test -z "$kde_save_INSTALL_PROGRAM_given" ; then @@ -1764,8 +2399,8 @@ INSTALL_SCRIPT='${INSTALL}' fi -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -1807,8 +2442,8 @@ Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1822,45 +2457,60 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" else - mkdir_p='$(install_sh) -d' + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" fi fi +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +echo "${ECHO_T}$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AWK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1873,54 +2523,57 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6 + { echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$AWK" && break done -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac rm -f conftest.make fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SET_MAKE= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -1933,12 +2586,16 @@ fi rmdir .tst 2>/dev/null -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } + fi fi # test whether we have cygpath @@ -1953,7 +2610,7 @@ # Define the identity of the package. PACKAGE=konversation - VERSION=1.0.1 + VERSION=1.1 cat >>confdefs.h <<_ACEOF @@ -1981,7 +2638,7 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right @@ -1991,8 +2648,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2005,32 +2662,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2043,33 +2702,47 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -2101,14 +2774,14 @@ if test "x$prefix" = "xNONE"; then - echo "$as_me:$LINENO: checking for kde-config" >&5 -echo $ECHO_N "checking for kde-config... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for kde-config" >&5 +echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } if test -n "$KDECONFIG"; then kde_cv_path="$KDECONFIG"; else kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2151,8 +2824,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program kde-config was not found! Please check whether you installed KDE correctly. @@ -2163,8 +2836,8 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } KDECONFIG=$kde_cv_path fi @@ -2173,14 +2846,14 @@ kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - echo "$as_me:$LINENO: checking for kde-config" >&5 -echo $ECHO_N "checking for kde-config... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for kde-config" >&5 +echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } if test -n "$KDECONFIG"; then kde_cv_path="$KDECONFIG"; else kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2223,8 +2896,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program kde-config was not found! Please check whether you installed KDE correctly. @@ -2235,8 +2908,8 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } KDECONFIG=$kde_cv_path fi @@ -2258,16 +2931,16 @@ fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` - echo "$as_me:$LINENO: checking where to install" >&5 -echo $ECHO_N "checking where to install... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking where to install" >&5 +echo $ECHO_N "checking where to install... $ECHO_C" >&6; } if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5 -echo "${ECHO_T}$prefix (as returned by kde-config)" >&6 + { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5 +echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; } else given_prefix=$prefix - echo "$as_me:$LINENO: result: $prefix (as requested)" >&5 -echo "${ECHO_T}$prefix (as requested)" >&6 + { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5 +echo "${ECHO_T}$prefix (as requested)" >&6; } fi # And delete superfluous '/' to make compares easier @@ -2280,13 +2953,13 @@ - # Check whether --enable-fast-perl or --disable-fast-perl was given. + # Check whether --enable-fast-perl was given. if test "${enable_fast_perl+set}" = set; then - enableval="$enable_fast_perl" - with_fast_perl=$enableval + enableval=$enable_fast_perl; with_fast_perl=$enableval else with_fast_perl=yes -fi; +fi + val= @@ -2303,11 +2976,11 @@ - ac_config_headers="$ac_config_headers config.h" +ac_config_headers="$ac_config_headers config.h" DEPDIR="${am__leading_dot}deps" - ac_config_commands="$ac_config_commands depfiles" +ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} @@ -2317,8 +2990,8 @@ .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } am__include="#" am__quote= _am_result=none @@ -2345,22 +3018,20 @@ fi -echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6 +{ echo "$as_me:$LINENO: result: $_am_result" >&5 +echo "${ECHO_T}$_am_result" >&6; } rm -f confinc confmf -# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +# Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then - enableval="$enable_dependency_tracking" + enableval=$enable_dependency_tracking; +fi -fi; if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' fi - - -if test "x$enable_dependency_tracking" != xno; then + if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= AMDEP_FALSE='#' else @@ -2372,11 +3043,9 @@ - - # Check whether --enable-debug or --disable-debug was given. + # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - + enableval=$enable_debug; case $enableval in yes) kde_use_debug_code="yes" @@ -2396,18 +3065,18 @@ kde_use_debug_code="no" kde_use_debug_define=no -fi; +fi + - # Check whether --enable-dummyoption or --disable-dummyoption was given. + # Check whether --enable-dummyoption was given. if test "${enable_dummyoption+set}" = set; then - enableval="$enable_dummyoption" + enableval=$enable_dummyoption; +fi -fi; - # Check whether --enable-strict or --disable-strict was given. + # Check whether --enable-strict was given. if test "${enable_strict+set}" = set; then - enableval="$enable_strict" - + enableval=$enable_strict; if test $enableval = "no"; then kde_use_strict_options="no" else @@ -2416,12 +3085,12 @@ else kde_use_strict_options="no" -fi; +fi - # Check whether --enable-warnings or --disable-warnings was given. -if test "${enable_warnings+set}" = set; then - enableval="$enable_warnings" + # Check whether --enable-warnings was given. +if test "${enable_warnings+set}" = set; then + enableval=$enable_warnings; if test $enableval = "no"; then kde_use_warnings="no" else @@ -2430,20 +3099,21 @@ else kde_use_warnings="yes" -fi; +fi + if test "$kde_use_debug_code" != "no"; then kde_use_warnings=yes fi - # Check whether --enable-profile or --disable-profile was given. + # Check whether --enable-profile was given. if test "${enable_profile+set}" = set; then - enableval="$enable_profile" - kde_use_profiling=$enableval + enableval=$enable_profile; kde_use_profiling=$enableval else kde_use_profiling="no" -fi; +fi + CFLAGS=" $CFLAGS" @@ -2455,8 +3125,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2469,32 +3139,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2507,36 +3179,51 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2549,74 +3236,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi + fi fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2630,7 +3277,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2641,6 +3288,7 @@ fi done done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -2658,22 +3306,23 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2686,36 +3335,38 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2728,29 +3379,45 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi @@ -2763,21 +3430,35 @@ { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 +echo "$as_me:$LINENO: checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -2802,47 +3483,77 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. break;; * ) break;; esac done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -2854,19 +3565,21 @@ fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -2885,22 +3598,27 @@ fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } + +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -2911,9 +3629,8 @@ for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext break;; * ) break;; esac @@ -2927,14 +3644,14 @@ fi rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2954,14 +3671,20 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -2979,12 +3702,12 @@ rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3007,50 +3730,49 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3066,38 +3788,118 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3113,12 +3915,12 @@ CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3152,12 +3954,17 @@ /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get + as 'x'. The following induces an error, until -std is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ + that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -3172,205 +3979,57 @@ return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3379,8 +4038,8 @@ depcc="$CC" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3444,6 +4103,7 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -3469,13 +4129,11 @@ fi fi -echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -3492,8 +4150,8 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3527,24 +4185,22 @@ #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -3553,9 +4209,10 @@ # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3565,24 +4222,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -3593,6 +4248,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3610,8 +4266,8 @@ else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3634,24 +4290,22 @@ #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -3660,9 +4314,10 @@ # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3672,24 +4327,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -3700,6 +4353,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3750,18 +4404,22 @@ CXXFLAGS=" $CXXFLAGS" - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3774,36 +4432,38 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 + { echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3816,55 +4476,85 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CXX" && break done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - CXX=$ac_ct_CXX + if test "x$ac_ct_CXX" = x; then + CXX="g++" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CXX=$ac_ct_CXX + fi fi - + fi +fi # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3887,50 +4577,49 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_cxx_werror_flag=$ac_cxx_werror_flag + ac_cxx_werror_flag=yes + ac_cv_prog_cxx_g=no + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3946,159 +4635,133 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF + CXXFLAGS="" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration -#include + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF + ac_cxx_werror_flag=$ac_save_cxx_werror_flag + CXXFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_declaration + int main () { -exit (42); + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cxx_werror_flag=$ac_save_cxx_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4107,8 +4770,8 @@ depcc="$CXX" am_compiler_list= -echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4172,6 +4835,7 @@ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -4197,13 +4861,11 @@ fi fi -echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then am__fastdepCXX_TRUE= @@ -4216,8 +4878,8 @@ - echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5 -echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5 +echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF @@ -4242,39 +4904,35 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_bad_compiler=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_bad_compiler=yes + kde_bad_compiler=yes fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5 -echo "${ECHO_T}$kde_bad_compiler" >&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5 +echo "${ECHO_T}$kde_bad_compiler" >&6; } if test "$kde_bad_compiler" = "yes"; then { { echo "$as_me:$LINENO: error: @@ -4316,17 +4974,16 @@ fi fi -echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5 -echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5 +echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; } kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - -ac_ext=cc +ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4354,34 +5011,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4394,29 +5049,28 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="-fno-builtin $CXXFLAGS" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5 -echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5 +echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; } kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4443,34 +5097,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4483,13 +5135,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : WOVERLOADED_VIRTUAL="-Woverloaded-virtual" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : WOVERLOADED_VRITUAL="" fi @@ -4510,16 +5162,15 @@ if test "$kde_use_profiling" = "yes"; then -echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5 -echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5 +echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; } kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4546,34 +5197,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4586,16 +5235,16 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CFLAGS="-pg $CFLAGS" CXXFLAGS="-pg $CXXFLAGS" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -4608,18 +5257,17 @@ case $host in *-*-linux-gnu) CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" - CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS" + CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS" -echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5 -echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5 +echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; } kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4646,34 +5294,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4686,27 +5332,26 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5 -echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5 +echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; } kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cc_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4731,34 +5376,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cc_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$save_CFLAGS" ac_ext=c @@ -4771,13 +5414,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -4785,16 +5428,15 @@ ;; esac -echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5 -echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5 +echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; } kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4821,34 +5463,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4861,28 +5501,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="-Wundef $CXXFLAGS" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5 -echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5 +echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; } kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4909,34 +5548,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -4949,28 +5586,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="-Wno-long-long $CXXFLAGS" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5 -echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5 +echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; } kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -4997,34 +5633,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5037,13 +5671,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -5055,13 +5689,13 @@ CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS" fi - # Check whether --enable-pch or --disable-pch was given. + # Check whether --enable-pch was given. if test "${enable_pch+set}" = set; then - enableval="$enable_pch" - kde_use_pch=$enableval + enableval=$enable_pch; kde_use_pch=$enableval else kde_use_pch=no -fi; +fi + HAVE_GCC_VISIBILITY=0 @@ -5069,16 +5703,15 @@ if test "$GXX" = "yes"; then gcc_no_reorder_blocks=NO -echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5 -echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5 +echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; } kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5105,34 +5738,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5145,13 +5776,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : gcc_no_reorder_blocks=YES else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -5163,16 +5794,15 @@ CFLAGS="$CFLAGS -fno-reorder-blocks" fi -echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5 -echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5 +echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; } kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5199,34 +5829,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5239,28 +5867,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS -fno-exceptions" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5 -echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5 +echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; } kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5287,34 +5914,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5327,28 +5952,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS -fno-check-new" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5 -echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5 +echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; } kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5375,34 +5999,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5415,28 +6037,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS -fno-common" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5 -echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5 +echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; } kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5463,34 +6084,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5503,13 +6122,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : USE_EXCEPTIONS="-fexceptions" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : USE_EXCEPTIONS= fi @@ -5517,37 +6136,37 @@ ENABLE_PERMISSIVE_FLAG="-fpermissive" if test "$kde_use_pch" = "yes"; then - echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5 -echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5 +echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; } echo >conftest.h if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then kde_gcc_supports_pch=yes - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else kde_gcc_supports_pch=no - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test "$kde_gcc_supports_pch" = "yes"; then - echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5 -echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5 +echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; } if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then kde_gcc_supports_pch=yes - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else kde_gcc_supports_pch=no - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi rm -f conftest.h conftest.h.gch fi - echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5 -echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5 +echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; } if test "${kde_cv_opt_noinline_match+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5579,52 +6198,47 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_opt_noinline_match=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_opt_noinline_match=no + kde_cv_opt_noinline_match=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_cflags_save" fi fi -echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5 -echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5 +echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; } if test "x$kde_cv_opt_noinline_match" = "xno" ; then CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`" fi fi - - -if test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes"; then + if test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes"; then unsermake_enable_pch_TRUE= unsermake_enable_pch_FALSE='#' else @@ -5636,16 +6250,15 @@ if test "$kde_use_pch" = "yes"; then -echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5 -echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5 +echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; } kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5672,34 +6285,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5712,29 +6323,28 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS --pch" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi fi -echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5 -echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5 +echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; } kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5761,34 +6371,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5801,28 +6409,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5 -echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5 +echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; } kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5849,34 +6456,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5889,28 +6494,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5 -echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5 +echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; } kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -5937,34 +6541,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -5977,28 +6579,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5 -echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5 +echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; } kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -6025,34 +6626,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6065,28 +6664,27 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5 -echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5 +echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; } kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -6113,34 +6711,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6153,13 +6749,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : CXXFLAGS="$CXXFLAGS --one_per" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -6266,13 +6862,13 @@ fi - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6302,24 +6898,22 @@ #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -6328,9 +6922,10 @@ # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6340,24 +6935,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -6368,6 +6961,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -6385,8 +6979,8 @@ else ac_cv_prog_CXXCPP=$CXXCPP fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -6409,24 +7003,22 @@ #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -6435,9 +7027,10 @@ # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -6447,24 +7040,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -6475,6 +7066,7 @@ ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -6501,16 +7093,15 @@ NOOPT_CFLAGS=-O0 fi -echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5 -echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5 +echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; } kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -6537,34 +7128,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6577,22 +7166,21 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : NOOPT_CXXFLAGS=-O0 else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi - # Check whether --enable-coverage or --disable-coverage was given. + # Check whether --enable-coverage was given. if test "${enable_coverage+set}" = set; then - enableval="$enable_coverage" - + enableval=$enable_coverage; if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then ac_coverage_compiler="-fprofile-arcs -ftest-coverage" ac_coverage_linker="-lgcc" @@ -6608,36 +7196,36 @@ CXXFLAGS="$CXXFLAGS $ac_coverage_compiler" LDFLAGS="$LDFLAGS $ac_coverage_linker" -fi; +fi + - # Check whether --enable-new_ldflags or --disable-new_ldflags was given. + # Check whether --enable-new_ldflags was given. if test "${enable_new_ldflags+set}" = set; then - enableval="$enable_new_ldflags" - kde_use_new_ldflags=$enableval + enableval=$enable_new_ldflags; kde_use_new_ldflags=$enableval else kde_use_new_ldflags=no -fi; +fi + LDFLAGS_AS_NEEDED="" LDFLAGS_NEW_DTAGS="" if test "x$kde_use_new_ldflags" = "xyes"; then LDFLAGS_NEW_DTAGS="" -echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5 -echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5 +echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; } kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -6664,34 +7252,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6704,29 +7290,28 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi -echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5 -echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5 +echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; } kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -6753,34 +7338,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6793,13 +7376,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : LDFLAGS_AS_NEEDED="-Wl,--as-needed" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -6809,13 +7392,13 @@ - # Check whether --enable-final or --disable-final was given. + # Check whether --enable-final was given. if test "${enable_final+set}" = set; then - enableval="$enable_final" - kde_use_final=$enableval + enableval=$enable_final; kde_use_final=$enableval else kde_use_final=no -fi; +fi + if test "x$kde_use_final" = "xyes"; then KDE_USE_FINAL_TRUE="" @@ -6828,13 +7411,13 @@ - # Check whether --enable-closure or --disable-closure was given. + # Check whether --enable-closure was given. if test "${enable_closure+set}" = set; then - enableval="$enable_closure" - kde_use_closure=$enableval + enableval=$enable_closure; kde_use_closure=$enableval else kde_use_closure=no -fi; +fi + KDE_NO_UNDEFINED="" if test "x$kde_use_closure" = "xyes"; then @@ -6848,16 +7431,15 @@ case $host in *-*-linux-gnu) -echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5 -echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5 +echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6; } kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -6884,34 +7466,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -6924,20 +7504,19 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : -echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5 -echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5 +echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6; } kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -6964,34 +7543,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -7004,20 +7581,20 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : KDE_NO_UNDEFINED="" fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : KDE_NO_UNDEFINED="" fi @@ -7030,13 +7607,13 @@ - # Check whether --enable-nmcheck or --disable-nmcheck was given. + # Check whether --enable-nmcheck was given. if test "${enable_nmcheck+set}" = set; then - enableval="$enable_nmcheck" - kde_use_nmcheck=$enableval + enableval=$enable_nmcheck; kde_use_nmcheck=$enableval else kde_use_nmcheck=no -fi; +fi + if test "$kde_use_nmcheck" = "yes"; then KDE_USE_NMCHECK_TRUE="" @@ -7051,10 +7628,9 @@ -# Check whether --enable-shared or --disable-shared was given. +# Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} + enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; no) enable_shared=no ;; @@ -7073,12 +7649,12 @@ esac else enable_shared=yes -fi; +fi + -# Check whether --enable-static or --disable-static was given. +# Check whether --enable-static was given. if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} + enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; no) enable_static=no ;; @@ -7097,18 +7673,19 @@ esac else enable_static=no -fi; +fi + - # Check whether --enable-libsuffix or --disable-libsuffix was given. + # Check whether --enable-libsuffix was given. if test "${enable_libsuffix+set}" = set; then - enableval="$enable_libsuffix" - kdelibsuff=$enableval + enableval=$enable_libsuffix; kdelibsuff=$enableval else kdelibsuff="auto" -fi; +fi + if test "$kdelibsuff" = "auto"; then @@ -7129,8 +7706,8 @@ kdelibsuff= fi if test -z "$kdelibsuff"; then - echo "$as_me:$LINENO: result: not using lib directory suffix" >&5 -echo "${ECHO_T}not using lib directory suffix" >&6 + { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5 +echo "${ECHO_T}not using lib directory suffix" >&6; } cat >>confdefs.h <<\_ACEOF #define KDELIBSUFF "" @@ -7146,14 +7723,13 @@ #define KDELIBSUFF "${kdelibsuff}" _ACEOF - echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5 -echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6 + { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5 +echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; } fi -# Check whether --enable-fast-install or --disable-fast-install was given. +# Check whether --enable-fast-install was given. if test "${enable_fast_install+set}" = set; then - enableval="$enable_fast_install" - p=${PACKAGE-default} + enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; no) enable_fast_install=no ;; @@ -7172,10 +7748,11 @@ esac else enable_fast_install=yes -fi; +fi + -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } if test "${lt_cv_path_SED+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7228,37 +7805,184 @@ fi SED=$lt_cv_path_SED -echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6 +{ echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6; } + +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_GREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_GREP=$GREP +fi -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_EGREP=$EGREP +fi + + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -7287,11 +8011,11 @@ ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7324,17 +8048,17 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7348,20 +8072,20 @@ ;; esac fi -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else lt_cv_ld_reload_flag='-r' fi -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -7369,8 +8093,8 @@ esac reload_cmds='$LD$reload_flag -o $output$reload_objs' -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } if test "${lt_cv_path_NM+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7411,23 +8135,23 @@ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +echo "${ECHO_T}$lt_cv_path_NM" >&6; } NM="$lt_cv_path_NM" -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } fi -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7633,8 +8357,8 @@ esac fi -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -7646,11 +8370,11 @@ # Allow CC to be a program name with arguments. compiler=$CC -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good @@ -7677,7 +8401,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7680 "configure"' > conftest.$ac_ext + echo '#line 8404 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7764,8 +8488,8 @@ # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } if test "${lt_cv_cc_needs_belf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7791,35 +8515,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -lt_cv_cc_needs_belf=no + lt_cv_cc_needs_belf=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -7828,8 +8549,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -7842,8 +8563,8 @@ -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7867,35 +8588,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -7951,6 +8668,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include +#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -7970,18 +8688,27 @@ for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -7994,12 +8721,14 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -8022,9 +8751,9 @@ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -8038,38 +8767,35 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -8084,18 +8810,19 @@ for ac_header in dlfcn.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8106,41 +8833,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8149,24 +8872,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -8174,9 +8895,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -8200,25 +8922,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -8235,12 +8951,12 @@ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8253,36 +8969,38 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then - echo "$as_me:$LINENO: result: $F77" >&5 -echo "${ECHO_T}$F77" >&6 + { echo "$as_me:$LINENO: result: $F77" >&5 +echo "${ECHO_T}$F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$F77" && break done fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran + for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8295,48 +9013,78 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then - echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -echo "${ECHO_T}$ac_ct_F77" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +echo "${ECHO_T}$ac_ct_F77" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_F77" && break done - F77=$ac_ct_F77 + if test "x$ac_ct_F77" = x; then + F77="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + F77=$ac_ct_F77 + fi fi # Provide some information about the compiler. -echo "$as_me:8325:" \ - "checking for Fortran 77 compiler version" >&5 +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -8346,8 +9094,8 @@ # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } if test "${ac_cv_f77_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8360,46 +9108,42 @@ end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } ac_ext=$ac_save_ext ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= -echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_f77_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8410,39 +9154,35 @@ end _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_f77_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_f77_g=no + ac_cv_prog_f77_g=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then @@ -8471,8 +9211,8 @@ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments -echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } if test "${lt_cv_sys_max_cmd_len+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8530,19 +9270,19 @@ fi if test -n $lt_cv_sys_max_cmd_len ; then - echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 + { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } else - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 + { echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6; } fi # Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8730,15 +9470,15 @@ lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 + { echo "$as_me:$LINENO: result: failed" >&5 +echo "${ECHO_T}failed" >&6; } else - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 + { echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6; } fi -echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for objdir" >&5 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } if test "${lt_cv_objdir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8752,8 +9492,8 @@ fi rmdir .libs 2>/dev/null fi -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +echo "${ECHO_T}$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -8804,8 +9544,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8818,32 +9558,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6 + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8856,27 +9598,41 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +echo "${ECHO_T}$ac_ct_AR" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - AR=$ac_ct_AR + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi else AR="$ac_cv_prog_AR" fi @@ -8884,8 +9640,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8898,32 +9654,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8936,27 +9694,41 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - RANLIB=$ac_ct_RANLIB + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else RANLIB="$ac_cv_prog_RANLIB" fi @@ -8964,8 +9736,8 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8978,32 +9750,34 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9016,27 +9790,41 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - STRIP=$ac_ct_STRIP + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi else STRIP="$ac_cv_prog_STRIP" fi @@ -9083,8 +9871,8 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9136,17 +9924,17 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for file" >&5 +echo $ECHO_N "checking for file... $ECHO_C" >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9198,11 +9986,11 @@ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 + { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +echo "${ECHO_T}$MAGIC_CMD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi else @@ -9217,21 +10005,21 @@ enable_dlopen=yes enable_win32_dll=no -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. +# Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" + enableval=$enable_libtool_lock; +fi -fi; test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# Check whether --with-pic or --without-pic was given. +# Check whether --with-pic was given. if test "${with_pic+set}" = set; then - withval="$with_pic" - pic_mode="$withval" + withval=$with_pic; pic_mode="$withval" else pic_mode=default -fi; +fi + test -z "$pic_mode" && pic_mode=default # Use C for the default configuration in the libtool script @@ -9291,8 +10079,8 @@ # # 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 +{ 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 @@ -9314,8 +10102,8 @@ LDFLAGS="$save_LDFLAGS" fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_static_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; } if test x"$lt_prog_compiler_static_works" = xyes; then : @@ -9336,8 +10124,8 @@ lt_prog_compiler_no_builtin_flag=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9354,11 +10142,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9357: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10145: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9361: \$? = $ac_status" >&5 + echo "$as_me:10149: \$? = $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 @@ -9369,8 +10157,8 @@ $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -9384,8 +10172,8 @@ lt_prog_compiler_pic= lt_prog_compiler_static= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -9561,16 +10349,16 @@ esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9587,11 +10375,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9590: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10378: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9594: \$? = $ac_status" >&5 + echo "$as_me:10382: \$? = $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 @@ -9602,8 +10390,8 @@ $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } if test x"$lt_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -9626,8 +10414,8 @@ ;; 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 +{ 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9654,11 +10442,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9657: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10445: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9661: \$? = $ac_status" >&5 + echo "$as_me:10449: \$? = $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 @@ -9675,23 +10463,23 @@ $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -9701,8 +10489,8 @@ need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag= @@ -9997,27 +10785,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -10028,8 +10812,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -10059,27 +10845,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -10090,8 +10872,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -10513,8 +11297,8 @@ esac fi -echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +echo "${ECHO_T}$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -10539,8 +11323,8 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -10576,16 +11360,16 @@ cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +echo "${ECHO_T}$archive_cmds_need_lc" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -10928,7 +11712,7 @@ libsuff= if test "x$LINUX_64_MODE" = x64; then # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64; then + if test -d /lib64 -a ! -h /lib64; then libsuff=64 fi fi @@ -11102,12 +11886,12 @@ dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var " || \ @@ -11131,8 +11915,8 @@ # directories. hardcode_action=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 +echo "${ECHO_T}$hardcode_action" >&6; } if test "$hardcode_action" = relink; then # Fast installation is not supported @@ -11145,29 +11929,29 @@ striplib= old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi ;; *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; esac fi @@ -11199,8 +11983,8 @@ darwin*) # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11213,56 +11997,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -11276,8 +12057,8 @@ ;; *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11304,73 +12085,64 @@ #undef shl_load -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) +#if defined __stub_shl_load || defined __stub___shl_load choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shl_load; +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11383,61 +12155,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); int main () { -shl_load (); +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11464,73 +12233,64 @@ #undef dlopen -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) +#if defined __stub_dlopen || defined __stub___dlopen choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != dlopen; +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11543,61 +12303,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11610,61 +12367,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11677,56 +12431,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dld_link (); int main () { -dld_link (); +return dld_link (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi @@ -11766,8 +12517,8 @@ 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 + { 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 @@ -11777,7 +12528,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 + { 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 @@ -11875,7 +12626,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -11980,13 +12731,13 @@ # Report which librarie types wil actually be built -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -12043,15 +12794,15 @@ fi ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -12530,11 +13281,11 @@ CC="$lt_save_CC" -# Check whether --with-tags or --without-tags was given. +# Check whether --with-tags was given. if test "${with_tags+set}" = set; then - withval="$with_tags" - tagnames="$withval" -fi; + withval=$with_tags; tagnames="$withval" +fi + if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then @@ -12583,7 +13334,7 @@ case $tagname in CXX) if test -n "$CXX" && test "X$CXX" != "Xno"; then - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -12675,18 +13426,18 @@ # Set up default GNU C++ configuration -# Check whether --with-gnu-ld or --without-gnu-ld was given. +# Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes else with_gnu_ld=no -fi; +fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -12715,11 +13466,11 @@ ;; esac elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for GNU ld" >&5 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } fi if test "${lt_cv_path_LD+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -12752,17 +13503,17 @@ LD="$lt_cv_path_LD" if test -n "$LD"; then - echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6 + { echo "$as_me:$LINENO: result: $LD" >&5 +echo "${ECHO_T}$LD" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12776,8 +13527,8 @@ ;; esac fi -echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -12827,8 +13578,8 @@ fi # PORTME: fill in a description of your system's C++ link characteristics -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } ld_shlibs_CXX=yes case $host_os in aix3*) @@ -12920,27 +13671,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -12951,8 +13698,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -12983,27 +13732,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -13014,8 +13759,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -13641,8 +14388,8 @@ ld_shlibs_CXX=no ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no GCC_CXX="$GXX" @@ -13762,8 +14509,8 @@ lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -14014,16 +14761,16 @@ esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14040,11 +14787,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14043: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14790: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14047: \$? = $ac_status" >&5 + echo "$as_me:14794: \$? = $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 @@ -14055,8 +14802,8 @@ $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in @@ -14079,8 +14826,8 @@ ;; 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 +{ 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 @@ -14107,11 +14854,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14110: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14857: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14114: \$? = $ac_status" >&5 + echo "$as_me:14861: \$? = $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 @@ -14128,23 +14875,23 @@ $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -14154,8 +14901,8 @@ need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -14179,8 +14926,8 @@ ;; esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -14205,8 +14952,8 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -14242,16 +14989,16 @@ cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -14594,7 +15341,7 @@ libsuff= if test "x$LINUX_64_MODE" = x64; then # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64; then + if test -d /lib64 -a ! -h /lib64; then libsuff=64 fi fi @@ -14768,12 +15515,12 @@ dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ test -n "$runpath_var CXX" || \ @@ -14797,8 +15544,8 @@ # directories. hardcode_action_CXX=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +echo "${ECHO_T}$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink; then # Fast installation is not supported @@ -14811,29 +15558,29 @@ striplib= old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi ;; *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; esac fi @@ -14865,8 +15612,8 @@ darwin*) # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14879,56 +15626,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -14942,8 +15686,8 @@ ;; *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14970,73 +15714,64 @@ #undef shl_load -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) +#if defined __stub_shl_load || defined __stub___shl_load choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shl_load; +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15049,61 +15784,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); int main () { -shl_load (); +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15130,73 +15862,64 @@ #undef dlopen -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) +#if defined __stub_dlopen || defined __stub___dlopen choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != dlopen; +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15209,61 +15932,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15276,61 +15996,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15343,56 +16060,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dld_link (); int main () { -dld_link (); +return dld_link (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi @@ -15432,8 +16146,8 @@ 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 + { 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 @@ -15443,7 +16157,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 + { 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 @@ -15541,7 +16255,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -16119,13 +16833,13 @@ compiler_F77=$CC cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 +echo "${ECHO_T}$can_build_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -16142,15 +16856,15 @@ test "$enable_shared" = yes && enable_static=no ;; esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5 +echo "${ECHO_T}$enable_shared" >&6; } -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 +{ echo "$as_me:$LINENO: result: $enable_static" >&5 +echo "${ECHO_T}$enable_static" >&6; } test "$ld_shlibs_F77" = no && can_build_shared=no @@ -16161,8 +16875,8 @@ lt_prog_compiler_pic_F77= lt_prog_compiler_static_F77= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_F77='-Wl,' @@ -16338,16 +17052,16 @@ esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_F77"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_F77+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16364,11 +17078,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16367: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17081: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16371: \$? = $ac_status" >&5 + echo "$as_me:17085: \$? = $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 @@ -16379,8 +17093,8 @@ $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } if test x"$lt_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in @@ -16403,8 +17117,8 @@ ;; 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 +{ 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16431,11 +17145,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16434: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17148: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16438: \$? = $ac_status" >&5 + echo "$as_me:17152: \$? = $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 @@ -16452,23 +17166,23 @@ $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -16478,8 +17192,8 @@ need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_F77= @@ -16764,27 +17478,23 @@ end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_f77_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 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -16795,8 +17505,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -16816,27 +17528,23 @@ end _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_f77_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 + (exit $ac_status); } && { + test -z "$ac_f77_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -16847,8 +17555,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17270,8 +17980,8 @@ esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -echo "${ECHO_T}$ld_shlibs_F77" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +echo "${ECHO_T}$ld_shlibs_F77" >&6; } test "$ld_shlibs_F77" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -17296,8 +18006,8 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -17333,16 +18043,16 @@ cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -17685,7 +18395,7 @@ libsuff= if test "x$LINUX_64_MODE" = x64; then # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64; then + if test -d /lib64 -a ! -h /lib64; then libsuff=64 fi fi @@ -17859,12 +18569,12 @@ dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ test -n "$runpath_var F77" || \ @@ -17888,8 +18598,8 @@ # directories. hardcode_action_F77=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 +{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +echo "${ECHO_T}$hardcode_action_F77" >&6; } if test "$hardcode_action_F77" = relink; then # Fast installation is not supported @@ -17902,29 +18612,29 @@ striplib= old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi ;; *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; esac fi @@ -18343,7 +19053,6 @@ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - # Source file extension for Java test sources. ac_ext=java @@ -18386,8 +19095,8 @@ lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18404,11 +19113,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18407: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19116: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18411: \$? = $ac_status" >&5 + echo "$as_me:19120: \$? = $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 @@ -18419,8 +19128,8 @@ $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" @@ -18434,8 +19143,8 @@ lt_prog_compiler_pic_GCJ= lt_prog_compiler_static_GCJ= -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_GCJ='-Wl,' @@ -18611,16 +19320,16 @@ esac fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_GCJ"; then -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18637,11 +19346,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18640: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19349: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18644: \$? = $ac_status" >&5 + echo "$as_me:19353: \$? = $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 @@ -18652,8 +19361,8 @@ $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 +echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in @@ -18676,8 +19385,8 @@ ;; 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 +{ 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 echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18704,11 +19413,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18707: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19416: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18711: \$? = $ac_status" >&5 + echo "$as_me:19420: \$? = $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 @@ -18725,23 +19434,23 @@ $rm conftest* fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 + { echo "$as_me:$LINENO: result: $hard_links" >&5 +echo "${ECHO_T}$hard_links" >&6; } if test "$hard_links" = no; then { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} @@ -18751,8 +19460,8 @@ need_locks=no fi -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } runpath_var= allow_undefined_flag_GCJ= @@ -19047,27 +19756,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -19078,8 +19783,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -19109,27 +19816,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } }'` @@ -19140,8 +19843,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -19563,8 +20268,8 @@ esac fi -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6 +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } test "$ld_shlibs_GCJ" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -19589,8 +20294,8 @@ # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -19626,16 +20331,16 @@ cat conftest.err 1>&5 fi $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 + { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } ;; esac fi ;; esac -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -19978,7 +20683,7 @@ libsuff= if test "x$LINUX_64_MODE" = x64; then # Some platforms are per default 64-bit, so there's no /lib64 - if test -d /lib64; then + if test -d /lib64 -a ! -h /lib64; then libsuff=64 fi fi @@ -20152,12 +20857,12 @@ dynamic_linker=no ;; esac -echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +echo "${ECHO_T}$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no -echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 +{ 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" || \ @@ -20181,8 +20886,8 @@ # directories. hardcode_action_GCJ=unsupported fi -echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6 +{ 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 @@ -20195,29 +20900,29 @@ striplib= old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi ;; *) - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ;; esac fi @@ -20249,8 +20954,8 @@ darwin*) # if libdl is installed we need to link against it - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20263,56 +20968,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -20326,8 +21028,8 @@ ;; *) - echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load" >&5 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } if test "${ac_cv_func_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20354,73 +21056,64 @@ #undef shl_load -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) +#if defined __stub_shl_load || defined __stub___shl_load choke me -#else -char (*f) () = shl_load; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shl_load; +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_func_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } if test $ac_cv_func_shl_load = yes; then lt_cv_dlopen="shl_load" else - echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_shl_load+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20433,61 +21126,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_load (); int main () { -shl_load (); +return shl_load (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_dld_shl_load=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } if test $ac_cv_lib_dld_shl_load = yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" else - echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen" >&5 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } if test "${ac_cv_func_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20514,73 +21204,64 @@ #undef dlopen -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) +#if defined __stub_dlopen || defined __stub___dlopen choke me -#else -char (*f) () = dlopen; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != dlopen; +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_func_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } if test $ac_cv_func_dlopen = yes; then lt_cv_dlopen="dlopen" else - echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20593,61 +21274,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } if test "${ac_cv_lib_svld_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20660,61 +21338,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_svld_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } if test $ac_cv_lib_svld_dlopen = yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_dld_link+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20727,56 +21402,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dld_link (); int main () { -dld_link (); +return dld_link (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_dld_dld_link=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } if test $ac_cv_lib_dld_dld_link = yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" fi @@ -20816,8 +21488,8 @@ 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 + { 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 @@ -20827,7 +21499,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" - echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 + { 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 @@ -20925,7 +21597,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -21440,7 +22112,6 @@ RC) - # Source file extension for RC test sources. ac_ext=rc @@ -21963,8 +22634,8 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_MSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21990,17 +22661,17 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test -n "$MSGFMT"; then - echo "$as_me:$LINENO: result: $MSGFMT" >&5 -echo "${ECHO_T}$MSGFMT" >&6 + { echo "$as_me:$LINENO: result: $MSGFMT" >&5 +echo "${ECHO_T}$MSGFMT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_GMSGFMT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22015,32 +22686,33 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; esac fi GMSGFMT=$ac_cv_path_GMSGFMT - if test -n "$GMSGFMT"; then - echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -echo "${ECHO_T}$GMSGFMT" >&6 + { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +echo "${ECHO_T}$GMSGFMT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then - echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 -echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 + { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 +echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; } GMSGFMT=":" fi MSGFMT=$GMSGFMT @@ -22049,8 +22721,8 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_XGETTEXT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22076,11 +22748,11 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test -n "$XGETTEXT"; then - echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6 + { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +echo "${ECHO_T}$XGETTEXT" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -22088,8 +22760,8 @@ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else - echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5 -echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6 + { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5 +echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi fi @@ -22172,10 +22844,58 @@ kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4" fi if test $kde_qtver = 3; then - kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3" + kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${kdelibsuff}/qt-3.3" + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac fi -if test $kde_qtver = 2; then - kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt" +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + fi + if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`" + fi + fi +fi +if test $kde_qtver = 2; then + kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt" fi if test $kde_qtver = 1; then kde_qt_dirs="$QTDIR /usr/lib/qt" @@ -22183,8 +22903,7 @@ - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -22196,8 +22915,8 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`" - echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5 -echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5 +echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; } if test "${kde_cv_stl_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22225,41 +22944,37 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_stl_works=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_stl_works=no + kde_cv_stl_works=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5 -echo "${ECHO_T}$kde_cv_stl_works" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5 +echo "${ECHO_T}$kde_cv_stl_works" >&6; } if test "$kde_cv_stl_works" = "yes"; then # back compatible @@ -22288,15 +23003,14 @@ -echo "$as_me:$LINENO: checking for strlcat" >&5 -echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for strlcat" >&5 +echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; } if test "${kde_cv_func_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -22336,35 +23050,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_strlcat=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_strlcat=no + kde_cv_func_strlcat=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -22377,11 +23087,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5 -echo "${ECHO_T}$kde_cv_func_strlcat" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5 +echo "${ECHO_T}$kde_cv_func_strlcat" >&6; } -echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5 -echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5 +echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_strlcat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22402,8 +23112,7 @@ if test "x$kde_cv_proto_strlcat" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -22441,37 +23150,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_strlcat=yes kde_cv_proto_strlcat=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_strlcat="strlcat unavailable" + kde_cv_proto_strlcat="strlcat unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -22484,8 +23190,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5 -echo "${ECHO_T}$kde_cv_proto_strlcat" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5 +echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; } if test "x$kde_cv_func_strlcat" = xyes; then @@ -22509,15 +23215,14 @@ -echo "$as_me:$LINENO: checking for strlcpy" >&5 -echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for strlcpy" >&5 +echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; } if test "${kde_cv_func_strlcpy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -22556,35 +23261,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_strlcpy=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_strlcpy=no + kde_cv_func_strlcpy=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -22597,11 +23298,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5 -echo "${ECHO_T}$kde_cv_func_strlcpy" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5 +echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; } -echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5 -echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5 +echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_strlcpy+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22622,8 +23323,7 @@ if test "x$kde_cv_proto_strlcpy" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -22660,37 +23360,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_strlcpy=yes kde_cv_proto_strlcpy=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_strlcpy="strlcpy unavailable" + kde_cv_proto_strlcpy="strlcpy unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -22703,8 +23400,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5 -echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5 +echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; } if test "x$kde_cv_func_strlcpy" = xyes; then @@ -22727,8 +23424,8 @@ - echo "$as_me:$LINENO: checking for main in -lutil" >&5 -echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for main in -lutil" >&5 +echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; } if test "${ac_cv_lib_util_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22745,52 +23442,49 @@ int main () { -main (); +return main (); ; 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_util_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_util_main=no + ac_cv_lib_util_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5 -echo "${ECHO_T}$ac_cv_lib_util_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5 +echo "${ECHO_T}$ac_cv_lib_util_main" >&6; } if test $ac_cv_lib_util_main = yes; then LIBUTIL="-lutil" fi - echo "$as_me:$LINENO: checking for main in -lcompat" >&5 -echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for main in -lcompat" >&5 +echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; } if test "${ac_cv_lib_compat_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22807,53 +23501,50 @@ int main () { -main (); +return main (); ; 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_compat_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_compat_main=no + ac_cv_lib_compat_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5 -echo "${ECHO_T}$ac_cv_lib_compat_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5 +echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; } if test $ac_cv_lib_compat_main = yes; then LIBCOMPAT="-lcompat" fi kde_have_crypt= - echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 -echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 +echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; } if test "${ac_cv_lib_crypt_crypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22866,61 +23557,58 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char crypt (); int main () { -crypt (); +return crypt (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_crypt_crypt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_crypt_crypt=no + ac_cv_lib_crypt_crypt=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 -echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 +echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; } if test $ac_cv_lib_crypt_crypt = yes; then LIBCRYPT="-lcrypt"; kde_have_crypt=yes else - echo "$as_me:$LINENO: checking for crypt in -lc" >&5 -echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for crypt in -lc" >&5 +echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; } if test "${ac_cv_lib_c_crypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22933,56 +23621,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char crypt (); int main () { -crypt (); +return crypt (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_c_crypt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_c_crypt=no + ac_cv_lib_c_crypt=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5 -echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5 +echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; } if test $ac_cv_lib_c_crypt = yes; then kde_have_crypt=yes else @@ -23008,13 +23693,13 @@ fi - echo "$as_me:$LINENO: checking for socklen_t" >&5 -echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for socklen_t" >&5 +echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; } if test "${kde_cv_socklen_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -23043,27 +23728,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_socklen_t=yes kde_cv_socklen_t_equiv=socklen_t @@ -23072,8 +23752,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -23083,17 +23765,17 @@ fi - echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5 -echo "${ECHO_T}$kde_cv_socklen_t" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5 +echo "${ECHO_T}$kde_cv_socklen_t" >&6; } if test $kde_cv_socklen_t = no; then - echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5 -echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5 +echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; } if test "${kde_cv_socklen_t_equiv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else kde_cv_socklen_t_equiv=int - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -23122,27 +23804,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_socklen_t_equiv="$t" break @@ -23151,8 +23828,10 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -23163,8 +23842,8 @@ fi - echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5 -echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5 +echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; } fi cat >>confdefs.h <<_ACEOF @@ -23177,8 +23856,8 @@ _ACEOF - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23191,63 +23870,60 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dnet_ntoa (); int main () { -dnet_ntoa (); +return dnet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dnet_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dnet_dnet_ntoa=no + ac_cv_lib_dnet_dnet_ntoa=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23260,63 +23936,60 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dnet_ntoa (); int main () { -dnet_ntoa (); +return dnet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dnet_stub_dnet_ntoa=no + ac_cv_lib_dnet_stub_dnet_ntoa=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi - echo "$as_me:$LINENO: checking for inet_ntoa" >&5 -echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for inet_ntoa" >&5 +echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; } if test "${ac_cv_func_inet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23343,72 +24016,63 @@ #undef inet_ntoa -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char inet_ntoa (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa) +#if defined __stub_inet_ntoa || defined __stub___inet_ntoa choke me -#else -char (*f) () = inet_ntoa; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != inet_ntoa; +return inet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_inet_ntoa=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_inet_ntoa=no + ac_cv_func_inet_ntoa=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; } if test $ac_cv_func_inet_ntoa = no; then - echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5 -echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5 +echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; } if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23421,63 +24085,60 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char inet_ntoa (); int main () { -inet_ntoa (); +return inet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_nsl_inet_ntoa=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_nsl_inet_ntoa=no + ac_cv_lib_nsl_inet_ntoa=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; } if test $ac_cv_lib_nsl_inet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi fi - echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6; } if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23504,72 +24165,63 @@ #undef connect -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char connect (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_connect) || defined (__stub___connect) +#if defined __stub_connect || defined __stub___connect choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != connect; +return connect (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_connect=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_connect=no + ac_cv_func_connect=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6; } if test $ac_cv_func_connect = no; then - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23582,64 +24234,61 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char connect (); int main () { -connect (); +return connect (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_socket_connect=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_socket_connect=no + ac_cv_lib_socket_connect=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi fi - echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6; } if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23666,72 +24315,63 @@ #undef remove -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char remove (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_remove) || defined (__stub___remove) +#if defined __stub_remove || defined __stub___remove choke me -#else -char (*f) () = remove; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != remove; +return remove (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_remove=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_remove=no + ac_cv_func_remove=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6; } if test $ac_cv_func_remove = no; then - echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23744,56 +24384,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char remove (); int main () { -remove (); +return remove (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_posix_remove=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_posix_remove=no + ac_cv_lib_posix_remove=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -23801,8 +24438,8 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23829,73 +24466,64 @@ #undef shmat -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shmat (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_shmat) || defined (__stub___shmat) +#if defined __stub_shmat || defined __stub___shmat choke me -#else -char (*f) () = shmat; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != shmat; +return shmat (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_shmat=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_shmat=no + ac_cv_func_shmat=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6; } if test $ac_cv_func_shmat = yes; then : else - echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23908,56 +24536,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shmat (); int main () { -shmat (); +return shmat (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ipc_shmat=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ipc_shmat=no + ac_cv_lib_ipc_shmat=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -23971,18 +24596,19 @@ for ac_header in sys/types.h stdint.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -23993,41 +24619,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24036,24 +24658,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -24061,9 +24681,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -24087,25 +24708,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -24123,18 +24738,19 @@ for ac_header in sys/bitypes.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24145,41 +24761,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24188,24 +24800,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -24213,9 +24823,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -24239,25 +24850,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -24271,8 +24876,8 @@ # darwin requires a poll emulation library - echo "$as_me:$LINENO: checking for poll in -lpoll" >&5 -echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5 +echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; } if test "${ac_cv_lib_poll_poll+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24285,56 +24890,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char poll (); int main () { -poll (); +return poll (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_poll_poll=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_poll_poll=no + ac_cv_lib_poll_poll=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5 -echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5 +echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; } if test $ac_cv_lib_poll_poll = yes; then LIB_POLL="-lpoll" fi @@ -24345,18 +24947,19 @@ for ac_header in Carbon/Carbon.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24367,41 +24970,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24410,24 +25009,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -24435,9 +25032,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -24461,25 +25059,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -24494,17 +25086,17 @@ # CoreAudio framework if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then - echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5 -echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5 +echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; } if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5 -echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5 +echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5 -echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5 +echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24515,41 +25107,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5 -echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5 +echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24558,24 +25146,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -24583,9 +25169,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -24609,25 +25196,18 @@ echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5 -echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5 +echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; } if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5 -echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5 +echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; } fi if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then @@ -24644,8 +25224,8 @@ - echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5 -echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5 +echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; } kde_libs_safe="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS -lresolv" cat >conftest.$ac_ext <<_ACEOF @@ -24671,31 +25251,27 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then LIBRESOLV="-lresolv" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_RES_INIT 1 @@ -24706,25 +25282,25 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_libs_safe -echo "$as_me:$LINENO: checking for res_init" >&5 -echo $ECHO_N "checking for res_init... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for res_init" >&5 +echo $ECHO_N "checking for res_init... $ECHO_C" >&6; } if test "${kde_cv_func_res_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -24764,35 +25340,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then kde_cv_func_res_init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_func_res_init=no + kde_cv_func_res_init=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" LIBS="$kde_safe_LIBS" ac_ext=c @@ -24805,11 +25377,11 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5 -echo "${ECHO_T}$kde_cv_func_res_init" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5 +echo "${ECHO_T}$kde_cv_func_res_init" >&6; } -echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5 -echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5 +echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; } if test "${kde_cv_proto_res_init+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24830,8 +25402,7 @@ if test "x$kde_cv_proto_res_init" = xunknown; then - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -24869,37 +25440,34 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_func_res_init=yes kde_cv_proto_res_init=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_proto_res_init="res_init unavailable" + kde_cv_proto_res_init="res_init unavailable" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs ac_ext=c @@ -24912,8 +25480,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5 -echo "${ECHO_T}$kde_cv_proto_res_init" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5 +echo "${ECHO_T}$kde_cv_proto_res_init" >&6; } if test "x$kde_cv_func_res_init" = xyes; then @@ -24940,8 +25508,8 @@ LIBSOCKET="$X_EXTRA_LIBS" - echo "$as_me:$LINENO: checking for killpg in -lucb" >&5 -echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5 +echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; } if test "${ac_cv_lib_ucb_killpg+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -24954,69 +25522,66 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char killpg (); int main () { -killpg (); +return killpg (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ucb_killpg=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ucb_killpg=no + ac_cv_lib_ucb_killpg=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5 -echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5 +echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; } if test $ac_cv_lib_ucb_killpg = yes; then LIBUCB="-lucb" fi case $host in *-*-lynxos* ) - echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5 -echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5 +echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; } CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__" - echo "$as_me:$LINENO: result: disabled" >&5 -echo "${ECHO_T}disabled" >&6 - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 + { echo "$as_me:$LINENO: result: disabled" >&5 +echo "${ECHO_T}disabled" >&6; } + { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25029,64 +25594,61 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char gethostbyname (); int main () { -gethostbyname (); +return gethostbyname (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_bsd_gethostbyname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_bsd_gethostbyname=no + ac_cv_lib_bsd_gethostbyname=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } if test $ac_cv_lib_bsd_gethostbyname = yes; then LIBSOCKET="-lbsd" fi ;; esac - echo "$as_me:$LINENO: checking for int" >&5 -echo $ECHO_N "checking for int... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for int" >&5 +echo $ECHO_N "checking for int... $ECHO_C" >&6; } if test "${ac_cv_type_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25097,61 +25659,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef int ac__type_new_; int main () { -if ((int *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (int)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_int=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_int=no + ac_cv_type_int=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 -echo "${ECHO_T}$ac_cv_type_int" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 +echo "${ECHO_T}$ac_cv_type_int" >&6; } -echo "$as_me:$LINENO: checking size of int" >&5 -echo $ECHO_N "checking size of int... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of int" >&5 +echo $ECHO_N "checking size of int... $ECHO_C" >&6; } if test "${ac_cv_sizeof_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_int" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -25161,10 +25719,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -25172,27 +25731,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -25202,10 +25756,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25213,56 +25768,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -25270,27 +25822,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -25300,10 +25847,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -25311,50 +25859,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -25365,10 +25911,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef int ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25376,52 +25923,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_int=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +'') if test "$ac_cv_type_int" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int), 77 +echo "$as_me: error: cannot compute sizeof (int) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_int=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25429,8 +25969,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (int)); } -unsigned long ulongval () { return (long) (sizeof (int)); } + typedef int ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -25439,35 +25980,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (int))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (int)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (int)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25478,28 +26028,31 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 +if test "$ac_cv_type_int" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (int), 77 +echo "$as_me: error: cannot compute sizeof (int) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_int=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_int=0 -fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 +echo "${ECHO_T}$ac_cv_sizeof_int" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int _ACEOF - echo "$as_me:$LINENO: checking for short" >&5 -echo $ECHO_N "checking for short... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for short" >&5 +echo $ECHO_N "checking for short... $ECHO_C" >&6; } if test "${ac_cv_type_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25510,61 +26063,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef short ac__type_new_; int main () { -if ((short *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (short)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_short=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_short=no + ac_cv_type_short=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 -echo "${ECHO_T}$ac_cv_type_short" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 +echo "${ECHO_T}$ac_cv_type_short" >&6; } -echo "$as_me:$LINENO: checking size of short" >&5 -echo $ECHO_N "checking size of short... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of short" >&5 +echo $ECHO_N "checking size of short... $ECHO_C" >&6; } if test "${ac_cv_sizeof_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_short" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -25574,10 +26123,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -25585,27 +26135,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -25615,10 +26160,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25626,56 +26172,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -25683,27 +26226,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -25713,10 +26251,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -25724,50 +26263,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -25778,10 +26315,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef short ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -25789,52 +26327,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_short=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +'') if test "$ac_cv_type_short" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short), 77 +echo "$as_me: error: cannot compute sizeof (short) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_short=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25842,8 +26373,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (short)); } -unsigned long ulongval () { return (long) (sizeof (short)); } + typedef short ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -25852,35 +26384,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (short))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (short)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (short)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -25891,28 +26432,31 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 +if test "$ac_cv_type_short" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (short), 77 +echo "$as_me: error: cannot compute sizeof (short) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_short=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_short=0 -fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 +echo "${ECHO_T}$ac_cv_sizeof_short" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_SHORT $ac_cv_sizeof_short _ACEOF - echo "$as_me:$LINENO: checking for long" >&5 -echo $ECHO_N "checking for long... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for long" >&5 +echo $ECHO_N "checking for long... $ECHO_C" >&6; } if test "${ac_cv_type_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -25923,61 +26467,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef long ac__type_new_; int main () { -if ((long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (long)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_long=no + ac_cv_type_long=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 -echo "${ECHO_T}$ac_cv_type_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +echo "${ECHO_T}$ac_cv_type_long" >&6; } -echo "$as_me:$LINENO: checking size of long" >&5 -echo $ECHO_N "checking size of long... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of long" >&5 +echo $ECHO_N "checking size of long... $ECHO_C" >&6; } if test "${ac_cv_sizeof_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_long" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -25987,10 +26527,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -25998,27 +26539,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -26028,10 +26564,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -26039,56 +26576,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -26096,27 +26630,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -26126,10 +26655,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -26137,50 +26667,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -26191,10 +26719,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -26202,52 +26731,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +'') if test "$ac_cv_type_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +echo "$as_me: error: cannot compute sizeof (long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_long=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26255,8 +26777,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (long)); } -unsigned long ulongval () { return (long) (sizeof (long)); } + typedef long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -26265,35 +26788,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (long))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (long)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (long)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26304,28 +26836,31 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +if test "$ac_cv_type_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (long), 77 +echo "$as_me: error: cannot compute sizeof (long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_long=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_long=0 -fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_LONG $ac_cv_sizeof_long _ACEOF - echo "$as_me:$LINENO: checking for char *" >&5 -echo $ECHO_N "checking for char *... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for char *" >&5 +echo $ECHO_N "checking for char *... $ECHO_C" >&6; } if test "${ac_cv_type_char_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26336,61 +26871,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef char * ac__type_new_; int main () { -if ((char * *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (char *)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_char_p=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_char_p=no + ac_cv_type_char_p=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5 -echo "${ECHO_T}$ac_cv_type_char_p" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5 +echo "${ECHO_T}$ac_cv_type_char_p" >&6; } -echo "$as_me:$LINENO: checking size of char *" >&5 -echo $ECHO_N "checking size of char *... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of char *" >&5 +echo $ECHO_N "checking size of char *... $ECHO_C" >&6; } if test "${ac_cv_sizeof_char_p+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_char_p" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -26400,10 +26931,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -26411,27 +26943,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -26441,10 +26968,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -26452,56 +26980,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -26509,27 +27034,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -26539,10 +27059,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -26550,50 +27071,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -26604,10 +27123,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef char * ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -26615,52 +27135,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_char_p=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 +'') if test "$ac_cv_type_char_p" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char *), 77 +echo "$as_me: error: cannot compute sizeof (char *) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_char_p=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -26668,8 +27181,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (char *)); } -unsigned long ulongval () { return (long) (sizeof (char *)); } + typedef char * ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -26678,35 +27192,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (char *))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (char *)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (char *)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -26717,30 +27240,33 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 +if test "$ac_cv_type_char_p" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (char *), 77 +echo "$as_me: error: cannot compute sizeof (char *) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_char_p=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_char_p=0 -fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5 -echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5 +echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p _ACEOF -echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26753,56 +27279,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -dlopen (); +return dlopen (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; 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 + ac_cv_lib_dl_dlopen=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } if test $ac_cv_lib_dl_dlopen = yes; then LIBDL="-ldl" @@ -26811,8 +27334,8 @@ fi -echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5 -echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5 +echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; } if test "${ac_cv_lib_dld_shl_unload+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26825,56 +27348,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char shl_unload (); int main () { -shl_unload (); +return shl_unload (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dld_shl_unload=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dld_shl_unload=no + ac_cv_lib_dld_shl_unload=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5 +echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; } if test $ac_cv_lib_dld_shl_unload = yes; then LIBDL="-ldld" @@ -26888,8 +27408,8 @@ - echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -26900,61 +27420,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef size_t ac__type_new_; int main () { -if ((size_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (size_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_size_t=no + ac_cv_type_size_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6; } -echo "$as_me:$LINENO: checking size of size_t" >&5 -echo $ECHO_N "checking size of size_t... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of size_t" >&5 +echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; } if test "${ac_cv_sizeof_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_size_t" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -26964,10 +27480,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -26975,27 +27492,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -27005,10 +27517,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -27016,56 +27529,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -27073,27 +27583,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -27103,10 +27608,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -27114,50 +27620,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -27168,10 +27672,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef size_t ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -27179,52 +27684,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_size_t=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 +'') if test "$ac_cv_type_size_t" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (size_t), 77 +echo "$as_me: error: cannot compute sizeof (size_t) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_size_t=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27232,8 +27730,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (size_t)); } -unsigned long ulongval () { return (long) (sizeof (size_t)); } + typedef size_t ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -27242,35 +27741,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (size_t))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (size_t)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (size_t)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27281,29 +27789,32 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 +if test "$ac_cv_type_size_t" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (size_t), 77 +echo "$as_me: error: cannot compute sizeof (size_t) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_size_t=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_size_t=0 -fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 -echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 +echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t _ACEOF - echo "$as_me:$LINENO: checking for unsigned long" >&5 -echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for unsigned long" >&5 +echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; } if test "${ac_cv_type_unsigned_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27314,61 +27825,57 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef unsigned long ac__type_new_; int main () { -if ((unsigned long *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (unsigned long)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_unsigned_long=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_unsigned_long=no + ac_cv_type_unsigned_long=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 -echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; } -echo "$as_me:$LINENO: checking size of unsigned long" >&5 -echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6 +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of unsigned long" >&5 +echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; } if test "${ac_cv_sizeof_unsigned_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "$ac_cv_type_unsigned_long" = yes; then - # The cast to unsigned long works around a bug in the HP C Compiler - # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects - # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. - # This bug is HP SR number 8606223364. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF @@ -27378,10 +27885,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; test_array [0] = 0 ; @@ -27389,27 +27897,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -27419,10 +27922,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -27430,56 +27934,53 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1` + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; test_array [0] = 0 ; @@ -27487,27 +27988,22 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF @@ -27517,10 +28013,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; test_array [0] = 0 ; @@ -27528,50 +28025,48 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid` + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo= ac_hi= + ac_lo= ac_hi= fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` @@ -27582,10 +28077,11 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + typedef unsigned long ac__type_sizeof_; int main () { -static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; test_array [0] = 0 ; @@ -27593,52 +28089,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` + ac_lo=`expr '(' $ac_mid ')' + 1` fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_unsigned_long=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 +'') if test "$ac_cv_type_unsigned_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77 +echo "$as_me: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } ;; + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi ;; esac else - if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run test program while cross compiling -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27646,8 +28135,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -long longval () { return (long) (sizeof (unsigned long)); } -unsigned long ulongval () { return (long) (sizeof (unsigned long)); } + typedef unsigned long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include #include int @@ -27656,35 +28146,44 @@ FILE *f = fopen ("conftest.val", "w"); if (! f) - exit (1); - if (((long) (sizeof (unsigned long))) < 0) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) { - long i = longval (); - if (i != ((long) (sizeof (unsigned long)))) - exit (1); + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%ld\n", i); } else { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (unsigned long)))) - exit (1); + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; fprintf (f, "%lu\n", i); } - exit (ferror (f) || fclose (f) != 0); + return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -27695,30 +28194,33 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 +if test "$ac_cv_type_unsigned_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77 +echo "$as_me: error: cannot compute sizeof (unsigned long) See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f conftest.val -else - ac_cv_sizeof_unsigned_long=0 -fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; } + + + cat >>confdefs.h <<_ACEOF #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long _ACEOF - echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5 -echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5 +echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27739,36 +28241,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } { { echo "$as_me:$LINENO: error: Apparently on your system our assumption sizeof size_t == sizeof unsigned long does not apply. Please mail kde-devel@kde.org with a description of your system! @@ -27780,18 +28277,18 @@ { (exit 1); exit 1; }; } fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - echo "$as_me:$LINENO: checking for PIE support" >&5 -echo $ECHO_N "checking for PIE support... $ECHO_C" >&6 + + { echo "$as_me:$LINENO: checking for PIE support" >&5 +echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; } if test "${kde_cv_val_pie_support+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -27821,35 +28318,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_val_pie_support=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_val_pie_support=no + kde_cv_val_pie_support=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS=$safe_CXXFLAGS @@ -27862,26 +28356,26 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5 -echo "${ECHO_T}$kde_cv_val_pie_support" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5 +echo "${ECHO_T}$kde_cv_val_pie_support" >&6; } - echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5 -echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5 +echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; } - # Check whether --enable-pie or --disable-pie was given. + # Check whether --enable-pie was given. if test "${enable_pie+set}" = set; then - enableval="$enable_pie" - kde_has_pie_support=$enableval + enableval=$enable_pie; kde_has_pie_support=$enableval else kde_has_pie_support=detect -fi; +fi + if test "$kde_has_pie_support" = "detect"; then kde_has_pie_support=$kde_cv_val_pie_support fi - echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5 -echo "${ECHO_T}$kde_has_pie_support" >&6 + { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5 +echo "${ECHO_T}$kde_has_pie_support" >&6; } KDE_USE_FPIE="" KDE_USE_PIE="" @@ -27900,18 +28394,19 @@ for ac_header in crt_externs.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27922,41 +28417,37 @@ #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -27965,24 +28456,22 @@ /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -27990,9 +28479,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -28016,25 +28506,19 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -28046,8 +28530,8 @@ done -echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5 -echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5 +echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; } if test "${ac_cv_func__NSGetEnviron+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28074,68 +28558,59 @@ #undef _NSGetEnviron -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char _NSGetEnviron (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron) +#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron choke me -#else -char (*f) () = _NSGetEnviron; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != _NSGetEnviron; +return _NSGetEnviron (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func__NSGetEnviron=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func__NSGetEnviron=no + ac_cv_func__NSGetEnviron=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5 -echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5 +echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; } if test $ac_cv_func__NSGetEnviron = yes; then cat >>confdefs.h <<\_ACEOF @@ -28156,9 +28631,9 @@ for ac_func in vsnprintf snprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -28184,68 +28659,60 @@ #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -28262,37 +28729,35 @@ -# Check whether --enable-embedded or --disable-embedded was given. +# Check whether --enable-embedded was given. if test "${enable_embedded+set}" = set; then - enableval="$enable_embedded" - kde_use_qt_emb=$enableval + enableval=$enable_embedded; kde_use_qt_emb=$enableval else kde_use_qt_emb=no -fi; +fi + -# Check whether --enable-qtopia or --disable-qtopia was given. +# Check whether --enable-qtopia was given. if test "${enable_qtopia+set}" = set; then - enableval="$enable_qtopia" - kde_use_qt_emb_palm=$enableval + enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval else kde_use_qt_emb_palm=no -fi; +fi + -# Check whether --enable-mac or --disable-mac was given. +# Check whether --enable-mac was given. if test "${enable_mac+set}" = set; then - enableval="$enable_mac" - kde_use_qt_mac=$enableval + enableval=$enable_mac; kde_use_qt_mac=$enableval else kde_use_qt_mac=no -fi; - -# used to disable x11-specific stuff on special platforms +fi -if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then +# used to disable x11-specific stuff on special platforms + if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then include_x11_TRUE= include_x11_FALSE='#' else @@ -28303,8 +28768,8 @@ if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then -echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6; } if test "${kde_cv_have_x+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -28341,24 +28806,22 @@ /* end confdefs.h. */ #include <$x_direct_test_include> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # We can compile using X headers with no special include directory. ac_x_includes= else @@ -28409,6 +28872,7 @@ fi done fi + rm -f conftest.err conftest.$ac_ext fi # $ac_x_includes = NO @@ -28438,27 +28902,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then LIBS="$ac_save_LIBS" # We can link X programs with no special library path. ac_x_libraries= @@ -28466,7 +28926,7 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -LIBS="$ac_save_LIBS" + LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ @@ -28514,7 +28974,8 @@ done done fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = NO @@ -28524,21 +28985,26 @@ *-*-solaris*) ;; *) - rm -fr conftest.dir + rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +incroot: + @echo incroot='${INCROOT}' +usrlibdir: + @echo usrlibdir='${USRLIBDIR}' +libdir: + @echo libdir='${LIBDIR}' _ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break fi done @@ -28546,7 +29012,7 @@ # bogus both because they are the default anyway, and because # using them would break gcc on systems where it needs fixed includes. case $ac_im_incroot in - /usr/include) ;; + /usr/include) ac_x_includes= ;; *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in @@ -28555,7 +29021,7 @@ esac fi cd .. - rm -fr conftest.dir + rm -f -r conftest.dir fi if test -z "$ac_x_includes"; then @@ -28599,12 +29065,12 @@ eval "$kde_cv_have_x" if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 + { echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6; } no_x=yes else - echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5 -echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6 + { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5 +echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; } fi if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then @@ -28614,7 +29080,7 @@ X_INCLUDES="-I$x_includes" fi -if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then +if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then X_LDFLAGS="" x_libraries="/usr/lib"; else x_libraries=$kde_x_libraries @@ -28632,8 +29098,8 @@ # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. -echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28646,56 +29112,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char IceConnectionNumber (); int main () { -IceConnectionNumber (); +return IceConnectionNumber (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ICE_IceConnectionNumber=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ICE_IceConnectionNumber=no + ac_cv_lib_ICE_IceConnectionNumber=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then LIBSM="-lSM -lICE" fi @@ -28704,8 +29167,8 @@ LIB_X11='-lX11 $(LIBSOCKET)' -echo "$as_me:$LINENO: checking for libXext" >&5 -echo $ECHO_N "checking for libXext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libXext" >&5 +echo $ECHO_N "checking for libXext... $ECHO_C" >&6; } if test "${kde_cv_have_libXext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28739,36 +29202,33 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then kde_cv_have_libXext=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -kde_cv_have_libXext=no + kde_cv_have_libXext=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$kde_ldflags_safe @@ -28777,8 +29237,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5 -echo "${ECHO_T}$kde_cv_have_libXext" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5 +echo "${ECHO_T}$kde_cv_have_libXext" >&6; } if test "$kde_cv_have_libXext" = "no"; then { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure @@ -28840,8 +29300,8 @@ else PTHREAD_LIBS_save="$PTHREAD_LIBS" PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` - echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5 -echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5 +echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; } kde_save_LDFLAGS="$LDFLAGS" kde_save_LIBS="$LIBS" @@ -28852,9 +29312,9 @@ ;; esac as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh` -echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5 -echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5 +echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28866,56 +29326,54 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char pthread_create (); int main () { -pthread_create (); +return pthread_create (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Lib=no" + eval "$as_ac_Lib=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Lib'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Lib'}'` = yes; then LIBPTHREAD="$PTHREAD_LIBS_save" fi @@ -28928,8 +29386,8 @@ fi if test -z "$LIBPTHREAD"; then - echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -28942,56 +29400,53 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char pthread_create (); int main () { -pthread_create (); +return pthread_create (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_pthread_pthread_create=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_pthread_pthread_create=no + ac_cv_lib_pthread_pthread_create=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 +echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; } if test $ac_cv_lib_pthread_pthread_create = yes; then LIBPTHREAD="-lpthread" fi @@ -28999,8 +29454,8 @@ fi if test -z "$LIBPTHREAD" ; then - echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 +echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } kde_safe_libs=$LIBS LIBS="$LIBS -lpthread" cat >conftest.$ac_ext <<_ACEOF @@ -29019,40 +29474,37 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } LIBPTHREAD="-lpthread" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$kde_safe_libs fi @@ -29067,16 +29519,15 @@ USE_THREADS="" if test -z "$LIBPTHREAD"; then -echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5 -echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5 +echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; } kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -29103,34 +29554,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -29143,13 +29592,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : USE_THREADS="-D_THREAD_SAFE -pthread" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -29161,16 +29610,15 @@ case $host_os in solaris*) -echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5 -echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5 +echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; } kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'` -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -29197,34 +29645,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_prog_cxx_$kde_cache=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$save_CXXFLAGS" ac_ext=c @@ -29237,13 +29683,13 @@ fi if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : USE_THREADS="-mt" else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : fi @@ -29270,17 +29716,17 @@ -echo "$as_me:$LINENO: checking for extra includes" >&5 -echo $ECHO_N "checking for extra includes... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for extra includes" >&5 +echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; } -# Check whether --with-extra-includes or --without-extra-includes was given. +# Check whether --with-extra-includes was given. if test "${with_extra_includes+set}" = set; then - withval="$with_extra_includes" - kde_use_extra_includes="$withval" + withval=$with_extra_includes; kde_use_extra_includes="$withval" else kde_use_extra_includes=NONE -fi; +fi + kde_extra_includes= if test -n "$kde_use_extra_includes" && \ test "$kde_use_extra_includes" != "NONE"; then @@ -29298,21 +29744,21 @@ fi -echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5 -echo "${ECHO_T}$kde_use_extra_includes" >&6 +{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5 +echo "${ECHO_T}$kde_use_extra_includes" >&6; } kde_extra_libs= -echo "$as_me:$LINENO: checking for extra libs" >&5 -echo $ECHO_N "checking for extra libs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for extra libs" >&5 +echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; } -# Check whether --with-extra-libs or --without-extra-libs was given. +# Check whether --with-extra-libs was given. if test "${with_extra_libs+set}" = set; then - withval="$with_extra_libs" - kde_use_extra_libs=$withval + withval=$with_extra_libs; kde_use_extra_libs=$withval else kde_use_extra_libs=NONE -fi; +fi + if test -n "$kde_use_extra_libs" && \ test "$kde_use_extra_libs" != "NONE"; then @@ -29331,14 +29777,14 @@ -echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5 -echo "${ECHO_T}$kde_use_extra_libs" >&6 +{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5 +echo "${ECHO_T}$kde_use_extra_libs" >&6; } -echo "$as_me:$LINENO: checking for libz" >&5 -echo $ECHO_N "checking for libz... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libz" >&5 +echo $ECHO_N "checking for libz... $ECHO_C" >&6; } if test "${ac_cv_lib_z+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29355,6 +29801,7 @@ /* end confdefs.h. */ #include +#include int main () @@ -29365,42 +29812,39 @@ /* this would segfault.. but we only link, don't run */ (void) gzgets(f, buf, sizeof(buf)); - return (zlibVersion() == ZLIB_VERSION); + return (strcmp(zlibVersion(), ZLIB_VERSION) == 0); ; 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 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "ac_cv_lib_z='-lz'" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "ac_cv_lib_z=no" + eval "ac_cv_lib_z=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" @@ -29413,8 +29857,8 @@ _ACEOF LIBZ="$ac_cv_lib_z" - echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5 -echo "${ECHO_T}$ac_cv_lib_z" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5 +echo "${ECHO_T}$ac_cv_lib_z" >&6; } else { { echo "$as_me:$LINENO: error: not found. Possibly configure picks up an outdated version @@ -29434,8 +29878,8 @@ -echo "$as_me:$LINENO: checking for libpng" >&5 -echo $ECHO_N "checking for libpng... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libpng" >&5 +echo $ECHO_N "checking for libpng... $ECHO_C" >&6; } if test "${ac_cv_lib_png+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29471,36 +29915,33 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "ac_cv_lib_png='-lpng $LIBZ -lm'" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "ac_cv_lib_png=no" + eval "ac_cv_lib_png=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$kde_save_LIBS" CFLAGS="$kde_save_CFLAGS" @@ -29514,19 +29955,19 @@ LIBPNG="$ac_cv_lib_png" - echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5 -echo "${ECHO_T}$ac_cv_lib_png" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5 +echo "${ECHO_T}$ac_cv_lib_png" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } LIBPNG="" fi -echo "$as_me:$LINENO: checking for libjpeg6b" >&5 -echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5 +echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; } if test "${ac_cv_lib_jpeg_6b+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29559,35 +30000,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "ac_cv_lib_jpeg_6b=-ljpeg6b" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "ac_cv_lib_jpeg_6b=no" + eval "ac_cv_lib_jpeg_6b=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" @@ -29597,14 +30035,14 @@ if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then LIBJPEG="$ac_cv_lib_jpeg_6b" - echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } -echo "$as_me:$LINENO: checking for libjpeg" >&5 -echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for libjpeg" >&5 +echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; } if test "${ac_cv_lib_jpeg_normal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29637,35 +30075,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "ac_cv_lib_jpeg_normal=-ljpeg" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "ac_cv_lib_jpeg_normal=no" + eval "ac_cv_lib_jpeg_normal=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_save_LIBS" CFLAGS="$ac_save_CFLAGS" @@ -29675,11 +30110,11 @@ if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then LIBJPEG="$ac_cv_lib_jpeg_normal" - echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } LIBJPEG= @@ -29699,7 +30134,7 @@ do for j in jpeglib.h; do - echo "configure: 29702: $i/$j" >&5 + echo "configure: 30137: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 jpeg_incdir=$i @@ -29746,14 +30181,14 @@ - echo "$as_me:$LINENO: checking for perl" >&5 -echo $ECHO_N "checking for perl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for perl" >&5 +echo $ECHO_N "checking for perl... $ECHO_C" >&6; } if test -n "$PERL"; then kde_cv_path="$PERL"; else kde_cache=`echo perl | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -29796,8 +30231,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: No Perl found in your $PATH. We need perl to generate some code." >&5 @@ -29806,8 +30241,8 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } PERL=$kde_cv_path fi @@ -29821,10 +30256,9 @@ -# Check whether --enable-mt or --disable-mt was given. +# Check whether --enable-mt was given. if test "${enable_mt+set}" = set; then - enableval="$enable_mt" - kde_use_qt_mt=$enableval + enableval=$enable_mt; kde_use_qt_mt=$enableval else if test $kde_qtver = 3; then @@ -29834,7 +30268,8 @@ fi -fi; +fi + USING_QT_MT="" @@ -29854,13 +30289,13 @@ else kde_check_threading_default=yes fi - # Check whether --enable-threading or --disable-threading was given. + # Check whether --enable-threading was given. if test "${enable_threading+set}" = set; then - enableval="$enable_threading" - kde_use_threading=$enableval + enableval=$enable_threading; kde_use_threading=$enableval else kde_use_threading=$kde_check_threading_default -fi; +fi + if test "x$kde_use_threading" = "xyes"; then cat >>confdefs.h <<\_ACEOF @@ -29932,8 +30367,8 @@ LIBQT="$LIBQT $LIBDL" fi -echo "$as_me:$LINENO: checking for Qt" >&5 -echo $ECHO_N "checking for Qt... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for Qt" >&5 +echo $ECHO_N "checking for Qt... $ECHO_C" >&6; } if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" @@ -29942,34 +30377,34 @@ qt_libraries="" qt_includes="" -# Check whether --with-qt-dir or --without-qt-dir was given. +# Check whether --with-qt-dir was given. if test "${with_qt_dir+set}" = set; then - withval="$with_qt_dir" - ac_qt_includes="$withval"/include + withval=$with_qt_dir; ac_qt_includes="$withval"/include ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_bindir="$withval"/bin -fi; +fi -# Check whether --with-qt-includes or --without-qt-includes was given. -if test "${with_qt_includes+set}" = set; then - withval="$with_qt_includes" +# Check whether --with-qt-includes was given. +if test "${with_qt_includes+set}" = set; then + withval=$with_qt_includes; ac_qt_includes="$withval" -fi; +fi + kde_qt_libs_given=no -# Check whether --with-qt-libraries or --without-qt-libraries was given. +# Check whether --with-qt-libraries was given. if test "${with_qt_libraries+set}" = set; then - withval="$with_qt_libraries" - ac_qt_libraries="$withval" + withval=$with_qt_libraries; ac_qt_libraries="$withval" kde_qt_libs_given=yes -fi; +fi + if test "${ac_cv_have_qt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -29980,24 +30415,72 @@ for dir in $kde_qt_dirs; do qt_incdirs="$qt_incdirs $dir/include $dir" done -qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" -if test ! "$ac_qt_includes" = "NO"; then - qt_incdirs="$ac_qt_includes $qt_incdirs" -fi - -if test "$kde_qtver" != "1"; then - kde_qt_header=qstyle.h +if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - kde_qt_header=qglobal.h -fi - - -qt_incdir=NO -for i in $qt_incdirs; -do + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`" + fi +fi +qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes" +if test ! "$ac_qt_includes" = "NO"; then + qt_incdirs="$ac_qt_includes $qt_incdirs" +fi + +if test "$kde_qtver" != "1"; then + kde_qt_header=qstyle.h +else + kde_qt_header=qglobal.h +fi + + +qt_incdir=NO +for i in $qt_incdirs; +do for j in $kde_qt_header; do - echo "configure: 30000: $i/$j" >&5 + echo "configure: 30483: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 qt_incdir=$i @@ -30010,8 +30493,56 @@ qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir/lib $dir" +done +if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test "$PKG_CONFIG" != "no" ; then + if $PKG_CONFIG --exists qt-mt ; then + qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`" + fi +fi qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then qt_libdir=$ac_qt_libraries @@ -30034,8 +30565,7 @@ ac_qt_libraries="$qt_libdir" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -30172,13 +30702,13 @@ eval "$ac_cv_have_qt" if test "$have_qt" != yes; then - echo "$as_me:$LINENO: result: $have_qt" >&5 -echo "${ECHO_T}$have_qt" >&6; + { echo "$as_me:$LINENO: result: $have_qt" >&5 +echo "${ECHO_T}$have_qt" >&6; }; else ac_cv_have_qt="have_qt=yes \ ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries" - echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5 -echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6 + { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5 +echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; } qt_libraries="$ac_qt_libraries" qt_includes="$ac_qt_includes" @@ -30187,15 +30717,14 @@ if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then -echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5 -echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5 +echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; } if test "${kde_cv_qt_direct+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -30316,12 +30845,12 @@ if test "$kde_cv_qt_direct" = "yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } qt_libraries= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -30359,14 +30888,14 @@ fi - echo "$as_me:$LINENO: checking for moc" >&5 -echo $ECHO_N "checking for moc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for moc" >&5 +echo $ECHO_N "checking for moc... $ECHO_C" >&6; } if test -n "$MOC"; then kde_cv_path="$MOC"; else kde_cache=`echo moc | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -30409,8 +30938,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found! Please check whether you installed Qt correctly. @@ -30431,22 +30960,22 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } MOC=$kde_cv_path fi if test -z "$UIC_NOT_NEEDED"; then - echo "$as_me:$LINENO: checking for uic" >&5 -echo $ECHO_N "checking for uic... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for uic" >&5 +echo $ECHO_N "checking for uic... $ECHO_C" >&6; } if test -n "$UIC_PATH"; then kde_cv_path="$UIC_PATH"; else kde_cache=`echo uic | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -30489,12 +31018,12 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } UIC_PATH="" else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } UIC_PATH=$kde_cv_path fi @@ -30524,10 +31053,10 @@ if test $kde_qtver = 3; then - echo "$as_me:$LINENO: checking whether uic supports -L " >&5 -echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether uic supports -L " >&5 +echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; } kde_cache=`echo L | sed 'y% .=/+-%____p_%'` - if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -30550,22 +31079,22 @@ if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : ac_uic_supports_libpath=yes else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : ac_uic_supports_libpath=no fi - echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5 -echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5 +echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; } kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'` - if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -30588,13 +31117,13 @@ if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } : ac_uic_supports_nounload=yes else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } : ac_uic_supports_nounload=no fi @@ -30625,15 +31154,14 @@ if test -n "$LIBJPEG"; then -echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5 -echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5 +echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; } if test "${kde_cv_qt_jpeg+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -30666,35 +31194,32 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' - { (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 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "kde_cv_qt_jpeg=no" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "kde_cv_qt_jpeg=yes" + eval "kde_cv_qt_jpeg=yes" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_save_LIBS" CXXFLAGS="$ac_save_CXXFLAGS" @@ -30710,12 +31235,12 @@ if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } LIBJPEG_QT='$(LIBJPEG)' else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } LIBJPEG_QT= fi @@ -30746,15 +31271,15 @@ -echo "$as_me:$LINENO: checking for rpath" >&5 -echo $ECHO_N "checking for rpath... $ECHO_C" >&6 -# Check whether --enable-rpath or --disable-rpath was given. +{ echo "$as_me:$LINENO: checking for rpath" >&5 +echo $ECHO_N "checking for rpath... $ECHO_C" >&6; } +# Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then - enableval="$enable_rpath" - USE_RPATH=$enableval + enableval=$enable_rpath; USE_RPATH=$enableval else USE_RPATH=yes -fi; +fi + if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then @@ -30778,11 +31303,11 @@ -echo "$as_me:$LINENO: result: $USE_RPATH" >&5 -echo "${ECHO_T}$USE_RPATH" >&6 +{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5 +echo "${ECHO_T}$USE_RPATH" >&6; } -echo "$as_me:$LINENO: checking for KDE" >&5 -echo $ECHO_N "checking for KDE... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for KDE" >&5 +echo $ECHO_N "checking for KDE... $ECHO_C" >&6; } if test "${prefix}" != NONE; then kde_includes=${includedir} @@ -30834,7 +31359,7 @@ do for j in $kde_check_header; do - echo "configure: 30837: $i/$j" >&5 + echo "configure: 31362: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_incdir=$i @@ -30864,7 +31389,7 @@ do for j in $kde_check_lib; do - echo "configure: 30867: $i/$j" >&5 + echo "configure: 31392: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_libdir=$i @@ -30882,7 +31407,7 @@ do for j in "kde3/plugins/designer/kdewidgets.la"; do - echo "configure: 30885: $i/$j" >&5 + echo "configure: 31410: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 kde_widgetdir=$i @@ -30941,12 +31466,12 @@ fi if test "$exec_prefix" = NONE; then ac_kde_exec_prefix="$ac_kde_prefix" - echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5 -echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6 + { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5 +echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; } else ac_kde_exec_prefix="$exec_prefix" - echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5 -echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6 + { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5 +echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; } fi kde_libraries="${libdir}" @@ -30955,8 +31480,8 @@ else ac_cv_have_kde="have_kde=yes \ ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" - echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5 -echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6 + { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5 +echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; } kde_libraries="$ac_kde_libraries" kde_includes="$ac_kde_includes" @@ -30994,8 +31519,8 @@ if test x$ac_uic_supports_libpath = xyes; then -echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5 -echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5 +echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; } if test "${kde_cv_uic_plugins+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -31038,8 +31563,8 @@ fi -echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5 -echo "${ECHO_T}$kde_cv_uic_plugins" >&6 +{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5 +echo "${ECHO_T}$kde_cv_uic_plugins" >&6; } if test "$kde_cv_uic_plugins" != yes; then { { echo "$as_me:$LINENO: error: you need to install kdelibs first. @@ -31071,10 +31596,9 @@ - # Check whether --enable-path-check or --disable-path-check was given. + # Check whether --enable-path-check was given. if test "${enable_path_check+set}" = set; then - enableval="$enable_path_check" - + enableval=$enable_path_check; if test "$enableval" = "no"; then ac_use_path_checking="default" else ac_use_path_checking="" @@ -31088,13 +31612,14 @@ fi -fi; +fi + -echo "$as_me:$LINENO: checking for KDE paths" >&5 -echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for KDE paths" >&5 +echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; } kde_result="" kde_cached_paths=yes if test "${kde_cv_all_paths+set}" = set; then @@ -31205,15 +31730,14 @@ else if test $kde_qtver = 1; then - echo "$as_me:$LINENO: result: compiling" >&5 -echo "${ECHO_T}compiling" >&6 - + { echo "$as_me:$LINENO: result: compiling" >&5 +echo "${ECHO_T}compiling" >&6; } - echo "$as_me:$LINENO: checking for KDE headers installed" >&5 -echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for KDE headers installed" >&5 +echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; } - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -31265,8 +31789,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application! Check, if you installed the KDE header files correctly. @@ -31305,8 +31829,8 @@ KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" fi -echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 -echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 +echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -31314,8 +31838,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the @@ -31508,15 +32032,14 @@ else if test $kde_qtver = 1; then - echo "$as_me:$LINENO: result: compiling" >&5 -echo "${ECHO_T}compiling" >&6 + { echo "$as_me:$LINENO: result: compiling" >&5 +echo "${ECHO_T}compiling" >&6; } - echo "$as_me:$LINENO: checking for KDE headers installed" >&5 -echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for KDE headers installed" >&5 +echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; } - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -31568,8 +32091,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application! Check, if you installed the KDE header files correctly. @@ -31608,8 +32131,8 @@ KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" fi -echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 -echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 +echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 @@ -31617,8 +32140,8 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the @@ -31710,25 +32233,23 @@ { (exit 1); exit 1; }; } else rm -f conftest* - echo "$as_me:$LINENO: result: $kde_result" >&5 -echo "${ECHO_T}$kde_result" >&6 + { echo "$as_me:$LINENO: result: $kde_result" >&5 +echo "${ECHO_T}$kde_result" >&6; } fi bindir=$kde_bindir -# Check whether --with-arts or --without-arts was given. +# Check whether --with-arts was given. if test "${with_arts+set}" = set; then - withval="$with_arts" - build_arts=$withval + withval=$with_arts; build_arts=$withval else build_arts=yes -fi; - +fi -if test "$build_arts" '!=' "no"; then + if test "$build_arts" '!=' "no"; then include_ARTS_TRUE= include_ARTS_FALSE='#' else @@ -31758,14 +32279,14 @@ kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs" - echo "$as_me:$LINENO: checking for dcopidl" >&5 -echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dcopidl" >&5 +echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; } if test -n "$DCOPIDL"; then kde_cv_path="$DCOPIDL"; else kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -31808,8 +32329,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program dcopidl was not found! Please check whether you installed KDE correctly. @@ -31820,21 +32341,21 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } DCOPIDL=$kde_cv_path fi - echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5 -echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5 +echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; } if test -n "$DCOPIDL2CPP"; then kde_cv_path="$DCOPIDL2CPP"; else kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -31877,8 +32398,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found! Please check whether you installed KDE correctly. @@ -31889,22 +32410,22 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } DCOPIDL2CPP=$kde_cv_path fi if test "$build_arts" '!=' "no"; then - echo "$as_me:$LINENO: checking for mcopidl" >&5 -echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for mcopidl" >&5 +echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; } if test -n "$MCOPIDL"; then kde_cv_path="$MCOPIDL"; else kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -31947,8 +32468,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program mcopidl was not found! Please check whether you installed aRts correctly or use @@ -31961,21 +32482,21 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } MCOPIDL=$kde_cv_path fi - echo "$as_me:$LINENO: checking for artsc-config" >&5 -echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for artsc-config" >&5 +echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; } if test -n "$ARTSCCONFIG"; then kde_cv_path="$ARTSCCONFIG"; else kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32018,8 +32539,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program artsc-config was not found! Please check whether you installed aRts correctly or use @@ -32032,22 +32553,22 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } ARTSCCONFIG=$kde_cv_path fi fi - echo "$as_me:$LINENO: checking for meinproc" >&5 -echo $ECHO_N "checking for meinproc... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for meinproc" >&5 +echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; } if test -n "$MEINPROC"; then kde_cv_path="$MEINPROC"; else kde_cache=`echo meinproc | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32090,12 +32611,12 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } MEINPROC=$kde_cv_path fi @@ -32124,14 +32645,14 @@ if test -n "$kde32ornewer"; then - echo "$as_me:$LINENO: checking for kconfig_compiler" >&5 -echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5 +echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; } if test -n "$KCONFIG_COMPILER"; then kde_cv_path="$KCONFIG_COMPILER"; else kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32174,8 +32695,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found! Please check whether you installed KDE correctly. @@ -32186,21 +32707,21 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } KCONFIG_COMPILER=$kde_cv_path fi - echo "$as_me:$LINENO: checking for dcopidlng" >&5 -echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dcopidlng" >&5 +echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; } if test -n "$DCOPIDLNG"; then kde_cv_path="$DCOPIDLNG"; else kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32243,8 +32764,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found! Please check whether you installed KDE correctly. @@ -32255,8 +32776,8 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } DCOPIDLNG=$kde_cv_path fi @@ -32264,14 +32785,14 @@ fi if test -n "$kde33ornewer"; then - echo "$as_me:$LINENO: checking for makekdewidgets" >&5 -echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for makekdewidgets" >&5 +echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; } if test -n "$MAKEKDEWIDGETS"; then kde_cv_path="$MAKEKDEWIDGETS"; else kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32314,8 +32835,8 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found! Please check whether you installed KDE correctly. @@ -32326,8 +32847,8 @@ { (exit 1); exit 1; }; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } MAKEKDEWIDGETS=$kde_cv_path fi @@ -32335,14 +32856,14 @@ fi - echo "$as_me:$LINENO: checking for xmllint" >&5 -echo $ECHO_N "checking for xmllint... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for xmllint" >&5 +echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; } if test -n "$XMLLINT"; then kde_cv_path="$XMLLINT"; else kde_cache=`echo xmllint | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32385,12 +32906,12 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } XMLLINT="" else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } XMLLINT=$kde_cv_path fi @@ -32405,7 +32926,7 @@ do for j in apps/ksgmltools2/customization/kde-chunk.xsl; do - echo "configure: 32408: $i/$j" >&5 + echo "configure: 32929: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 KDE_XSL_STYLESHEET=$i @@ -32575,8 +33096,8 @@ fi -echo "$as_me:$LINENO: checking for Qt docs" >&5 -echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for Qt docs" >&5 +echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; } kde_qtdir= if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" @@ -32588,7 +33109,7 @@ do for j in qsql.html; do - echo "configure: 32591: $i/$j" >&5 + echo "configure: 33112: $i/$j" >&5 if test -r "$i/$j"; then echo "taking that" >&5 QTDOCDIR=$i @@ -32597,20 +33118,20 @@ done done -echo "$as_me:$LINENO: result: $QTDOCDIR" >&5 -echo "${ECHO_T}$QTDOCDIR" >&6 +{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5 +echo "${ECHO_T}$QTDOCDIR" >&6; } - echo "$as_me:$LINENO: checking for dot" >&5 -echo $ECHO_N "checking for dot... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for dot" >&5 +echo $ECHO_N "checking for dot... $ECHO_C" >&6; } if test -n "$DOT"; then kde_cv_path="$DOT"; else kde_cache=`echo dot | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32653,12 +33174,12 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } DOT=$kde_cv_path fi @@ -32670,14 +33191,14 @@ fi - echo "$as_me:$LINENO: checking for doxygen" >&5 -echo $ECHO_N "checking for doxygen... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for doxygen" >&5 +echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; } if test -n "$DOXYGEN"; then kde_cv_path="$DOXYGEN"; else kde_cache=`echo doxygen | sed 'y%./+-%__p_%'` - if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then + if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -32720,12 +33241,12 @@ fi if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } else - echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -echo "${ECHO_T}$kde_cv_path" >&6 + { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 +echo "${ECHO_T}$kde_cv_path" >&6; } DOXYGEN=$kde_cv_path fi @@ -32746,13 +33267,15 @@ +#MIN_CONFIG(3.2) +CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" + kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -32762,17 +33285,17 @@ if test "${ac_cv_header_knotifyclient_h+set}" = set; then - echo "$as_me:$LINENO: checking for knotifyclient.h" >&5 -echo $ECHO_N "checking for knotifyclient.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for knotifyclient.h" >&5 +echo $ECHO_N "checking for knotifyclient.h... $ECHO_C" >&6; } if test "${ac_cv_header_knotifyclient_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_knotifyclient_h" >&5 -echo "${ECHO_T}$ac_cv_header_knotifyclient_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_knotifyclient_h" >&5 +echo "${ECHO_T}$ac_cv_header_knotifyclient_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking knotifyclient.h usability" >&5 -echo $ECHO_N "checking knotifyclient.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking knotifyclient.h usability" >&5 +echo $ECHO_N "checking knotifyclient.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -32783,41 +33306,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking knotifyclient.h presence" >&5 -echo $ECHO_N "checking knotifyclient.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking knotifyclient.h presence" >&5 +echo $ECHO_N "checking knotifyclient.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -32826,24 +33345,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -32851,9 +33368,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -32877,25 +33395,18 @@ echo "$as_me: WARNING: knotifyclient.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: knotifyclient.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: knotifyclient.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for knotifyclient.h" >&5 -echo $ECHO_N "checking for knotifyclient.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for knotifyclient.h" >&5 +echo $ECHO_N "checking for knotifyclient.h... $ECHO_C" >&6; } if test "${ac_cv_header_knotifyclient_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_knotifyclient_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_knotifyclient_h" >&5 -echo "${ECHO_T}$ac_cv_header_knotifyclient_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_knotifyclient_h" >&5 +echo "${ECHO_T}$ac_cv_header_knotifyclient_h" >&6; } fi if test $ac_cv_header_knotifyclient_h = yes; then @@ -32923,8 +33434,7 @@ kde_safe_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $all_includes" - - ac_ext=cc + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -32934,17 +33444,17 @@ if test "${ac_cv_header_kimiface_h+set}" = set; then - echo "$as_me:$LINENO: checking for kimiface.h" >&5 -echo $ECHO_N "checking for kimiface.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for kimiface.h" >&5 +echo $ECHO_N "checking for kimiface.h... $ECHO_C" >&6; } if test "${ac_cv_header_kimiface_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_kimiface_h" >&5 -echo "${ECHO_T}$ac_cv_header_kimiface_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_kimiface_h" >&5 +echo "${ECHO_T}$ac_cv_header_kimiface_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking kimiface.h usability" >&5 -echo $ECHO_N "checking kimiface.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking kimiface.h usability" >&5 +echo $ECHO_N "checking kimiface.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -32955,41 +33465,37 @@ #include _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_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_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking kimiface.h presence" >&5 -echo $ECHO_N "checking kimiface.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking kimiface.h presence" >&5 +echo $ECHO_N "checking kimiface.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -32998,24 +33504,22 @@ /* end confdefs.h. */ #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -33023,9 +33527,10 @@ ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in @@ -33049,25 +33554,18 @@ echo "$as_me: WARNING: kimiface.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: kimiface.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: kimiface.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for kimiface.h" >&5 -echo $ECHO_N "checking for kimiface.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for kimiface.h" >&5 +echo $ECHO_N "checking for kimiface.h... $ECHO_C" >&6; } if test "${ac_cv_header_kimiface_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_kimiface_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_kimiface_h" >&5 -echo "${ECHO_T}$ac_cv_header_kimiface_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_kimiface_h" >&5 +echo "${ECHO_T}$ac_cv_header_kimiface_h" >&6; } fi if test $ac_cv_header_kimiface_h = yes; then @@ -33092,196 +33590,637 @@ CPPFLAGS=$kde_safe_cppflags +# Check for XScreenSaver -DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin" -TOPSUBDIRS="" - -if test ! -s $srcdir/subdirs; then - files=`cd $srcdir && ls -1` - dirs=`for i in $files; do if test -d $i; then echo $i; fi; done` - for i in $dirs; do - echo $i >> $srcdir/subdirs - done +for ac_header in tgmath.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -ac_topsubdirs= -if test -s $srcdir/inst-apps; then - ac_topsubdirs="`cat $srcdir/inst-apps`" -elif test -s $srcdir/subdirs; then - ac_topsubdirs="`cat $srcdir/subdirs`" + ac_header_compiler=no fi -for i in $ac_topsubdirs; do - echo "$as_me:$LINENO: checking if $i should be compiled" >&5 -echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6 - if test -d $srcdir/$i; then - install_it="yes" - for j in $DO_NOT_COMPILE; do - if test $i = $j; then - install_it="no" - fi - done - else - install_it="no" - fi - echo "$as_me:$LINENO: result: $install_it" >&5 -echo "${ECHO_T}$install_it" >&6 - vari=`echo $i | sed -e 's,[-+.@],_,g'` - if test $install_it = "yes"; then - TOPSUBDIRS="$TOPSUBDIRS $i" - eval "$vari""_SUBDIR_included=yes" - else - eval "$vari""_SUBDIR_included=no" - fi -done - - - - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } -if test "x$doc_SUBDIR_included" = xyes; then - doc_SUBDIR_included_TRUE= - doc_SUBDIR_included_FALSE='#' +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes else - doc_SUBDIR_included_TRUE='#' - doc_SUBDIR_included_FALSE= + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -if test "x$konversation_SUBDIR_included" = xyes; then - konversation_SUBDIR_included_TRUE= - konversation_SUBDIR_included_FALSE='#' + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - konversation_SUBDIR_included_TRUE='#' - konversation_SUBDIR_included_FALSE= + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } - - -if test "x$po_SUBDIR_included" = xyes; then - po_SUBDIR_included_TRUE= - po_SUBDIR_included_FALSE='#' -else - po_SUBDIR_included_TRUE='#' - po_SUBDIR_included_FALSE= fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF - ac_config_files="$ac_config_files Makefile" +fi - ac_config_files="$ac_config_files doc/Makefile" +done +xss_save_ldflags="$LDFLAGS" +LDFLAGS="$X_LDFLAGS" - ac_config_files="$ac_config_files doc/da/Makefile" +LIB_XSS= - ac_config_files="$ac_config_files doc/es/Makefile" - ac_config_files="$ac_config_files doc/et/Makefile" + kde_safe_cppflags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $all_includes" + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + + + { echo "$as_me:$LINENO: checking for X11/extensions/scrnsaver.h" >&5 +echo $ECHO_N "checking for X11/extensions/scrnsaver.h... $ECHO_C" >&6; } +if test "${ac_cv_header_X11_extensions_scrnsaver_h+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. */ + + #include + + +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_X11_extensions_scrnsaver_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_X11_extensions_scrnsaver_h=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_scrnsaver_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6; } +if test $ac_cv_header_X11_extensions_scrnsaver_h = yes; then + + { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5 +echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $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 GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XScreenSaverQueryInfo (); +int +main () +{ +return XScreenSaverQueryInfo (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xext_XScreenSaverQueryInfo=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xext_XScreenSaverQueryInfo=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5 +echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6; } +if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XSCREENSAVER 1 +_ACEOF + + LIB_XSS="-lXext" + +else + + ld_shared_flag= + +{ echo "$as_me:$LINENO: checking whether $CXX supports -shared" >&5 +echo $ECHO_N "checking whether $CXX supports -shared... $ECHO_C" >&6; } +kde_cache=`echo shared | sed 'y% .=/+-,%____p__%'` +if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' + + + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -shared" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "kde_cv_prog_cxx_$kde_cache=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + CXXFLAGS="$save_CXXFLAGS" + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + +fi + +if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + : + ld_shared_flag="-shared" +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + : + +fi + + { echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5 +echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXss $ld_shared_flag $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $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 GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XScreenSaverQueryInfo (); +int +main () +{ +return XScreenSaverQueryInfo (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xss_XScreenSaverQueryInfo=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xss_XScreenSaverQueryInfo=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5 +echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6; } +if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_XSCREENSAVER 1 +_ACEOF + + LIB_XSS="-lXss" + +fi + + +fi + + +fi + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + CPPFLAGS=$kde_safe_cppflags + + + +LDFLAGS="$xss_save_ldflags" + - ac_config_files="$ac_config_files doc/it/Makefile" +DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin" +TOPSUBDIRS="" + +if test ! -s $srcdir/subdirs; then + files=`cd $srcdir && ls -1` + dirs=`for i in $files; do if test -d $i; then echo $i; fi; done` + for i in $dirs; do + echo $i >> $srcdir/subdirs + done +fi + +ac_topsubdirs= +if test -s $srcdir/inst-apps; then + ac_topsubdirs="`cat $srcdir/inst-apps`" +elif test -s $srcdir/subdirs; then + ac_topsubdirs="`cat $srcdir/subdirs`" +fi + +for i in $ac_topsubdirs; do + { echo "$as_me:$LINENO: checking if $i should be compiled" >&5 +echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6; } + if test -d $srcdir/$i; then + install_it="yes" + for j in $DO_NOT_COMPILE; do + if test $i = $j; then + install_it="no" + fi + done + else + install_it="no" + fi + { echo "$as_me:$LINENO: result: $install_it" >&5 +echo "${ECHO_T}$install_it" >&6; } + vari=`echo $i | sed -e 's,[-+.@],_,g'` + if test $install_it = "yes"; then + TOPSUBDIRS="$TOPSUBDIRS $i" + eval "$vari""_SUBDIR_included=yes" + else + eval "$vari""_SUBDIR_included=no" + fi +done + + + + if test "x$doc_SUBDIR_included" = xyes; then + doc_SUBDIR_included_TRUE= + doc_SUBDIR_included_FALSE='#' +else + doc_SUBDIR_included_TRUE='#' + doc_SUBDIR_included_FALSE= +fi + + if test "x$konversation_SUBDIR_included" = xyes; then + konversation_SUBDIR_included_TRUE= + konversation_SUBDIR_included_FALSE='#' +else + konversation_SUBDIR_included_TRUE='#' + konversation_SUBDIR_included_FALSE= +fi - ac_config_files="$ac_config_files doc/konversation/Makefile" + if test "x$po_SUBDIR_included" = xyes; then + po_SUBDIR_included_TRUE= + po_SUBDIR_included_FALSE='#' +else + po_SUBDIR_included_TRUE='#' + po_SUBDIR_included_FALSE= +fi - ac_config_files="$ac_config_files doc/nl/Makefile" +ac_config_files="$ac_config_files Makefile" - ac_config_files="$ac_config_files doc/pt/Makefile" +ac_config_files="$ac_config_files doc/Makefile" - ac_config_files="$ac_config_files doc/ru/Makefile" +ac_config_files="$ac_config_files doc/da/Makefile" - ac_config_files="$ac_config_files doc/sv/Makefile" +ac_config_files="$ac_config_files doc/es/Makefile" - ac_config_files="$ac_config_files konversation/Makefile" +ac_config_files="$ac_config_files doc/et/Makefile" - ac_config_files="$ac_config_files konversation/images/Makefile" +ac_config_files="$ac_config_files doc/it/Makefile" - ac_config_files="$ac_config_files konversation/images/icons/Makefile" +ac_config_files="$ac_config_files doc/konversation/Makefile" - ac_config_files="$ac_config_files konversation/images/nickicons/Makefile" +ac_config_files="$ac_config_files doc/pt/Makefile" - ac_config_files="$ac_config_files konversation/images/nickicons/alternative/Makefile" +ac_config_files="$ac_config_files doc/ru/Makefile" - ac_config_files="$ac_config_files konversation/images/nickicons/christmas/Makefile" +ac_config_files="$ac_config_files doc/sv/Makefile" - ac_config_files="$ac_config_files konversation/images/nickicons/classic/Makefile" +ac_config_files="$ac_config_files konversation/Makefile" - ac_config_files="$ac_config_files konversation/images/nickicons/default/Makefile" +ac_config_files="$ac_config_files konversation/images/Makefile" - ac_config_files="$ac_config_files konversation/images/nickicons/smiling/Makefile" +ac_config_files="$ac_config_files konversation/images/icons/Makefile" - ac_config_files="$ac_config_files konversation/images/nickicons/square/Makefile" +ac_config_files="$ac_config_files konversation/images/nickicons/Makefile" - ac_config_files="$ac_config_files konversation/scripts/Makefile" +ac_config_files="$ac_config_files konversation/images/nickicons/alternative/Makefile" - ac_config_files="$ac_config_files konversation/src/Makefile" +ac_config_files="$ac_config_files konversation/images/nickicons/christmas/Makefile" - ac_config_files="$ac_config_files konversation/src/blowfish/Makefile" +ac_config_files="$ac_config_files konversation/images/nickicons/classic/Makefile" - ac_config_files="$ac_config_files konversation/src/config/Makefile" +ac_config_files="$ac_config_files konversation/images/nickicons/default/Makefile" - ac_config_files="$ac_config_files konversation/src/linkaddressbook/Makefile" +ac_config_files="$ac_config_files konversation/images/nickicons/oxygen/Makefile" - ac_config_files="$ac_config_files po/Makefile" +ac_config_files="$ac_config_files konversation/images/nickicons/smiling/Makefile" - ac_config_files="$ac_config_files po/ar/Makefile" +ac_config_files="$ac_config_files konversation/images/nickicons/square/Makefile" - ac_config_files="$ac_config_files po/bg/Makefile" +ac_config_files="$ac_config_files konversation/scripts/Makefile" - ac_config_files="$ac_config_files po/ca/Makefile" +ac_config_files="$ac_config_files konversation/src/Makefile" - ac_config_files="$ac_config_files po/cs/Makefile" +ac_config_files="$ac_config_files konversation/src/blowfish/Makefile" - ac_config_files="$ac_config_files po/da/Makefile" +ac_config_files="$ac_config_files konversation/src/config/Makefile" - ac_config_files="$ac_config_files po/de/Makefile" +ac_config_files="$ac_config_files konversation/src/linkaddressbook/Makefile" - ac_config_files="$ac_config_files po/el/Makefile" +ac_config_files="$ac_config_files po/Makefile" - ac_config_files="$ac_config_files po/en_GB/Makefile" +ac_config_files="$ac_config_files po/ar/Makefile" - ac_config_files="$ac_config_files po/es/Makefile" +ac_config_files="$ac_config_files po/bg/Makefile" - ac_config_files="$ac_config_files po/et/Makefile" +ac_config_files="$ac_config_files po/ca/Makefile" - ac_config_files="$ac_config_files po/fi/Makefile" +ac_config_files="$ac_config_files po/da/Makefile" - ac_config_files="$ac_config_files po/fr/Makefile" +ac_config_files="$ac_config_files po/de/Makefile" - ac_config_files="$ac_config_files po/gl/Makefile" +ac_config_files="$ac_config_files po/el/Makefile" - ac_config_files="$ac_config_files po/he/Makefile" +ac_config_files="$ac_config_files po/en_GB/Makefile" - ac_config_files="$ac_config_files po/hu/Makefile" +ac_config_files="$ac_config_files po/es/Makefile" - ac_config_files="$ac_config_files po/it/Makefile" +ac_config_files="$ac_config_files po/et/Makefile" - ac_config_files="$ac_config_files po/ja/Makefile" +ac_config_files="$ac_config_files po/fi/Makefile" - ac_config_files="$ac_config_files po/ka/Makefile" +ac_config_files="$ac_config_files po/fr/Makefile" - ac_config_files="$ac_config_files po/ko/Makefile" +ac_config_files="$ac_config_files po/gl/Makefile" - ac_config_files="$ac_config_files po/lt/Makefile" +ac_config_files="$ac_config_files po/he/Makefile" - ac_config_files="$ac_config_files po/nl/Makefile" +ac_config_files="$ac_config_files po/hu/Makefile" - ac_config_files="$ac_config_files po/pa/Makefile" +ac_config_files="$ac_config_files po/it/Makefile" - ac_config_files="$ac_config_files po/pt/Makefile" +ac_config_files="$ac_config_files po/ja/Makefile" - ac_config_files="$ac_config_files po/pt_BR/Makefile" +ac_config_files="$ac_config_files po/ka/Makefile" - ac_config_files="$ac_config_files po/ru/Makefile" +ac_config_files="$ac_config_files po/ko/Makefile" - ac_config_files="$ac_config_files po/sr/Makefile" +ac_config_files="$ac_config_files po/pa/Makefile" - ac_config_files="$ac_config_files po/sr@Latn/Makefile" +ac_config_files="$ac_config_files po/pt/Makefile" - ac_config_files="$ac_config_files po/sv/Makefile" +ac_config_files="$ac_config_files po/ru/Makefile" - ac_config_files="$ac_config_files po/ta/Makefile" +ac_config_files="$ac_config_files po/sr/Makefile" - ac_config_files="$ac_config_files po/tr/Makefile" +ac_config_files="$ac_config_files po/sr@Latn/Makefile" - ac_config_files="$ac_config_files po/zh_TW/Makefile" +ac_config_files="$ac_config_files po/sv/Makefile" + +ac_config_files="$ac_config_files po/tr/Makefile" + +ac_config_files="$ac_config_files po/zh_CN/Makefile" + +ac_config_files="$ac_config_files po/zh_TW/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -33301,39 +34240,58 @@ # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -33342,32 +34300,18 @@ # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -33461,17 +34405,45 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -33481,8 +34453,43 @@ fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -33496,18 +34503,19 @@ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -33515,159 +34523,120 @@ # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits +# CDPATH. +$as_unset CDPATH -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -33676,7 +34645,28 @@ as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -33685,31 +34675,14 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - exec 6>&1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - +# values after options handling. +ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -33717,30 +34690,20 @@ CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. @@ -33748,7 +34711,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -33767,19 +34730,22 @@ $config_commands Report bugs to ." -_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -33790,39 +34756,24 @@ do case $1 in --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - -*) + *) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; esac case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift @@ -33832,18 +34783,24 @@ $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; esac shift @@ -33859,94 +34816,102 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF # -# INIT-COMMANDS section. +# INIT-COMMANDS # - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "doc/da/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/da/Makefile" ;; - "doc/es/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/es/Makefile" ;; - "doc/et/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/et/Makefile" ;; - "doc/it/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/it/Makefile" ;; - "doc/konversation/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/konversation/Makefile" ;; - "doc/nl/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/nl/Makefile" ;; - "doc/pt/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/pt/Makefile" ;; - "doc/ru/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ru/Makefile" ;; - "doc/sv/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/sv/Makefile" ;; - "konversation/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/Makefile" ;; - "konversation/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/Makefile" ;; - "konversation/images/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/icons/Makefile" ;; - "konversation/images/nickicons/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/Makefile" ;; - "konversation/images/nickicons/alternative/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/alternative/Makefile" ;; - "konversation/images/nickicons/christmas/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/christmas/Makefile" ;; - "konversation/images/nickicons/classic/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/classic/Makefile" ;; - "konversation/images/nickicons/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/default/Makefile" ;; - "konversation/images/nickicons/smiling/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/smiling/Makefile" ;; - "konversation/images/nickicons/square/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/square/Makefile" ;; - "konversation/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/scripts/Makefile" ;; - "konversation/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/src/Makefile" ;; - "konversation/src/blowfish/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/src/blowfish/Makefile" ;; - "konversation/src/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/src/config/Makefile" ;; - "konversation/src/linkaddressbook/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/src/linkaddressbook/Makefile" ;; - "po/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; - "po/ar/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ar/Makefile" ;; - "po/bg/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/bg/Makefile" ;; - "po/ca/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ca/Makefile" ;; - "po/cs/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/cs/Makefile" ;; - "po/da/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/da/Makefile" ;; - "po/de/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/de/Makefile" ;; - "po/el/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/el/Makefile" ;; - "po/en_GB/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/en_GB/Makefile" ;; - "po/es/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/es/Makefile" ;; - "po/et/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/et/Makefile" ;; - "po/fi/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/fi/Makefile" ;; - "po/fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/fr/Makefile" ;; - "po/gl/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/gl/Makefile" ;; - "po/he/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/he/Makefile" ;; - "po/hu/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/hu/Makefile" ;; - "po/it/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/it/Makefile" ;; - "po/ja/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ja/Makefile" ;; - "po/ka/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ka/Makefile" ;; - "po/ko/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ko/Makefile" ;; - "po/lt/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/lt/Makefile" ;; - "po/nl/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/nl/Makefile" ;; - "po/pa/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pa/Makefile" ;; - "po/pt/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pt/Makefile" ;; - "po/pt_BR/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pt_BR/Makefile" ;; - "po/ru/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ru/Makefile" ;; - "po/sr/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sr/Makefile" ;; - "po/sr@Latn/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sr@Latn/Makefile" ;; - "po/sv/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sv/Makefile" ;; - "po/ta/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ta/Makefile" ;; - "po/tr/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/tr/Makefile" ;; - "po/zh_TW/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/zh_TW/Makefile" ;; - "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; + "doc/da/Makefile") CONFIG_FILES="$CONFIG_FILES doc/da/Makefile" ;; + "doc/es/Makefile") CONFIG_FILES="$CONFIG_FILES doc/es/Makefile" ;; + "doc/et/Makefile") CONFIG_FILES="$CONFIG_FILES doc/et/Makefile" ;; + "doc/it/Makefile") CONFIG_FILES="$CONFIG_FILES doc/it/Makefile" ;; + "doc/konversation/Makefile") CONFIG_FILES="$CONFIG_FILES doc/konversation/Makefile" ;; + "doc/pt/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pt/Makefile" ;; + "doc/ru/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ru/Makefile" ;; + "doc/sv/Makefile") CONFIG_FILES="$CONFIG_FILES doc/sv/Makefile" ;; + "konversation/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/Makefile" ;; + "konversation/images/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/Makefile" ;; + "konversation/images/icons/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/icons/Makefile" ;; + "konversation/images/nickicons/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/Makefile" ;; + "konversation/images/nickicons/alternative/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/alternative/Makefile" ;; + "konversation/images/nickicons/christmas/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/christmas/Makefile" ;; + "konversation/images/nickicons/classic/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/classic/Makefile" ;; + "konversation/images/nickicons/default/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/default/Makefile" ;; + "konversation/images/nickicons/oxygen/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/oxygen/Makefile" ;; + "konversation/images/nickicons/smiling/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/smiling/Makefile" ;; + "konversation/images/nickicons/square/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/square/Makefile" ;; + "konversation/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/scripts/Makefile" ;; + "konversation/src/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/src/Makefile" ;; + "konversation/src/blowfish/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/src/blowfish/Makefile" ;; + "konversation/src/config/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/src/config/Makefile" ;; + "konversation/src/linkaddressbook/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/src/linkaddressbook/Makefile" ;; + "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; + "po/ar/Makefile") CONFIG_FILES="$CONFIG_FILES po/ar/Makefile" ;; + "po/bg/Makefile") CONFIG_FILES="$CONFIG_FILES po/bg/Makefile" ;; + "po/ca/Makefile") CONFIG_FILES="$CONFIG_FILES po/ca/Makefile" ;; + "po/da/Makefile") CONFIG_FILES="$CONFIG_FILES po/da/Makefile" ;; + "po/de/Makefile") CONFIG_FILES="$CONFIG_FILES po/de/Makefile" ;; + "po/el/Makefile") CONFIG_FILES="$CONFIG_FILES po/el/Makefile" ;; + "po/en_GB/Makefile") CONFIG_FILES="$CONFIG_FILES po/en_GB/Makefile" ;; + "po/es/Makefile") CONFIG_FILES="$CONFIG_FILES po/es/Makefile" ;; + "po/et/Makefile") CONFIG_FILES="$CONFIG_FILES po/et/Makefile" ;; + "po/fi/Makefile") CONFIG_FILES="$CONFIG_FILES po/fi/Makefile" ;; + "po/fr/Makefile") CONFIG_FILES="$CONFIG_FILES po/fr/Makefile" ;; + "po/gl/Makefile") CONFIG_FILES="$CONFIG_FILES po/gl/Makefile" ;; + "po/he/Makefile") CONFIG_FILES="$CONFIG_FILES po/he/Makefile" ;; + "po/hu/Makefile") CONFIG_FILES="$CONFIG_FILES po/hu/Makefile" ;; + "po/it/Makefile") CONFIG_FILES="$CONFIG_FILES po/it/Makefile" ;; + "po/ja/Makefile") CONFIG_FILES="$CONFIG_FILES po/ja/Makefile" ;; + "po/ka/Makefile") CONFIG_FILES="$CONFIG_FILES po/ka/Makefile" ;; + "po/ko/Makefile") CONFIG_FILES="$CONFIG_FILES po/ko/Makefile" ;; + "po/pa/Makefile") CONFIG_FILES="$CONFIG_FILES po/pa/Makefile" ;; + "po/pt/Makefile") CONFIG_FILES="$CONFIG_FILES po/pt/Makefile" ;; + "po/ru/Makefile") CONFIG_FILES="$CONFIG_FILES po/ru/Makefile" ;; + "po/sr/Makefile") CONFIG_FILES="$CONFIG_FILES po/sr/Makefile" ;; + "po/sr@Latn/Makefile") CONFIG_FILES="$CONFIG_FILES po/sr@Latn/Makefile" ;; + "po/sv/Makefile") CONFIG_FILES="$CONFIG_FILES po/sv/Makefile" ;; + "po/tr/Makefile") CONFIG_FILES="$CONFIG_FILES po/tr/Makefile" ;; + "po/zh_CN/Makefile") CONFIG_FILES="$CONFIG_FILES po/zh_CN/Makefile" ;; + "po/zh_TW/Makefile") CONFIG_FILES="$CONFIG_FILES po/zh_TW/Makefile" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -33958,507 +34923,663 @@ fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, +# simply because there is no reason against having it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - # -# CONFIG_FILES section. +# Set up the sed scripts for CONFIG_FILES section. # # No need to generate the scripts if there are no CONFIG_FILES. # This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@target@,$target,;t t -s,@target_cpu@,$target_cpu,;t t -s,@target_vendor@,$target_vendor,;t t -s,@target_os@,$target_os,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@CYGPATH_W@,$CYGPATH_W,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t -s,@ACLOCAL@,$ACLOCAL,;t t -s,@AUTOCONF@,$AUTOCONF,;t t -s,@AUTOMAKE@,$AUTOMAKE,;t t -s,@AUTOHEADER@,$AUTOHEADER,;t t -s,@MAKEINFO@,$MAKEINFO,;t t -s,@install_sh@,$install_sh,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t -s,@mkdir_p@,$mkdir_p,;t t -s,@AWK@,$AWK,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@am__leading_dot@,$am__leading_dot,;t t -s,@AMTAR@,$AMTAR,;t t -s,@am__tar@,$am__tar,;t t -s,@am__untar@,$am__untar,;t t -s,@KDECONFIG@,$KDECONFIG,;t t -s,@kde_libs_prefix@,$kde_libs_prefix,;t t -s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t -s,@CONF_FILES@,$CONF_FILES,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@DEPDIR@,$DEPDIR,;t t -s,@am__include@,$am__include,;t t -s,@am__quote@,$am__quote,;t t -s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t -s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t -s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CCDEPMODE@,$CCDEPMODE,;t t -s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t -s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@CPP@,$CPP,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@CXXDEPMODE@,$CXXDEPMODE,;t t -s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t -s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t -s,@WOVERLOADED_VIRTUAL@,$WOVERLOADED_VIRTUAL,;t t -s,@HAVE_GCC_VISIBILITY@,$HAVE_GCC_VISIBILITY,;t t -s,@unsermake_enable_pch_TRUE@,$unsermake_enable_pch_TRUE,;t t -s,@unsermake_enable_pch_FALSE@,$unsermake_enable_pch_FALSE,;t t -s,@USE_EXCEPTIONS@,$USE_EXCEPTIONS,;t t -s,@USE_RTTI@,$USE_RTTI,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@NOOPT_CXXFLAGS@,$NOOPT_CXXFLAGS,;t t -s,@NOOPT_CFLAGS@,$NOOPT_CFLAGS,;t t -s,@ENABLE_PERMISSIVE_FLAG@,$ENABLE_PERMISSIVE_FLAG,;t t -s,@LDFLAGS_AS_NEEDED@,$LDFLAGS_AS_NEEDED,;t t -s,@LDFLAGS_NEW_DTAGS@,$LDFLAGS_NEW_DTAGS,;t t -s,@KDE_USE_FINAL_TRUE@,$KDE_USE_FINAL_TRUE,;t t -s,@KDE_USE_FINAL_FALSE@,$KDE_USE_FINAL_FALSE,;t t -s,@KDE_USE_CLOSURE_TRUE@,$KDE_USE_CLOSURE_TRUE,;t t -s,@KDE_USE_CLOSURE_FALSE@,$KDE_USE_CLOSURE_FALSE,;t t -s,@KDE_NO_UNDEFINED@,$KDE_NO_UNDEFINED,;t t -s,@KDE_USE_NMCHECK_TRUE@,$KDE_USE_NMCHECK_TRUE,;t t -s,@KDE_USE_NMCHECK_FALSE@,$KDE_USE_NMCHECK_FALSE,;t t -s,@EGREP@,$EGREP,;t t -s,@LN_S@,$LN_S,;t t -s,@ECHO@,$ECHO,;t t -s,@AR@,$AR,;t t -s,@ac_ct_AR@,$ac_ct_AR,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@F77@,$F77,;t t -s,@FFLAGS@,$FFLAGS,;t t -s,@ac_ct_F77@,$ac_ct_F77,;t t -s,@LIBTOOL@,$LIBTOOL,;t t -s,@KDE_PLUGIN@,$KDE_PLUGIN,;t t -s,@KDE_CHECK_PLUGIN@,$KDE_CHECK_PLUGIN,;t t -s,@MSGFMT@,$MSGFMT,;t t -s,@GMSGFMT@,$GMSGFMT,;t t -s,@XGETTEXT@,$XGETTEXT,;t t -s,@LIBUTIL@,$LIBUTIL,;t t -s,@LIBCOMPAT@,$LIBCOMPAT,;t t -s,@LIBCRYPT@,$LIBCRYPT,;t t -s,@LIBRESOLV@,$LIBRESOLV,;t t -s,@LIB_POLL@,$LIB_POLL,;t t -s,@FRAMEWORK_COREAUDIO@,$FRAMEWORK_COREAUDIO,;t t -s,@LIBSOCKET@,$LIBSOCKET,;t t -s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t -s,@LIBUCB@,$LIBUCB,;t t -s,@LIBDL@,$LIBDL,;t t -s,@KDE_USE_FPIE@,$KDE_USE_FPIE,;t t -s,@KDE_USE_PIE@,$KDE_USE_PIE,;t t -s,@include_x11_TRUE@,$include_x11_TRUE,;t t -s,@include_x11_FALSE@,$include_x11_FALSE,;t t -s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t -s,@LIB_X11@,$LIB_X11,;t t -s,@LIB_XRENDER@,$LIB_XRENDER,;t t -s,@LIBSM@,$LIBSM,;t t -s,@X_INCLUDES@,$X_INCLUDES,;t t -s,@X_LDFLAGS@,$X_LDFLAGS,;t t -s,@x_includes@,$x_includes,;t t -s,@x_libraries@,$x_libraries,;t t -s,@QTE_NORTTI@,$QTE_NORTTI,;t t -s,@LIB_XEXT@,$LIB_XEXT,;t t -s,@LIBPTHREAD@,$LIBPTHREAD,;t t -s,@USE_THREADS@,$USE_THREADS,;t t -s,@KDE_MT_LDFLAGS@,$KDE_MT_LDFLAGS,;t t -s,@KDE_MT_LIBS@,$KDE_MT_LIBS,;t t -s,@USER_INCLUDES@,$USER_INCLUDES,;t t -s,@USER_LDFLAGS@,$USER_LDFLAGS,;t t -s,@LIBZ@,$LIBZ,;t t -s,@LIBPNG@,$LIBPNG,;t t -s,@LIBJPEG@,$LIBJPEG,;t t -s,@qt_libraries@,$qt_libraries,;t t -s,@qt_includes@,$qt_includes,;t t -s,@QT_INCLUDES@,$QT_INCLUDES,;t t -s,@QT_LDFLAGS@,$QT_LDFLAGS,;t t -s,@PERL@,$PERL,;t t -s,@MOC@,$MOC,;t t -s,@UIC@,$UIC,;t t -s,@UIC_TR@,$UIC_TR,;t t -s,@LIB_QT@,$LIB_QT,;t t -s,@LIB_QPE@,$LIB_QPE,;t t -s,@kde_qtver@,$kde_qtver,;t t -s,@KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t -s,@KDE_RPATH@,$KDE_RPATH,;t t -s,@X_RPATH@,$X_RPATH,;t t -s,@kde_libraries@,$kde_libraries,;t t -s,@kde_includes@,$kde_includes,;t t -s,@KDE_LDFLAGS@,$KDE_LDFLAGS,;t t -s,@KDE_INCLUDES@,$KDE_INCLUDES,;t t -s,@all_includes@,$all_includes,;t t -s,@all_libraries@,$all_libraries,;t t -s,@AUTODIRS@,$AUTODIRS,;t t -s,@include_ARTS_TRUE@,$include_ARTS_TRUE,;t t -s,@include_ARTS_FALSE@,$include_ARTS_FALSE,;t t -s,@MAKEKDEWIDGETS@,$MAKEKDEWIDGETS,;t t -s,@KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t -s,@KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t -s,@DCOPIDLNG@,$DCOPIDLNG,;t t -s,@DCOPIDL@,$DCOPIDL,;t t -s,@DCOPIDL2CPP@,$DCOPIDL2CPP,;t t -s,@DCOP_DEPENDENCIES@,$DCOP_DEPENDENCIES,;t t -s,@MCOPIDL@,$MCOPIDL,;t t -s,@ARTSCCONFIG@,$ARTSCCONFIG,;t t -s,@MEINPROC@,$MEINPROC,;t t -s,@KDE_XSL_STYLESHEET@,$KDE_XSL_STYLESHEET,;t t -s,@XMLLINT@,$XMLLINT,;t t -s,@kde_htmldir@,$kde_htmldir,;t t -s,@kde_appsdir@,$kde_appsdir,;t t -s,@kde_icondir@,$kde_icondir,;t t -s,@kde_sounddir@,$kde_sounddir,;t t -s,@kde_datadir@,$kde_datadir,;t t -s,@kde_locale@,$kde_locale,;t t -s,@kde_confdir@,$kde_confdir,;t t -s,@kde_kcfgdir@,$kde_kcfgdir,;t t -s,@kde_mimedir@,$kde_mimedir,;t t -s,@kde_wallpaperdir@,$kde_wallpaperdir,;t t -s,@kde_bindir@,$kde_bindir,;t t -s,@xdg_appsdir@,$xdg_appsdir,;t t -s,@xdg_menudir@,$xdg_menudir,;t t -s,@xdg_directorydir@,$xdg_directorydir,;t t -s,@kde_templatesdir@,$kde_templatesdir,;t t -s,@kde_servicesdir@,$kde_servicesdir,;t t -s,@kde_servicetypesdir@,$kde_servicetypesdir,;t t -s,@kde_moduledir@,$kde_moduledir,;t t -s,@kdeinitdir@,$kdeinitdir,;t t -s,@kde_styledir@,$kde_styledir,;t t -s,@kde_widgetdir@,$kde_widgetdir,;t t -s,@LIB_KDED@,$LIB_KDED,;t t -s,@LIB_KDECORE@,$LIB_KDECORE,;t t -s,@LIB_KDEUI@,$LIB_KDEUI,;t t -s,@LIB_KIO@,$LIB_KIO,;t t -s,@LIB_KJS@,$LIB_KJS,;t t -s,@LIB_SMB@,$LIB_SMB,;t t -s,@LIB_KAB@,$LIB_KAB,;t t -s,@LIB_KABC@,$LIB_KABC,;t t -s,@LIB_KHTML@,$LIB_KHTML,;t t -s,@LIB_KSPELL@,$LIB_KSPELL,;t t -s,@LIB_KPARTS@,$LIB_KPARTS,;t t -s,@LIB_KDEPRINT@,$LIB_KDEPRINT,;t t -s,@LIB_KUTILS@,$LIB_KUTILS,;t t -s,@LIB_KDEPIM@,$LIB_KDEPIM,;t t -s,@LIB_KIMPROXY@,$LIB_KIMPROXY,;t t -s,@LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t -s,@LIB_KDNSSD@,$LIB_KDNSSD,;t t -s,@LIB_KUNITTEST@,$LIB_KUNITTEST,;t t -s,@LIB_KSYCOCA@,$LIB_KSYCOCA,;t t -s,@LIB_KFILE@,$LIB_KFILE,;t t -s,@LIB_KFM@,$LIB_KFM,;t t -s,@LIB_ARTS@,$LIB_ARTS,;t t -s,@QTDOCDIR@,$QTDOCDIR,;t t -s,@KDE_HAVE_DOT@,$KDE_HAVE_DOT,;t t -s,@DOXYGEN@,$DOXYGEN,;t t -s,@DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t -s,@DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t -s,@KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t -s,@LIB_KIMIFACE@,$LIB_KIMIFACE,;t t -s,@TOPSUBDIRS@,$TOPSUBDIRS,;t t -s,@doc_SUBDIR_included_TRUE@,$doc_SUBDIR_included_TRUE,;t t -s,@doc_SUBDIR_included_FALSE@,$doc_SUBDIR_included_FALSE,;t t -s,@konversation_SUBDIR_included_TRUE@,$konversation_SUBDIR_included_TRUE,;t t -s,@konversation_SUBDIR_included_FALSE@,$konversation_SUBDIR_included_FALSE,;t t -s,@po_SUBDIR_included_TRUE@,$po_SUBDIR_included_TRUE,;t t -s,@po_SUBDIR_included_FALSE@,$po_SUBDIR_included_FALSE,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat +if test -n "$CONFIG_FILES"; then + +_ACEOF + + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +target!$target$ac_delim +target_cpu!$target_cpu$ac_delim +target_vendor!$target_vendor$ac_delim +target_os!$target_os$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +am__isrc!$am__isrc$ac_delim +CYGPATH_W!$CYGPATH_W$ac_delim +PACKAGE!$PACKAGE$ac_delim +VERSION!$VERSION$ac_delim +ACLOCAL!$ACLOCAL$ac_delim +AUTOCONF!$AUTOCONF$ac_delim +AUTOMAKE!$AUTOMAKE$ac_delim +AUTOHEADER!$AUTOHEADER$ac_delim +MAKEINFO!$MAKEINFO$ac_delim +install_sh!$install_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +mkdir_p!$mkdir_p$ac_delim +AWK!$AWK$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +am__leading_dot!$am__leading_dot$ac_delim +AMTAR!$AMTAR$ac_delim +am__tar!$am__tar$ac_delim +am__untar!$am__untar$ac_delim +KDECONFIG!$KDECONFIG$ac_delim +kde_libs_prefix!$kde_libs_prefix$ac_delim +kde_libs_htmldir!$kde_libs_htmldir$ac_delim +CONF_FILES!$CONF_FILES$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +DEPDIR!$DEPDIR$ac_delim +am__include!$am__include$ac_delim +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +CCDEPMODE!$CCDEPMODE$ac_delim +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +CPP!$CPP$ac_delim +CXX!$CXX$ac_delim +CXXFLAGS!$CXXFLAGS$ac_delim +ac_ct_CXX!$ac_ct_CXX$ac_delim +CXXDEPMODE!$CXXDEPMODE$ac_delim +am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi -fi # test -n "$CONFIG_FILES" +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim +WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim +HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim +unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim +unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim +USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim +USE_RTTI!$USE_RTTI$ac_delim +CXXCPP!$CXXCPP$ac_delim +NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim +NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim +ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim +LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim +LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim +KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim +KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim +KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim +KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim +KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim +KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim +KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +LN_S!$LN_S$ac_delim +ECHO!$ECHO$ac_delim +AR!$AR$ac_delim +RANLIB!$RANLIB$ac_delim +F77!$F77$ac_delim +FFLAGS!$FFLAGS$ac_delim +ac_ct_F77!$ac_ct_F77$ac_delim +LIBTOOL!$LIBTOOL$ac_delim +KDE_PLUGIN!$KDE_PLUGIN$ac_delim +KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim +MSGFMT!$MSGFMT$ac_delim +GMSGFMT!$GMSGFMT$ac_delim +XGETTEXT!$XGETTEXT$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +LIBUTIL!$LIBUTIL$ac_delim +LIBCOMPAT!$LIBCOMPAT$ac_delim +LIBCRYPT!$LIBCRYPT$ac_delim +LIBRESOLV!$LIBRESOLV$ac_delim +LIB_POLL!$LIB_POLL$ac_delim +FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim +LIBSOCKET!$LIBSOCKET$ac_delim +X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim +LIBUCB!$LIBUCB$ac_delim +LIBDL!$LIBDL$ac_delim +KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim +KDE_USE_PIE!$KDE_USE_PIE$ac_delim +include_x11_TRUE!$include_x11_TRUE$ac_delim +include_x11_FALSE!$include_x11_FALSE$ac_delim +XMKMF!$XMKMF$ac_delim +X_PRE_LIBS!$X_PRE_LIBS$ac_delim +LIB_X11!$LIB_X11$ac_delim +LIB_XRENDER!$LIB_XRENDER$ac_delim +LIBSM!$LIBSM$ac_delim +X_INCLUDES!$X_INCLUDES$ac_delim +X_LDFLAGS!$X_LDFLAGS$ac_delim +x_includes!$x_includes$ac_delim +x_libraries!$x_libraries$ac_delim +QTE_NORTTI!$QTE_NORTTI$ac_delim +LIB_XEXT!$LIB_XEXT$ac_delim +LIBPTHREAD!$LIBPTHREAD$ac_delim +USE_THREADS!$USE_THREADS$ac_delim +KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim +KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim +USER_INCLUDES!$USER_INCLUDES$ac_delim +USER_LDFLAGS!$USER_LDFLAGS$ac_delim +LIBZ!$LIBZ$ac_delim +LIBPNG!$LIBPNG$ac_delim +LIBJPEG!$LIBJPEG$ac_delim +qt_libraries!$qt_libraries$ac_delim +qt_includes!$qt_includes$ac_delim +QT_INCLUDES!$QT_INCLUDES$ac_delim +QT_LDFLAGS!$QT_LDFLAGS$ac_delim +PERL!$PERL$ac_delim +MOC!$MOC$ac_delim +UIC!$UIC$ac_delim +UIC_TR!$UIC_TR$ac_delim +LIB_QT!$LIB_QT$ac_delim +LIB_QPE!$LIB_QPE$ac_delim +kde_qtver!$kde_qtver$ac_delim +KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim +KDE_RPATH!$KDE_RPATH$ac_delim +X_RPATH!$X_RPATH$ac_delim +kde_libraries!$kde_libraries$ac_delim +kde_includes!$kde_includes$ac_delim +KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim +KDE_INCLUDES!$KDE_INCLUDES$ac_delim +all_includes!$all_includes$ac_delim +all_libraries!$all_libraries$ac_delim +AUTODIRS!$AUTODIRS$ac_delim +include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim +include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim +MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim +KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim +KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim +DCOPIDLNG!$DCOPIDLNG$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +DCOPIDL!$DCOPIDL$ac_delim +DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim +DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim +MCOPIDL!$MCOPIDL$ac_delim +ARTSCCONFIG!$ARTSCCONFIG$ac_delim +MEINPROC!$MEINPROC$ac_delim +KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim +XMLLINT!$XMLLINT$ac_delim +kde_htmldir!$kde_htmldir$ac_delim +kde_appsdir!$kde_appsdir$ac_delim +kde_icondir!$kde_icondir$ac_delim +kde_sounddir!$kde_sounddir$ac_delim +kde_datadir!$kde_datadir$ac_delim +kde_locale!$kde_locale$ac_delim +kde_confdir!$kde_confdir$ac_delim +kde_kcfgdir!$kde_kcfgdir$ac_delim +kde_mimedir!$kde_mimedir$ac_delim +kde_wallpaperdir!$kde_wallpaperdir$ac_delim +kde_bindir!$kde_bindir$ac_delim +xdg_appsdir!$xdg_appsdir$ac_delim +xdg_menudir!$xdg_menudir$ac_delim +xdg_directorydir!$xdg_directorydir$ac_delim +kde_templatesdir!$kde_templatesdir$ac_delim +kde_servicesdir!$kde_servicesdir$ac_delim +kde_servicetypesdir!$kde_servicetypesdir$ac_delim +kde_moduledir!$kde_moduledir$ac_delim +kdeinitdir!$kdeinitdir$ac_delim +kde_styledir!$kde_styledir$ac_delim +kde_widgetdir!$kde_widgetdir$ac_delim +LIB_KDED!$LIB_KDED$ac_delim +LIB_KDECORE!$LIB_KDECORE$ac_delim +LIB_KDEUI!$LIB_KDEUI$ac_delim +LIB_KIO!$LIB_KIO$ac_delim +LIB_KJS!$LIB_KJS$ac_delim +LIB_SMB!$LIB_SMB$ac_delim +LIB_KAB!$LIB_KAB$ac_delim +LIB_KABC!$LIB_KABC$ac_delim +LIB_KHTML!$LIB_KHTML$ac_delim +LIB_KSPELL!$LIB_KSPELL$ac_delim +LIB_KPARTS!$LIB_KPARTS$ac_delim +LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim +LIB_KUTILS!$LIB_KUTILS$ac_delim +LIB_KDEPIM!$LIB_KDEPIM$ac_delim +LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim +LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim +LIB_KDNSSD!$LIB_KDNSSD$ac_delim +LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim +LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim +LIB_KFILE!$LIB_KFILE$ac_delim +LIB_KFM!$LIB_KFM$ac_delim +LIB_ARTS!$LIB_ARTS$ac_delim +QTDOCDIR!$QTDOCDIR$ac_delim +KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim +DOXYGEN!$DOXYGEN$ac_delim +DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim +DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim +KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim +LIB_KIMIFACE!$LIB_KIMIFACE$ac_delim +LIB_XSS!$LIB_XSS$ac_delim +TOPSUBDIRS!$TOPSUBDIRS$ac_delim +doc_SUBDIR_included_TRUE!$doc_SUBDIR_included_TRUE$ac_delim +doc_SUBDIR_included_FALSE!$doc_SUBDIR_included_FALSE$ac_delim +konversation_SUBDIR_included_TRUE!$konversation_SUBDIR_included_TRUE$ac_delim +konversation_SUBDIR_included_FALSE!$konversation_SUBDIR_included_FALSE$ac_delim +po_SUBDIR_included_TRUE!$po_SUBDIR_included_TRUE$ac_delim +po_SUBDIR_included_FALSE!$po_SUBDIR_included_FALSE$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 68; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof +_ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; +fi # test -n "$CONFIG_FILES" + + +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; esac - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + case $ac_mode in + :F) + # + # CONFIG_FILE + # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac _ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub @@ -34466,387 +35587,175 @@ cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + rm -f "$tmp/stdin" case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; esac - - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - + ;; + :H) + # + # CONFIG_HEADER + # _ACEOF -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' -# This sed command replaces #undef with comments. This is necessary, for +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines + +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines + +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null +while : do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def +_ACEOF + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break rm -f conftest.defines mv conftest.tail conftest.defines done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs +rm -f conftest.defines conftest.tail +echo "ac_result=$ac_in" >>$CONFIG_STATUS cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - rm -f $ac_file - mv $tmp/config.h $ac_file + mv "$tmp/config.h" $ac_file fi else - cat $tmp/config.h - rm -f $tmp/config.h + echo "/* $configure_input */" + cat "$ac_result" fi + rm -f "$tmp/out12" # Compute $ac_file's index in $config_headers. +_am_arg=$ac_file _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X$ac_file | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'`/stamp-h$_am_stamp_count -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. @@ -34854,20 +35763,32 @@ # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then - dirpart=`(dirname "$mf") 2>/dev/null || + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$mf" : 'X\(/\)' \| . 2>/dev/null || echo X"$mf" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` else continue fi @@ -34889,53 +35810,79 @@ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue - fdir=`(dirname "$file") 2>/dev/null || + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$file" : 'X\(/\)' \| . 2>/dev/null || echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p $dirpart/$fdir - else - as_dir=$dirpart/$fdir + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir=$dirpart/$fdir + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 -echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done done ;; + esac -done -_ACEOF +done # for ac_tag -cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/configure.in /tmp/ZeUXpSU1gs/konversation-1.1/configure.in --- konversation-1.0.1/configure.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/configure.in 2008-08-06 16:57:48.000000000 +0100 @@ -40,7 +40,7 @@ AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(konversation, 1.0.1) dnl searches for some needed programs +AM_INIT_AUTOMAKE(konversation, 1.1) dnl searches for some needed programs KDE_SET_PREFIX @@ -78,6 +78,9 @@ dnl FILE: ./konversation/configure.in.in dnl ======================================================= +#MIN_CONFIG(3.2) +CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" + KDE_CHECK_HEADER(knotifyclient.h, [ AC_DEFINE(USE_KNOTIFY, 1, [Define if you have KNotify] ) @@ -90,6 +93,39 @@ LIB_KIMIFACE="-lkimproxy" AC_SUBST(LIB_KIMIFACE) ]) + +# Check for XScreenSaver +AC_CHECK_HEADERS(tgmath.h)xss_save_ldflags="$LDFLAGS" +LDFLAGS="$X_LDFLAGS" + +LIB_XSS= + +KDE_CHECK_HEADER(X11/extensions/scrnsaver.h, + [ + AC_CHECK_LIB(Xext,XScreenSaverQueryInfo, + [ + AC_DEFINE(HAVE_XSCREENSAVER, 1, [Define if you have the XScreenSaver extension]) + LIB_XSS="-lXext" + ], + [ + ld_shared_flag= + KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"]) + AC_CHECK_LIB(Xss,XScreenSaverQueryInfo, + [ + AC_DEFINE(HAVE_XSCREENSAVER, 1, [Define if you have the XScreenSaver extension]) + LIB_XSS="-lXss" + ], + [], + [ $ld_shared_flag $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ]) + ], + [ $X_PRE_LIBS -lX11 $X_EXTRA_LIBS ]) + ], [], + [ + #include + ] ) + +AC_SUBST(LIB_XSS) +LDFLAGS="$xss_save_ldflags" KDE_CREATE_SUBDIRSLIST AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes) AM_CONDITIONAL(konversation_SUBDIR_included, test "x$konversation_SUBDIR_included" = xyes) @@ -101,7 +137,6 @@ AC_CONFIG_FILES([ doc/et/Makefile ]) AC_CONFIG_FILES([ doc/it/Makefile ]) AC_CONFIG_FILES([ doc/konversation/Makefile ]) -AC_CONFIG_FILES([ doc/nl/Makefile ]) AC_CONFIG_FILES([ doc/pt/Makefile ]) AC_CONFIG_FILES([ doc/ru/Makefile ]) AC_CONFIG_FILES([ doc/sv/Makefile ]) @@ -113,6 +148,7 @@ AC_CONFIG_FILES([ konversation/images/nickicons/christmas/Makefile ]) AC_CONFIG_FILES([ konversation/images/nickicons/classic/Makefile ]) AC_CONFIG_FILES([ konversation/images/nickicons/default/Makefile ]) +AC_CONFIG_FILES([ konversation/images/nickicons/oxygen/Makefile ]) AC_CONFIG_FILES([ konversation/images/nickicons/smiling/Makefile ]) AC_CONFIG_FILES([ konversation/images/nickicons/square/Makefile ]) AC_CONFIG_FILES([ konversation/scripts/Makefile ]) @@ -124,7 +160,6 @@ AC_CONFIG_FILES([ po/ar/Makefile ]) AC_CONFIG_FILES([ po/bg/Makefile ]) AC_CONFIG_FILES([ po/ca/Makefile ]) -AC_CONFIG_FILES([ po/cs/Makefile ]) AC_CONFIG_FILES([ po/da/Makefile ]) AC_CONFIG_FILES([ po/de/Makefile ]) AC_CONFIG_FILES([ po/el/Makefile ]) @@ -140,17 +175,14 @@ AC_CONFIG_FILES([ po/ja/Makefile ]) AC_CONFIG_FILES([ po/ka/Makefile ]) AC_CONFIG_FILES([ po/ko/Makefile ]) -AC_CONFIG_FILES([ po/lt/Makefile ]) -AC_CONFIG_FILES([ po/nl/Makefile ]) AC_CONFIG_FILES([ po/pa/Makefile ]) AC_CONFIG_FILES([ po/pt/Makefile ]) -AC_CONFIG_FILES([ po/pt_BR/Makefile ]) AC_CONFIG_FILES([ po/ru/Makefile ]) AC_CONFIG_FILES([ po/sr/Makefile ]) AC_CONFIG_FILES([ po/sr@Latn/Makefile ]) AC_CONFIG_FILES([ po/sv/Makefile ]) -AC_CONFIG_FILES([ po/ta/Makefile ]) AC_CONFIG_FILES([ po/tr/Makefile ]) +AC_CONFIG_FILES([ po/zh_CN/Makefile ]) AC_CONFIG_FILES([ po/zh_TW/Makefile ]) AC_OUTPUT # Check if KDE_SET_PREFIX was called, and --prefix was passed to configure diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/debian/changelog /tmp/ZeUXpSU1gs/konversation-1.1/debian/changelog --- konversation-1.0.1/debian/changelog 2008-08-13 23:12:10.000000000 +0100 +++ konversation-1.1/debian/changelog 2008-08-13 23:12:10.000000000 +0100 @@ -1,3 +1,11 @@ +konversation (1.1-0ubuntu1) intrepid; urgency=low + + * New upstream release (LP: #256733) + * Bump Standards-Version up to 3.8.0 + * Added po/*/konversation.gmo to the build clean target + + -- Jonathan Thomas (The man) Sun, 10 Aug 2008 17:19:20 -0400 + konversation (1.0.1-6ubuntu1) intrepid; urgency=low * Merge with Debian, remaining change just the .orig md5sum, closes LP: #226180 diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/debian/control /tmp/ZeUXpSU1gs/konversation-1.1/debian/control --- konversation-1.0.1/debian/control 2008-08-13 23:12:10.000000000 +0100 +++ konversation-1.1/debian/control 2008-08-13 23:12:10.000000000 +0100 @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Modestas Vainius Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.27-3), kdelibs4-dev, xsltproc, docbook-xsl, libxi-dev, quilt (>= 0.40), autotools-dev -Standards-Version: 3.7.3.0 +Standards-Version: 3.8.0 DM-Upload-Allowed: yes Homepage: http://konversation.kde.org/ diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/debian/konversation.install /tmp/ZeUXpSU1gs/konversation-1.1/debian/konversation.install --- konversation-1.0.1/debian/konversation.install 2008-08-13 23:12:10.000000000 +0100 +++ konversation-1.1/debian/konversation.install 2008-08-13 23:12:10.000000000 +0100 @@ -1,5 +1,4 @@ debian/tmp/usr/bin/konversation -debian/tmp/usr/bin/konversationircprotocolhandler debian/tmp/usr/share/applications/kde/konversation.desktop debian/tmp/usr/share/apps/kconf_update/* debian/tmp/usr/share/apps/konversation/eventsrc @@ -12,7 +11,6 @@ debian/tmp/usr/share/doc/kde/HTML/es/konversation/* debian/tmp/usr/share/doc/kde/HTML/et/konversation/* debian/tmp/usr/share/doc/kde/HTML/it/konversation/* -debian/tmp/usr/share/doc/kde/HTML/nl/konversation/* debian/tmp/usr/share/doc/kde/HTML/pt/konversation/* debian/tmp/usr/share/doc/kde/HTML/ru/konversation/* debian/tmp/usr/share/doc/kde/HTML/sv/konversation/* diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/debian/patches/01_libtool_update.diff /tmp/ZeUXpSU1gs/konversation-1.1/debian/patches/01_libtool_update.diff --- konversation-1.0.1/debian/patches/01_libtool_update.diff 2008-08-13 23:12:10.000000000 +0100 +++ konversation-1.1/debian/patches/01_libtool_update.diff 2008-08-13 23:12:10.000000000 +0100 @@ -844,7 +844,7 @@ - libsuff= - if test "x$LINUX_64_MODE" = x64; then - # Some platforms are per default 64-bit, so there's no /lib64 -- if test -d /lib64; then +- if test -d /lib64 -a ! -h /lib64; then - libsuff=64 - fi - fi diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/debian/patches/06_fix_relibtoolization.diff /tmp/ZeUXpSU1gs/konversation-1.1/debian/patches/06_fix_relibtoolization.diff --- konversation-1.0.1/debian/patches/06_fix_relibtoolization.diff 2008-08-13 23:12:10.000000000 +0100 +++ konversation-1.1/debian/patches/06_fix_relibtoolization.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/config/Makefile.am konversation-1.0.1.n/konversation/src/config/Makefile.am ---- konversation-1.0.1/konversation/src/config/Makefile.am 2006-10-06 19:43:29.000000000 +0300 -+++ konversation-1.0.1.n/konversation/src/config/Makefile.am 2007-07-17 01:53:53.000000000 +0300 -@@ -4,6 +4,5 @@ - noinst_LTLIBRARIES = libkonversationconfig.la - libkonversationconfig_la_SOURCES = preferences_base.kcfgc preferences.cpp - libkonversationconfig_la_LDFLAGS = $(all_libraries) -no-undefined --libkonversationconfig_la_LIBADD = $(LIB_KDEUI) - - kde_kcfg_DATA = konversation.kcfg -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/linkaddressbook/Makefile.am konversation-1.0.1.n/konversation/src/linkaddressbook/Makefile.am ---- konversation-1.0.1/konversation/src/linkaddressbook/Makefile.am 2006-10-06 19:43:29.000000000 +0300 -+++ konversation-1.0.1.n/konversation/src/linkaddressbook/Makefile.am 2007-07-17 01:54:04.000000000 +0300 -@@ -9,6 +9,5 @@ - liblinkaddressbookui_la_SOURCES = linkaddressbookui_base.ui linkaddressbookui.cpp addressbook_base.cpp addressbook.cpp nicklisttooltip.cpp nicksonlinetooltip.cpp kimiface.skel addresseeitem.cpp - kimiface_DIR = $(kde_includes) - liblinkaddressbookui_la_LDFLAGS = $(all_libraries) -no-undefined --liblinkaddressbookui_la_LIBADD = $(COMPAT_LIBS) $(LIB_KDEUI) $(LIB_KABC) - - # vim: set noet: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/debian/patches/10_debian_channel.diff /tmp/ZeUXpSU1gs/konversation-1.1/debian/patches/10_debian_channel.diff --- konversation-1.0.1/debian/patches/10_debian_channel.diff 2008-08-13 23:12:10.000000000 +0100 +++ konversation-1.1/debian/patches/10_debian_channel.diff 2008-08-13 23:12:10.000000000 +0100 @@ -1,15 +1,16 @@ diff -Nur konversation-1.0/konversation/src/config/preferences.cpp konversation-1.0.new/konversation/src/config/preferences.cpp --- konversation-1.0/konversation/src/config/preferences.cpp 2006-09-09 10:48:46.000000000 +0200 +++ konversation-1.0.new/konversation/src/config/preferences.cpp 2006-09-09 10:49:56.000000000 +0200 -@@ -73,13 +73,14 @@ - setAwayMessage("/me is away: %s"); - setUnAwayMessage("/me is back."); +@@ -69,14 +69,14 @@ + mIdentity->setNicknameList(nickList); + Konversation::ServerGroupSettingsPtr serverGroup = new Konversation::ServerGroupSettings; - serverGroup->setName("Freenode"); + serverGroup->setName("Debian IRC"); Konversation::ServerSettings server; -- server.setServer("irc.freenode.org"); -+ server.setServer("irc.debian.org"); +- server.setHost("irc.freenode.org"); +- server.setPort(8001); ++ server.setHost("irc.debian.org"); + server.setPort(7000); serverGroup->addServer(server); serverGroup->setIdentityId(mIdentity->id()); @@ -18,4 +19,4 @@ + channel.setName("#debian"); serverGroup->addChannel(channel); serverGroup->setExpanded(false); - mServerGroupList.append(serverGroup); + addServerGroup(serverGroup); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/debian/patches/12_dbug405384_dccsendfile.diff /tmp/ZeUXpSU1gs/konversation-1.1/debian/patches/12_dbug405384_dccsendfile.diff --- konversation-1.0.1/debian/patches/12_dbug405384_dccsendfile.diff 2008-08-13 23:12:10.000000000 +0100 +++ konversation-1.1/debian/patches/12_dbug405384_dccsendfile.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/server.cpp konversation-1.0.1.n/konversation/src/server.cpp ---- konversation-1.0.1/konversation/src/server.cpp 2006-10-06 19:43:29.000000000 +0300 -+++ konversation-1.0.1.n/konversation/src/server.cpp 2007-07-21 13:39:41.000000000 +0300 -@@ -1817,7 +1817,7 @@ - if(!recipient.isEmpty()) - { - KURL::List fileURLs=KFileDialog::getOpenURLs( -- lastDccDir, -+ ":lastDccDir", - QString::null, - getViewContainer()->getWindow(), - i18n("Select File(s) to Send to %1").arg(recipient) -@@ -1825,7 +1825,6 @@ - KURL::List::iterator it; - for ( it = fileURLs.begin() ; it != fileURLs.end() ; ++it ) - { -- lastDccDir = (*it).directory(); - addDccSend( recipient, *it ); - } - } -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/server.h konversation-1.0.1.n/konversation/src/server.h ---- konversation-1.0.1/konversation/src/server.h 2006-10-06 19:43:29.000000000 +0300 -+++ konversation-1.0.1.n/konversation/src/server.h 2007-07-21 13:39:06.000000000 +0300 -@@ -608,7 +608,6 @@ - QString m_loweredNickname; - QString ownIpByUserhost; // RPL_USERHOST - QString ownIpByWelcome; // RPL_WELCOME -- QString lastDccDir; - - QPtrList channelList; - QPtrList queryList; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/debian/patches/13_dbug412894_lowercase_nick.diff /tmp/ZeUXpSU1gs/konversation-1.1/debian/patches/13_dbug412894_lowercase_nick.diff --- konversation-1.0.1/debian/patches/13_dbug412894_lowercase_nick.diff 2008-08-13 23:12:10.000000000 +0100 +++ konversation-1.1/debian/patches/13_dbug412894_lowercase_nick.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ ---- konversation-1.0.1/konversation/src/server.cpp 2007-07-21 13:45:46.000000000 +0300 -+++ konversation-1.0.1.n/konversation/src/server.cpp 2007-07-22 17:45:56.000000000 +0300 -@@ -1666,7 +1666,7 @@ - // is deleted altogether in that case. - QString lcNickname = name.lower(); - m_queryNicks.remove(lcNickname); -- if (!isWatchedNick(nickname)) deleteNickIfUnlisted(nickname); -+ if (!isWatchedNick(name)) deleteNickIfUnlisted(name); - } - - void Server::closeChannel(const QString& name) -@@ -2432,7 +2432,7 @@ - * @param nickname The nickname to be deleted. Case insensitive. - * @return True if the nickname is deleted. - */ --bool Server::deleteNickIfUnlisted(QString &nickname) -+bool Server::deleteNickIfUnlisted(const QString &nickname) - { - // Don't delete our own nickinfo. - if (nickname == getNickname()) return false; -@@ -2556,7 +2556,7 @@ - // Remove the unwatched nickname from the unjoined channel. - channel->remove(member); - // If the nick is no longer listed in any channels or query list, delete it altogether. -- deleteNickIfUnlisted(lcNickname); -+ deleteNickIfUnlisted(member.data()->getNickInfo()->getNickname()); - member = channel->begin(); - } - else ---- konversation-1.0.1/konversation/src/server.h 2007-07-21 13:45:46.000000000 +0300 -+++ konversation-1.0.1.n/konversation/src/server.h 2007-07-22 17:44:58.000000000 +0300 -@@ -529,7 +529,7 @@ - * @param nickname The nickname to be deleted. Case insensitive. - * @return True if the nickname is deleted. - */ -- bool deleteNickIfUnlisted(QString &nickname); -+ bool deleteNickIfUnlisted(const QString &nickname); - /** - * If not already offline, changes a nick to the offline state. - * Removes it from all channels on the joined and unjoined lists. diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/debian/patches/14_dbug412803_assert_crash.diff /tmp/ZeUXpSU1gs/konversation-1.1/debian/patches/14_dbug412803_assert_crash.diff --- konversation-1.0.1/debian/patches/14_dbug412803_assert_crash.diff 2008-08-13 23:12:10.000000000 +0100 +++ konversation-1.1/debian/patches/14_dbug412803_assert_crash.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ ---- konversation-1.0.1/konversation/src/viewcontainer.cpp 2006-10-06 19:43:29.000000000 +0300 -+++ konversation-1.0.1.n/konversation/src/viewcontainer.cpp 2007-07-23 15:07:32.000000000 +0300 -@@ -1756,12 +1756,17 @@ - - void ViewContainer::appendToFrontmost(const QString& type,const QString& message,ChatWindow* serverView, bool parseURL) - { -- if (!serverView) serverView = m_frontView->getServer()->getStatusView(); -- -- //if this fails, we need to fix frontServer -- Q_ASSERT(m_frontView && m_frontView->getServer() == m_frontServer); -+ if (!serverView) { // e.g. DCOP info call -+ if (m_frontView) // m_frontView == NULL if canBeFrontView() == false for active ChatWindow -+ serverView = m_frontView->getServer()->getStatusView(); -+ else if (m_frontServer) // m_fronView == NULL && m_frontServer != NULL if ChannelListPanel is active. -+ serverView = m_frontServer->getStatusView(); -+ } - -- Q_ASSERT(serverView); if(!serverView) return; -+ // This might happen if canBeFrontView() is false for active ChatWindow -+ // and the view does not belong to any server (e.g. DCC Status View). -+ // Discard message in this case. -+ if(!serverView) return; - - updateFrontView(); - diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/debian/patches/15_CVE-2007-4400.diff /tmp/ZeUXpSU1gs/konversation-1.1/debian/patches/15_CVE-2007-4400.diff --- konversation-1.0.1/debian/patches/15_CVE-2007-4400.diff 2008-08-13 23:12:10.000000000 +0100 +++ konversation-1.1/debian/patches/15_CVE-2007-4400.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -diff -u trunk/extragear/network/konversation/src/konvdcop.cpp trunk/extragear/network/konversation/src/konvdcop.cpp ---- konversation-1.0.1/konversation/src/konvdcop.cpp (revision 602433) -+++ konversation-1.0.1/konversation/src/konvdcop.cpp (revision 602435) -@@ -82,15 +82,23 @@ - emit dcopMultiServerRaw("me " + message); - } - --void KonvDCOP::say(const QString& server,const QString& target,const QString& command) -+void KonvDCOP::say(const QString& _server,const QString& _target,const QString& _command) - { -+ //Sadly, copy on write doesn't exist with QString::replace -+ QString server(_server), target(_target), command(_command); -+ - // TODO: this just masks a greater problem - Server::addQuery will return a query for '' --argonel - // TODO: other DCOP calls need argument checking too --argonel - if (server.isEmpty() || target.isEmpty() || command.isEmpty()) - kdDebug() << "KonvDCOP::say() requires 3 arguments." << endl; - else - { -- kdDebug() << "KonvDCOP::say()" << endl; -+ command.replace('\n',"\\n"); -+ command.replace('\r',"\\r"); -+ target.remove('\n'); -+ target.remove('\r'); -+ server.remove('\n'); -+ server.remove('\r'); - // Act as if the user typed it - emit dcopSay(server,target,command); - } ---- konversation-1.0.1/konversation/src/channel.cpp (revision 602432) -+++ konversation-1.0.1/konversation/src/channel.cpp (revision 602433) -@@ -890,7 +890,7 @@ - } - - // Send all strings, one after another -- QStringList outList=QStringList::split('\n',outputAll); -+ QStringList outList=QStringList::split(QRegExp("[\r\n]+"),outputAll); - for(unsigned int index=0;indexshow(); - -- if (Preferences::showServerList()) mainWindow->openServerList(); -+ bool openServerList = Preferences::showServerList(); - - // handle autoconnect on startup - Konversation::ServerGroupList serverGroups = Preferences::serverGroupList(); -@@ -135,12 +135,18 @@ - { - for (Konversation::ServerGroupList::iterator it = serverGroups.begin(); it != serverGroups.end(); ++it) - { -- if ((*it)->autoConnectEnabled()) connectToServer((*it)->id()); -+ if ((*it)->autoConnectEnabled()) -+ { -+ openServerList = false; -+ connectToServer((*it)->id()); -+ } - } - } - else - quickConnectToServer(m_hostName, m_port, m_channel, m_nick, m_password, m_useSSL); - -+ if (openServerList) mainWindow->openServerList(); -+ - // prepare dcop interface - dcopObject = new KonvDCOP; - kapp->dcopClient()->setDefaultObject(dcopObject->objId()); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/debian/patches/98_buildprep.diff /tmp/ZeUXpSU1gs/konversation-1.1/debian/patches/98_buildprep.diff --- konversation-1.0.1/debian/patches/98_buildprep.diff 2008-08-13 23:12:10.000000000 +0100 +++ konversation-1.1/debian/patches/98_buildprep.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,44868 +0,0 @@ -diff -uNr -x debian -x .pc konversation-1.0.1/acinclude.m4 konversation-1.0.1.n/acinclude.m4 ---- konversation-1.0.1/acinclude.m4 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/acinclude.m4 2007-07-17 02:59:47.000000000 +0300 -@@ -1689,15 +1689,6 @@ - KDE_USE_CLOSURE_TRUE="#" - KDE_USE_CLOSURE_FALSE="" - KDE_NO_UNDEFINED="" -- case $host in -- *-*-linux-gnu) -- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], -- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], -- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], -- [KDE_NO_UNDEFINED=""])], -- [KDE_NO_UNDEFINED=""]) -- ;; -- esac - fi - AC_SUBST(KDE_USE_CLOSURE_TRUE) - AC_SUBST(KDE_USE_CLOSURE_FALSE) -@@ -2144,9 +2135,6 @@ - save_CXXFLAGS="$CXXFLAGS" - kde_safe_LIBS="$LIBS" - LIBS="$LIBS $X_EXTRA_LIBS" --if test "$GXX" = "yes"; then --CXXFLAGS="$CXXFLAGS -pedantic-errors" --fi - AC_TRY_COMPILE([ - $2 - ], -@@ -5970,30 +5958,15 @@ - fi - ]) - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- --## Copyright 1996, 1997, 1998, 1999, 2000, 2001 -+## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 - ## Free Software Foundation, Inc. - ## Originally by Gordon Matzigkeit , 1996 - ## --## This program is free software; you can redistribute it and/or modify --## it under the terms of the GNU General Public License as published by --## the Free Software Foundation; either version 2 of the License, or --## (at your option) any later version. --## --## This program is distributed in the hope that it will be useful, but --## WITHOUT ANY WARRANTY; without even the implied warranty of --## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --## General Public License for more details. --## --## You should have received a copy of the GNU General Public License --## along with this program; if not, write to the Free Software --## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --## --## As a special exception to the GNU General Public License, if you --## distribute this file as part of a program that contains a --## configuration script generated by Autoconf, you may include it under --## the same distribution terms that you use for the rest of that program. -+## This file is free software; the Free Software Foundation gives -+## unlimited permission to copy and/or distribute it, with or without -+## modifications, as long as this notice is preserved. - --# serial 47 AC_PROG_LIBTOOL -+# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL - - - # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -6053,7 +6026,7 @@ - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' - AC_SUBST(LIBTOOL)dnl - - # Prevent multiple expansion -@@ -6103,7 +6076,7 @@ - - # Sed substitution that helps us do robust quoting. It backslashifies - # metacharacters that are still active within double-quoted strings. --Xsed='sed -e s/^X//' -+Xsed='sed -e 1s/^X//' - [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] - - # Same as above, but do not quote variable references. -@@ -6123,7 +6096,7 @@ - default_ofile=libtool - can_build_shared=yes - --# All known linkers require a `.a' archive for static linking (except M$VC, -+# All known linkers require a `.a' archive for static linking (except MSVC, - # which needs '.lib'). - libext=a - ltmain="$ac_aux_dir/ltmain.sh" -@@ -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" -@@ -6155,22 +6129,24 @@ - test -z "$ac_objext" && ac_objext=o - - # Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' - old_postinstall_cmds='chmod 644 $oldlib' - old_postuninstall_cmds= - - 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 - -+_LT_CC_BASENAME([$compiler]) -+ - # Only perform the check for file, if the check method requires it - case $deplibs_check_method in - file_magic*) -@@ -6211,11 +6187,58 @@ - # 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 - - -+# _LT_CC_BASENAME(CC) -+# ------------------- -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+AC_DEFUN([_LT_CC_BASENAME], -+[for cc_temp in $1""; do -+ case $cc_temp in -+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+]) -+ -+ -+# _LT_COMPILER_BOILERPLATE -+# ------------------------ -+# Check for compiler boilerplate output or warnings with -+# the simple compiler test code. -+AC_DEFUN([_LT_COMPILER_BOILERPLATE], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$rm conftest* -+])# _LT_COMPILER_BOILERPLATE -+ -+ -+# _LT_LINKER_BOILERPLATE -+# ---------------------- -+# Check for linker boilerplate output or warnings with -+# the simple link test code. -+AC_DEFUN([_LT_LINKER_BOILERPLATE], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+])# _LT_LINKER_BOILERPLATE -+ -+ - # _LT_AC_SYS_LIBPATH_AIX - # ---------------------- - # Links a minimal program and checks the executable -@@ -6225,12 +6248,20 @@ - # If we don't find anything, use the default library path according - # to the aix ld manual. - AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], --[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi],[]) -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi],[]) - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - ])# _LT_AC_SYS_LIBPATH_AIX - -@@ -6288,15 +6319,15 @@ - - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. --if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - if test -z "$ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if (echo_test_string="`eval $cmd`") 2>/dev/null && -- echo_test_string="`eval $cmd`" && -+ if (echo_test_string=`eval $cmd`) 2>/dev/null && -+ echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break -@@ -6461,18 +6492,21 @@ - rm -rf conftest* - ;; - --x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then -- case "`/usr/bin/file conftest.o`" in -+ case `/usr/bin/file conftest.o` in - *32-bit*) -- LINUX_64_MODE="32" - case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; -- ppc64-*linux*) -+ ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) -@@ -6484,8 +6518,10 @@ - esac - ;; - *64-bit*) -- LINUX_64_MODE="64" - case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; -@@ -6518,6 +6554,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) -@@ -6541,7 +6593,7 @@ - AC_CACHE_CHECK([$1], [$2], - [$2=no - ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -6549,7 +6601,7 @@ - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -@@ -6559,8 +6611,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 -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 -@@ -6580,17 +6634,23 @@ - # ------------------------------------------------------------ - # Check whether the given compiler option works - AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], --[AC_CACHE_CHECK([$1], [$2], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $3" -- printf "$lt_simple_link_test_code" > conftest.$ac_ext -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -- # The compiler can only warn and ignore the option if not recognized -+ # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&AS_MESSAGE_LOG_FD -+ $echo "X$_lt_linker_boilerplate" | $Xsed -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 -@@ -6614,7 +6674,7 @@ - AC_MSG_CHECKING([the maximum length of command line arguments]) - AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 -- testring="ABCD" -+ teststring="ABCD" - - case $build_os in - msdosdjgpp*) -@@ -6643,24 +6703,77 @@ - lt_cv_sys_max_cmd_len=8192; - ;; - -- *) -- # If test is not a shell built-in, we'll probably end up computing a -- # maximum length that is only half of the actual maximum length, but -- # we can't tell. -- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \ -- = "XX$testring") >/dev/null 2>&1 && -- new_result=`expr "X$testring" : ".*" 2>&1` && -- lt_cv_sys_max_cmd_len=$new_result && -- test $i != 17 # 1/2 MB should be enough -- do -- i=`expr $i + 1` -- testring=$testring$testring -- done -- testring= -- # 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. -- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ ;; -+ -+ 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 -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac -+ fi -+ ;; -+ 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 -+ ;; -+ *) -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ 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` -+ else -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ = "XX$teststring") >/dev/null 2>&1 && -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ teststring= -+ # 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. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ fi - ;; - esac - ]) -@@ -6673,7 +6786,7 @@ - - - # _LT_AC_CHECK_DLFCN --# -------------------- -+# ------------------ - AC_DEFUN([_LT_AC_CHECK_DLFCN], - [AC_CHECK_HEADERS(dlfcn.h)dnl - ])# _LT_AC_CHECK_DLFCN -@@ -6681,7 +6794,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 +6860,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 -- (./conftest; exit; ) 2>/dev/null -+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) $1 ;; - x$lt_dlneed_uscore) $2 ;; -- x$lt_unknown|x*) $3 ;; -+ x$lt_dlunknown|x*) $3 ;; - esac - else : - # compilation failed -@@ -6769,7 +6884,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 +6921,7 @@ - lt_cv_dlopen_self=yes - ]) - ;; -- -+ - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], -@@ -6840,7 +6955,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 +6968,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( -@@ -6885,7 +7000,8 @@ - # --------------------------------- - # Check to see if options -c and -o are simultaneously supported by compiler - AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], --[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl - AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no -@@ -6893,14 +7009,7 @@ - mkdir conftest - cd conftest - mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -- -- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers -- # that will create temporary files in the current directory regardless of -- # the output directory. Thus, making CWD read-only will cause this test -- # to fail, enabling locking or at least warning the user not to do parallel -- # builds. -- chmod -w . -+ echo "$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 -@@ -6908,7 +7017,7 @@ - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -@@ -6920,13 +7029,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 -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 -- chmod u+w . -- $rm conftest* out/* -- rmdir out -+ chmod u+w . 2>&AS_MESSAGE_LOG_FD -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* -@@ -6985,8 +7099,8 @@ - [AC_MSG_CHECKING([how to hardcode library paths into programs]) - _LT_AC_TAGVAR(hardcode_action, $1)= - if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ -- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ -- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then -+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \ -+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && -@@ -7035,6 +7149,7 @@ - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" -+ old_striplib="$STRIP -S" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -@@ -7043,7 +7158,7 @@ - *) - AC_MSG_RESULT([no]) - ;; -- esac -+ esac - fi - ])# AC_LIBTOOL_SYS_LIB_STRIP - -@@ -7052,11 +7167,12 @@ - # ----------------------------- - # PORTME Fill in your ld.so characteristics - AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], --[AC_MSG_CHECKING([dynamic linker characteristics]) -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_MSG_CHECKING([dynamic linker characteristics]) - library_names_spec= - libname_spec='lib$name' - soname_spec= --shrext=".so" -+shrext_cmds=".so" - postinstall_cmds= - postuninstall_cmds= - finish_cmds= -@@ -7066,7 +7182,58 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+m4_if($1,[],[ -+if test "$GCC" = yes; then -+ case $host_os in -+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -+ *) lt_awk_arg="/^libraries:/" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } -+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi]) - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -7131,7 +7298,7 @@ - amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - - beos*) -@@ -7140,7 +7307,7 @@ - shlibpath_var=LIBRARY_PATH - ;; - --bsdi4*) -+bsdi[[45]]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -7156,7 +7323,7 @@ - - cygwin* | mingw* | pw32*) - version_type=windows -- shrext=".dll" -+ shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - -@@ -7168,7 +7335,8 @@ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname' -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -@@ -7198,7 +7366,7 @@ - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; -@@ -7221,13 +7389,9 @@ - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH -- shrext='$(test .$module = .yes && echo .so || echo .dylib)' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ m4_if([$1], [],[ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -7244,20 +7408,17 @@ - dynamic_linker=no - ;; - --kfreebsd*-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' -- ;; -- --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[[123]]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -7275,14 +7436,19 @@ - freebsd2*) - shlibpath_overrides_runpath=yes - ;; -- freebsd3.[01]* | freebsdelf3.[01]*) -+ freebsd3.[[01]]* | freebsdelf3.[[01]]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -- *) # 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 - ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - esac - ;; - -@@ -7302,9 +7468,9 @@ - version_type=sunos - need_lib_prefix=no - need_version=no -- case "$host_cpu" in -+ case $host_cpu in - ia64*) -- shrext='.so' -+ shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH -@@ -7319,7 +7485,7 @@ - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) -- shrext='.sl' -+ shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -@@ -7330,7 +7496,7 @@ - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) -- shrext='.sl' -+ shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -@@ -7342,6 +7508,18 @@ - postinstall_cmds='chmod 555 $lib' - ;; - -+interix[[3-9]]*) -+ 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 +7563,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' -- libsuff= -- if test "x$LINUX_64_MODE" = x64; then -- # Some platforms are per default 64-bit, so there's no /lib64 -- if test -d /lib64; then -- libsuff=64 -- fi -- fi - 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 - -+ # 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>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;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, -@@ -7417,6 +7592,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -7426,7 +7613,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 -@@ -7454,8 +7641,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. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -@@ -7475,7 +7667,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' -@@ -7493,11 +7685,8 @@ - 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 -+rdos*) -+ dynamic_linker=no - ;; - - solaris*) -@@ -7525,7 +7714,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 +7747,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,13 +7783,19 @@ - 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 - - - # _LT_AC_TAGCONFIG - # ---------------- - AC_DEFUN([_LT_AC_TAGCONFIG], --[AC_ARG_WITH([tags], -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_ARG_WITH([tags], - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], - [include additional configurations @<:@automatic@:>@])], - [tagnames="$withval"]) -@@ -7595,6 +7813,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 +7842,9 @@ - - case $tagname in - CXX) -- if test -n "$CXX" && test "X$CXX" != "Xno"; then -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then - AC_LIBTOOL_LANG_CXX_CONFIG - else - tagname="" -@@ -7683,7 +7906,7 @@ - - # AC_LIBTOOL_WIN32_DLL - # -------------------- --# declare package support for building win32 dll's -+# declare package support for building win32 DLLs - AC_DEFUN([AC_LIBTOOL_WIN32_DLL], - [AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) - ])# AC_LIBTOOL_WIN32_DLL -@@ -7721,7 +7944,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) -@@ -7833,7 +8056,7 @@ - - # AC_PATH_TOOL_PREFIX - # ------------------- --# find a file program which can recognise shared library -+# find a file program which can recognize shared library - AC_DEFUN([AC_PATH_TOOL_PREFIX], - [AC_REQUIRE([AC_PROG_EGREP])dnl - AC_MSG_CHECKING([for $1]) -@@ -7857,7 +8080,7 @@ - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) -- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then -@@ -7896,7 +8119,7 @@ - - # AC_PATH_MAGIC - # ------------- --# find a file program which can recognise a shared library -+# find a file program which can recognize a shared library - AC_DEFUN([AC_PATH_MAGIC], - [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) - if test -z "$lt_cv_path_MAGIC_CMD"; then -@@ -7967,7 +8190,7 @@ - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some GNU ld's only accept -v. -+ # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ else -+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ fi - ;; - - darwin* | rhapsody*) -- # this will be overwritten by pass_all, but leave it in just in case -- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' -- lt_cv_file_magic_cmd='/usr/bin/file -L' -- case "$host_os" in -- rhapsody* | darwin1.[[012]]) -- lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System` -- ;; -- *) # Darwin 1.3 on -- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' -- ;; -- esac - lt_cv_deplibs_check_method=pass_all - ;; - --freebsd* | kfreebsd*-gnu) -+freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library' -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; -@@ -8112,7 +8342,7 @@ - - hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file -- case "$host_cpu" in -+ case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -@@ -8128,43 +8358,27 @@ - esac - ;; - -+interix[[3-9]]*) -+ # 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*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" -- ;; -- *) -- case $LD in -- *-32|*"-32 ") libmagic=32-bit;; -- *-n32|*"-n32 ") libmagic=N32;; -- *-64|*"-64 ") libmagic=64-bit;; -- *) libmagic=never-match;; -- esac -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1" -- ;; -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-n32|*"-n32 ") libmagic=N32;; -+ *-64|*"-64 ") libmagic=64-bit;; -+ *) libmagic=never-match;; - esac -- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` - lt_cv_deplibs_check_method=pass_all - ;; - - # This must be Linux ELF. --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 ;; -- # the debian people say, arm and glibc 2.3.1 works for them with pass_all -- arm* ) -- lt_cv_deplibs_check_method=pass_all ;; -- *) -- # glibc up to 2.1.1 does not perform some relocations on ARM -- 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) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else -@@ -8183,32 +8397,26 @@ - ;; - - openbsd*) -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object' -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' - else -- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - fi - ;; - - osf3* | osf4* | osf5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' -- lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - --sco3.2v5*) -+rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - - solaris*) - lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=/lib/libc.so - ;; - --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 +8437,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 +8463,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 +8531,13 @@ - # ----------------------------------- - # sets LIBLTDL to the link flags for the libltdl convenience library and - # LTDLINCL to the include flags for the libltdl header and adds --# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL --# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If --# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will --# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with --# '${top_srcdir}/' (note the single quotes!). If your package is not --# flat and you're not using automake, define top_builddir and --# top_srcdir appropriately in the Makefiles. -+# --enable-ltdl-convenience to the configure arguments. Note that -+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -+# it is assumed to be `libltdl'. LIBLTDL will be prefixed with -+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/' -+# (note the single quotes!). If your package is not flat and you're not -+# using automake, define top_builddir and top_srcdir appropriately in -+# the Makefiles. - AC_DEFUN([AC_LIBLTDL_CONVENIENCE], - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in -@@ -8338,13 +8556,13 @@ - # ----------------------------------- - # sets LIBLTDL to the link flags for the libltdl installable library and - # LTDLINCL to the include flags for the libltdl header and adds --# --enable-ltdl-install to the configure arguments. Note that LIBLTDL --# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If --# DIRECTORY is not provided and an installed libltdl is not found, it is --# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/' --# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single --# quotes!). If your package is not flat and you're not using automake, --# define top_builddir and top_srcdir appropriately in the Makefiles. -+# --enable-ltdl-install to the configure arguments. Note that -+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided, -+# and an installed libltdl is not found, it is assumed to be `libltdl'. -+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with -+# '${top_srcdir}/' (note the single quotes!). If your package is not -+# flat and you're not using automake, define top_builddir and top_srcdir -+# appropriately in the Makefiles. - # In the future, this macro may have to be called after AC_PROG_LIBTOOL. - AC_DEFUN([AC_LIBLTDL_INSTALLABLE], - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -@@ -8382,10 +8600,21 @@ - # --------------- - AC_DEFUN([_LT_AC_LANG_CXX], - [AC_REQUIRE([AC_PROG_CXX]) --AC_REQUIRE([AC_PROG_CXXCPP]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) - _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) - ])# _LT_AC_LANG_CXX - -+# _LT_AC_PROG_CXXCPP -+# ------------------ -+AC_DEFUN([_LT_AC_PROG_CXXCPP], -+[ -+AC_REQUIRE([AC_PROG_CXX]) -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_PROG_CXXCPP -+fi -+])# _LT_AC_PROG_CXXCPP - - # AC_LIBTOOL_F77 - # -------------- -@@ -8425,7 +8654,7 @@ - - - # AC_LIBTOOL_RC --# -------------- -+# ------------- - # enable support for Windows resource files - AC_DEFUN([AC_LIBTOOL_RC], - [AC_REQUIRE([LT_AC_PROG_RC]) -@@ -8451,43 +8680,16 @@ - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -+lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests --lt_simple_link_test_code='int main(){return(0);}\n' -+lt_simple_link_test_code='int main(){return(0);}' - - _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 - - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change -@@ -8501,9 +8703,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 +8714,7 @@ - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. --case "$host_os" in -+case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then -@@ -8521,48 +8723,11 @@ - fi - ;; - --aix4*) -+aix4* | aix5*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -- ;; -- darwin* | rhapsody*) -- if test "$GCC" = yes; then -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- case "$host_os" in -- rhapsody* | darwin1.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- ;; -- 10.*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac -- output_verbose_link_cmd='echo' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+ ;; - esac - AC_MSG_RESULT([$enable_shared]) - -@@ -8587,7 +8752,7 @@ - AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], - [AC_LANG_PUSH(C++) - AC_REQUIRE([AC_PROG_CXX]) --AC_REQUIRE([AC_PROG_CXXCPP]) -+AC_REQUIRE([_LT_AC_PROG_CXXCPP]) - - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(allow_undefined_flag, $1)= -@@ -8599,6 +8764,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,21 +8782,25 @@ - _LT_AC_TAGVAR(compiler_lib_search_path, $1)= - - # Source file extension for C++ test sources. --ac_ext=cc -+ac_ext=cpp - - # Object file extension for compiled C++ test sources. - objext=o - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -+lt_simple_compile_test_code="int some_variable = 0;" - - # 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); }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_AC_SYS_COMPILER - -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_LD=$LD -@@ -8641,18 +8811,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 --cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` -+_LT_CC_BASENAME([$compiler]) - - # We don't want -fno-exception wen compiling C++ code, so set the - # no_builtin_flag separately -@@ -8670,8 +8840,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 -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -@@ -8697,7 +8867,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. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists -@@ -8727,8 +8897,23 @@ - exp_sym_flag='-Bexport' - no_entry_flag="" - else -- # KDE requires run time linking. Make it the default. -- aix_use_runtimelinking=yes -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done -+ ;; -+ esac -+ - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi -@@ -8745,7 +8930,7 @@ - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes; then -- case $host_os in aix4.[012]|aix4.[012].*) -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` -@@ -8753,7 +8938,7 @@ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -@@ -8764,8 +8949,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 -+ shared_flag="$shared_flag "'${wl}-G' -+ fi - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -8774,15 +8963,16 @@ - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then -- shared_flag='-qmkshrobj ${wl}-G' -+ shared_flag='${wl}-G' - else -- shared_flag='-qmkshrobj' -+ shared_flag='${wl}-bM:SRE' - fi - fi - fi - -- # Let the compiler handle the export list. -- _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. -@@ -8791,13 +8981,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 '"\${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 '"\${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 -@@ -8806,16 +8995,26 @@ - # -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)='$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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach 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 - *) -@@ -8829,12 +9028,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' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - 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}--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 -@@ -8843,70 +9042,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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_AC_TAGVAR(hardcode_direct, $1)=no -+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - -- darwin* | rhapsody*) -- if test "$GXX" = yes; then -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- case "$host_os" in -- rhapsody* | darwin1.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- ;; -- 10.*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' -- ;; -- esac -+ if test "$GXX" = yes ; then -+ lt_int_apple_cc_single_mod=no -+ output_verbose_link_cmd='echo' -+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -+ lt_int_apple_cc_single_mod=yes - fi -- ;; -- esac -- lt_int_apple_cc_single_mod=no -- output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -- fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' -- fi -- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' -- -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' -- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -- ;; -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ else -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ fi -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ fi -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi -+ ;; - - dgux*) - case $cc_basename in -- ec++) -+ ec++*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- ghcx) -+ ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -8917,14 +9127,14 @@ - ;; - esac - ;; -- freebsd[12]*) -+ freebsd[[12]]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - freebsd-elf*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; -- freebsd* | kfreebsd*-gnu) -+ freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_AC_TAGVAR(ld_shlibs, $1)=yes -@@ -8941,12 +9151,12 @@ - # location of the library. - - case $cc_basename in -- CC) -+ CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- aCC) -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ aCC*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -@@ -8955,11 +9165,11 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -8969,33 +9179,20 @@ - ;; - 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_ld, $1)='+b $libdir' -- _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)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) ;; - *) -- _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*) -- _LT_AC_TAGVAR(hardcode_direct, $1)=no -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- ;; -- ia64*) -+ case $host_cpu in -+ hppa*64*|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 -@@ -9006,17 +9203,20 @@ - esac - - case $cc_basename in -- CC) -+ CC*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- aCC) -- case "$host_cpu" in -- 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*) -+ _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' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists -@@ -9032,12 +9232,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 -+ 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' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -9048,11 +9251,25 @@ - ;; - esac - ;; -+ interix[[3-9]]*) -+ _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) -+ CC*) - # SGI C++ -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is -@@ -9063,9 +9280,9 @@ - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -@@ -9074,16 +9291,16 @@ - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -@@ -9101,20 +9318,44 @@ - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; -- icpc) -+ icpc*) - # Intel C++ - with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; -- cxx) -+ pgCC*) -+ # Portland Group C++ compiler -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) - # Compaq C++ -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -@@ -9130,6 +9371,29 @@ - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ -+ # Not sure whether something based on -+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 -+ # would be better. -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ esac -+ ;; - esac - ;; - lynxos*) -@@ -9142,7 +9406,7 @@ - ;; - mvs*) - case $cc_basename in -- cxx) -+ cxx*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -@@ -9152,7 +9416,7 @@ - ;; - esac - ;; -- netbsd*) -+ 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= -@@ -9163,15 +9427,35 @@ - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; - osf3*) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -9181,14 +9465,14 @@ - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- cxx) -+ cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -9206,7 +9490,7 @@ - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -9225,13 +9509,13 @@ - ;; - osf4* | osf5*) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -9240,17 +9524,17 @@ - # the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- cxx) -+ cxx*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ - $rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -@@ -9269,7 +9553,7 @@ - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -9290,27 +9574,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) -- # 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) -+ CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -- lcc) -+ lcc*) - # Lucid - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -9323,36 +9594,28 @@ - ;; - solaris*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes - _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in -- solaris2.[0-5] | solaris2.[0-5].*) ;; -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) -- # The C++ compiler is used as linker so we must use $wl -- # flag to pass the commands to the underlying system -- # linker. -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' - ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is -@@ -9360,9 +9623,9 @@ - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; -- gcx) -+ gcx*) - # Green Hills C++ Compiler -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -@@ -9372,9 +9635,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 -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -9383,9 +9646,9 @@ - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' -+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -9394,16 +9657,73 @@ - fi - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac - fi - ;; - 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) -+ NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -9440,8 +9760,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 +9777,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 +9831,7 @@ - # The `*' in the case matches for architectures that use `case' in - # $output_verbose_cmd can trigger glob expansion during the loop - # eval without this substitution. -- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" -+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` - - for p in `eval $output_verbose_link_cmd`; do - case $p in -@@ -9553,7 +9871,7 @@ - fi - ;; - -- *.$objext|*.$libext) -+ *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then -@@ -9589,13 +9907,70 @@ - - $rm -f confest.$objext - -+# PORTME: override above test on systems where it is broken -+ifelse([$1],[CXX], -+[case $host_os in -+interix[[3-9]]*) -+ # 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)= -+ ;; -+ -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ # -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+ -+solaris*) -+ case $cc_basename in -+ CC*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ -+ # Adding this requires a known-good setup of shared libraries for -+ # Sun compiler versions before 5.6, else PIC objects from an old -+ # archive will be linked into the output, leading to subtle bugs. -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+esac -+]) -+ - case " $_LT_AC_TAGVAR(postdeps, $1) " in - *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; - esac - ])# 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'. -@@ -9631,20 +10006,31 @@ - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code=" subroutine t\n return\n end\n" -+lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" - - # Code to be used in simple link tests --lt_simple_link_test_code=" program t\n end\n" -+lt_simple_link_test_code="\ -+ program t -+ end -+" - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_AC_SYS_COMPILER - -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - CC=${F77-"f77"} - compiler=$CC - _LT_AC_TAGVAR(compiler, $1)=$CC --cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` -+_LT_CC_BASENAME([$compiler]) - - AC_MSG_CHECKING([if libtool supports shared libraries]) - AC_MSG_RESULT([$can_build_shared]) -@@ -9654,7 +10040,7 @@ - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. --case "$host_os" in -+case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then -@@ -9662,8 +10048,10 @@ - postinstall_cmds='$RANLIB $lib' - fi - ;; --aix4*) -- test "$enable_shared" = yes && enable_static=no -+aix4* | aix5*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi - ;; - esac - AC_MSG_RESULT([$enable_shared]) -@@ -9673,8 +10061,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 +10070,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) - -@@ -9711,23 +10095,30 @@ - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="class foo {}\n" -+lt_simple_compile_test_code="class foo {}" - - # Code to be used in simple link tests --lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' -+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' - - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_AC_SYS_COMPILER - -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - CC=${GCJ-"gcj"} - compiler=$CC - _LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) - - # GCJ did not exist at the time GCC didn't implicitly link libc in. - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - -+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+ - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly -@@ -9739,8 +10130,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 +10139,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'. -@@ -9766,7 +10155,7 @@ - _LT_AC_TAGVAR(objext, $1)=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - - # Code to be used in simple link tests - lt_simple_link_test_code="$lt_simple_compile_test_code" -@@ -9774,11 +10163,16 @@ - # ltmain only uses $CC for tagged configurations so make sure $CC is set. - _LT_AC_SYS_COMPILER - -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - CC=${RC-"windres"} - compiler=$CC - _LT_AC_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - - AC_LIBTOOL_CONFIG($1) -@@ -9804,11 +10198,12 @@ - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -- fi -+ 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 \ -+ 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 \ -@@ -9849,6 +10244,7 @@ - _LT_AC_TAGVAR(module_cmds, $1) \ - _LT_AC_TAGVAR(module_expsym_cmds, $1) \ - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ -+ _LT_AC_TAGVAR(fix_srcfile_path, $1) \ - _LT_AC_TAGVAR(exclude_expsyms, $1) \ - _LT_AC_TAGVAR(include_expsyms, $1); do - -@@ -9858,7 +10254,7 @@ - _LT_AC_TAGVAR(archive_cmds, $1) | \ - _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(module_cmds, $1) | \ -- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ -+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \ - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ - _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ -@@ -9895,7 +10291,7 @@ - # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 - # Free Software Foundation, Inc. - # - # This file is part of GNU Libtool: -@@ -9924,11 +10320,11 @@ - SED=$lt_SED - - # Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="$SED -e s/^X//" -+Xsed="$SED -e 1s/^X//" - - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. --if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - # The names of the tagged configurations supported by this script. - available_tags= -@@ -9959,6 +10355,12 @@ - # The host system. - host_alias=$host_alias - host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - - # An echo program that does not interpret backslashes. - echo=$lt_echo -@@ -9970,6 +10372,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 +10394,7 @@ - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -10020,7 +10425,7 @@ - libext="$libext" - - # Shared library suffix (normally ".so"). --shrext='$shrext' -+shrext_cmds='$shrext_cmds' - - # Executable file suffix (normally ""). - exeext="$exeext" -@@ -10035,7 +10440,7 @@ - # Does compiler simultaneously support -c and -o options? - compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -10211,7 +10616,7 @@ - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) -@@ -10264,7 +10669,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. -- test -f Makefile && make "$ltmain" -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi - ])# AC_LIBTOOL_CONFIG - -@@ -10291,6 +10699,7 @@ - # --------------------------------- - AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], - [AC_REQUIRE([AC_CANONICAL_HOST]) -+AC_REQUIRE([LT_AC_PROG_SED]) - AC_REQUIRE([AC_PROG_NM]) - AC_REQUIRE([AC_OBJEXT]) - # Check for command to grab the raw symbol name followed by C symbol from nm. -@@ -10306,9 +10715,6 @@ - # Regexp to match symbols that can be accessed directly from C. - sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' - --# Transform the above into a raw symbol and a C symbol. --symxfrm='\1 \2\3 \3' -- - # Transform an extracted symbol line into a proper C declaration - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - -@@ -10330,14 +10736,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* | 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'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ fi -+ ;; - irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; - osf*) - symcode='[[BCDEGQRST]]' - ;; --solaris* | sysv5*) -- symcode='[[BDT]]' -+solaris*) -+ symcode='[[BDRT]]' -+ ;; -+sco3.2v5*) -+ symcode='[[DT]]' -+ ;; -+sysv4.2uw2*) -+ symcode='[[DT]]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[[ABDT]]' - ;; - sysv4) - symcode='[[DFNSTU]]' -@@ -10355,14 +10777,17 @@ - # If we're using GNU nm, then use its standard symbol codes. - case `$NM -V 2>&1` in - *GNU* | *'with BFD'*) -- symcode='[[ABCDGISTW]]' ;; -+ symcode='[[ABCDGIRSTW]]' ;; - esac - - # Try without a prefix undercore, then with it. - for ac_symprfx in "" "_"; do - -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" -+ - # Write the raw and C identifiers. -- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -10501,12 +10926,14 @@ - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | os2* | pw32*) -+ mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) -@@ -10518,6 +10945,10 @@ - # DJGPP does not support shared libraries at all - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; -+ interix[[3-9]]*) -+ # 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 +10957,7 @@ - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - ;; - *) -@@ -10551,18 +10982,28 @@ - ;; - chorus*) - case $cc_basename in -- cxch68) -+ cxch68*) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; - dgux*) - case $cc_basename in -- ec++) -+ ec++*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; -- ghcx) -+ ghcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; -@@ -10570,22 +11011,22 @@ - ;; - esac - ;; -- freebsd* | kfreebsd*-gnu) -+ freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in -- CC) -+ CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" -+ _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 - ;; -- aCC) -+ aCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" -- case "$host_cpu" in -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -10598,9 +11039,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) -+ CC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. -@@ -10609,20 +11054,26 @@ - ;; - esac - ;; -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in -- KCC) -+ KCC*) - # KAI C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; -- icpc) -+ icpc* | ecpc*) - # Intel C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' -- ;; -- cxx) -+ ;; -+ pgCC*) -+ # Portland Group C++ compiler. -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. -@@ -10630,6 +11081,14 @@ - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ esac - ;; - esac - ;; -@@ -10639,25 +11098,25 @@ - ;; - mvs*) - case $cc_basename in -- cxx) -+ cxx*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -- KCC) -+ KCC*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; -- cxx) -+ cxx*) - # Digital/Compaq C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha -@@ -10671,24 +11130,15 @@ - ;; - psos*) - ;; -- sco*) -- case $cc_basename in -- CC) -- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -- ;; -- *) -- ;; -- esac -- ;; - solaris*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; -- gcx) -+ gcx*) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; -@@ -10698,12 +11148,12 @@ - ;; - sunos4*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.x - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; -- lcc) -+ lcc*) - # Lucid - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; -@@ -10713,7 +11163,7 @@ - ;; - tandem*) - case $cc_basename in -- NCC) -+ NCC*) - # NonStop-UX NCC 3.20 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; -@@ -10721,7 +11171,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*) - ;; -@@ -10752,13 +11209,15 @@ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - -@@ -10768,6 +11227,11 @@ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - -+ interix[[3-9]]*) -+ # 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 +11248,7 @@ - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -10810,8 +11274,18 @@ - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ esac -+ ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' -@@ -10821,7 +11295,7 @@ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -10844,18 +11318,41 @@ - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - -- linux*) -- case $CC in -+ linux* | k*bsd*-gnu) -+ case $cc_basename in - icc* | ecc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; - ccc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -10865,15 +11362,19 @@ - _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' -+ rdos*) -+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - solaris*) -- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; -+ *) -+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -+ esac - ;; - - sunos4*) -@@ -10882,7 +11383,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 +11396,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 -+ ;; -+ - uts4*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -10922,7 +11434,7 @@ - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -@@ -10931,6 +11443,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)=]) - ]) - - -@@ -10938,7 +11460,8 @@ - # ------------------------------------ - # See if the linker supports building shared libraries. - AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], --[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+[AC_REQUIRE([LT_AC_PROG_SED])dnl -+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) - ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -@@ -10955,7 +11478,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* | 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' -@@ -10981,7 +11507,7 @@ - _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown - _LT_AC_TAGVAR(hardcode_automatic, $1)=no - _LT_AC_TAGVAR(module_cmds, $1)= -- _LT_AC_TAGVAR(module_expsym_cmds, $1)= -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)= - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* -@@ -10998,7 +11524,8 @@ - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= -- -+ # Just being paranoid about ensuring that cc_basename is set. -+ _LT_CC_BASENAME([$compiler]) - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time -@@ -11008,6 +11535,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 +11549,27 @@ - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) -@@ -11055,7 +11607,7 @@ - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' -+ _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 -@@ -11065,13 +11617,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' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ _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 -@@ -11080,23 +11632,79 @@ - 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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ interix[[3-9]]*) -+ _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' -+ ;; -+ -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else -- ld_shlibs=no -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - -- netbsd*) -+ 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= - else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -- solaris* | sysv5*) -+ solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 -@@ -11110,13 +11718,40 @@ - - EOF - elif $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' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - -+ 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 +11761,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' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - -- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then -- runpath_var=LD_RUN_PATH -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -- fi -+ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then -+ runpath_var= -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) -@@ -11155,7 +11785,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 +11807,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 -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac - -- # KDE requires run time linking. Make it the default. -- aix_use_runtimelinking=yes - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi -@@ -11196,7 +11838,7 @@ - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GCC" = yes; then -- case $host_os in aix4.[012]|aix4.[012].*) -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` -@@ -11204,7 +11846,7 @@ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ : - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -@@ -11215,8 +11857,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 -+ shared_flag="$shared_flag "'${wl}-G' -+ fi - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -11224,30 +11870,30 @@ - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else -- 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 - -- # Let the compiler handle the export list. -- _LT_AC_TAGVAR(always_export_symbols, $1)=no -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes - 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. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. -- _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_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 '"\${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 '"\${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 -@@ -11256,13 +11902,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)='$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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; -@@ -11275,7 +11919,7 @@ - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - -- bsdi4*) -+ bsdi[[45]]*) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - -@@ -11285,69 +11929,69 @@ - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. -- shrext=".dll" -+ shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. -- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - - darwin* | rhapsody*) -- if test "$GXX" = yes ; then -- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- case "$host_os" in -- rhapsody* | darwin1.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.[012]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- ;; -- 10.*) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' -- ;; -- esac -- fi -- ;; -+ case $host_os in -+ rhapsody* | darwin1.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[[012]]) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; - esac -- lt_int_apple_cc_single_mod=no -- output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -- fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' -- else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' -- fi -- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience' -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes -- else -- _LT_AC_TAGVAR(ld_shlibs, $1)=no -- fi -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ fi - ;; - - dgux*) -@@ -11380,8 +12024,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* | 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 -@@ -11389,7 +12033,7 @@ - - hpux9*) - if test "$GCC" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi -@@ -11403,47 +12047,62 @@ - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - -- 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*) -+ _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' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - 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*) -+ _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' - ;; - *) -- _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*|ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -- _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 +12116,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' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -@@ -11467,7 +12126,7 @@ - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - -- netbsd*) -+ 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 -@@ -11487,23 +12146,28 @@ - ;; - - openbsd*) -- _LT_AC_TAGVAR(hardcode_direct, $1)=yes -- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ if test -f /usr/libexec/ld.so; then -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ else -+ case $host_os in -+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ ;; -+ *) -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi - else -- case $host_os in -- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- ;; -- esac -+ _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - -@@ -11511,14 +12175,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 -- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $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' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' -@@ -11530,13 +12194,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}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - 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 -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -@@ -11544,21 +12208,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 -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' -+ wlarc='${wl}' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else -+ wlarc='' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -@@ -11567,8 +12225,17 @@ - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -- *) # Supported since Solaris 2.6 (maybe 2.5.1?) -- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; -@@ -11577,7 +12244,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. -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -11625,36 +12292,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* | 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 -- 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,$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,$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' -+ -+ 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 +12348,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? - # -@@ -11696,14 +12367,15 @@ - # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $rm conftest* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -- -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - 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= -@@ -11798,6 +12470,30 @@ - [AC_CHECK_TOOL(RC, windres, no) - ]) - -+ -+# Cheap backport of AS_EXECUTABLE_P and required macros -+# from Autoconf 2.59; we should not use $as_executable_p directly. -+ -+# _AS_TEST_PREPARE -+# ---------------- -+m4_ifndef([_AS_TEST_PREPARE], -+[m4_defun([_AS_TEST_PREPARE], -+[if test -x / >/dev/null 2>&1; then -+ as_executable_p='test -x' -+else -+ as_executable_p='test -f' -+fi -+])])# _AS_TEST_PREPARE -+ -+# AS_EXECUTABLE_P -+# --------------- -+# Check whether a file is executable. -+m4_ifndef([AS_EXECUTABLE_P], -+[m4_defun([AS_EXECUTABLE_P], -+[AS_REQUIRE([_AS_TEST_PREPARE])dnl -+$as_executable_p $1[]dnl -+])])# AS_EXECUTABLE_P -+ - ############################################################ - # NOTE: This macro has been submitted for inclusion into # - # GNU Autoconf as AC_PROG_SED. When it is available in # -@@ -11820,18 +12516,19 @@ - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then -+ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done - done -+IFS=$as_save_IFS - lt_ac_max=0 - lt_ac_count=0 - # Add /usr/xpg4/bin/sed as it is typically found on Solaris - # along with /bin/sed that truncates output. - for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -- test ! -f $lt_ac_sed && break -+ test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in -@@ -11858,6 +12555,7 @@ - done - ]) - SED=$lt_cv_path_SED -+AC_SUBST([SED]) - AC_MSG_RESULT([$SED]) - ]) - -diff -uNr -x debian -x .pc konversation-1.0.1/aclocal.m4 konversation-1.0.1.n/aclocal.m4 ---- konversation-1.0.1/aclocal.m4 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/aclocal.m4 2007-07-17 02:59:54.000000000 +0300 -@@ -501,6 +501,35 @@ - rmdir .tst 2>/dev/null - AC_SUBST([am__leading_dot])]) - -+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -+# From Jim Meyering -+ -+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 -+# Free Software Foundation, Inc. -+# -+# This file is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# serial 4 -+ -+AC_DEFUN([AM_MAINTAINER_MODE], -+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) -+ dnl maintainer-mode is disabled by default -+ AC_ARG_ENABLE(maintainer-mode, -+[ --enable-maintainer-mode enable make rules and dependencies not useful -+ (and sometimes confusing) to the casual installer], -+ USE_MAINTAINER_MODE=$enableval, -+ USE_MAINTAINER_MODE=no) -+ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) -+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) -+ MAINT=$MAINTAINER_MODE_TRUE -+ AC_SUBST(MAINT)dnl -+] -+) -+ -+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -+ - # Check to see how 'make' treats includes. -*- Autoconf -*- - - # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. -diff -uNr -x debian -x .pc konversation-1.0.1/config.h.in konversation-1.0.1.n/config.h.in ---- konversation-1.0.1/config.h.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/config.h.in 2007-07-17 02:59:59.000000000 +0300 -@@ -111,22 +111,22 @@ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - --/* The size of a `char *', as computed by sizeof. */ -+/* The size of `char *', as computed by sizeof. */ - #undef SIZEOF_CHAR_P - --/* The size of a `int', as computed by sizeof. */ -+/* The size of `int', as computed by sizeof. */ - #undef SIZEOF_INT - --/* The size of a `long', as computed by sizeof. */ -+/* The size of `long', as computed by sizeof. */ - #undef SIZEOF_LONG - --/* The size of a `short', as computed by sizeof. */ -+/* The size of `short', as computed by sizeof. */ - #undef SIZEOF_SHORT - --/* The size of a `size_t', as computed by sizeof. */ -+/* The size of `size_t', as computed by sizeof. */ - #undef SIZEOF_SIZE_T - --/* The size of a `unsigned long', as computed by sizeof. */ -+/* The size of `unsigned long', as computed by sizeof. */ - #undef SIZEOF_UNSIGNED_LONG - - /* Define to 1 if you have the ANSI C header files. */ -diff -uNr -x debian -x .pc konversation-1.0.1/configure konversation-1.0.1.n/configure ---- konversation-1.0.1/configure 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/configure 2007-07-17 02:59:58.000000000 +0300 -@@ -1,25 +1,54 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59. -+# Generated by GNU Autoconf 2.61. - # --# Copyright (C) 2003 Free Software Foundation, Inc. -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. - ## --------------------- ## - ## M4sh Initialization. ## - ## --------------------- ## - --# Be Bourne compatible -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh - fi --DUALCASE=1; export DUALCASE # for MKS sh - - # Support unset when possible. - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -@@ -29,8 +58,43 @@ - fi - - -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+as_nl=' -+' -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ - # Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done - PS1='$ ' - PS2='> ' - PS4='+ ' -@@ -44,18 +108,19 @@ - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else -- $as_unset $as_var -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi - done - - # Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false -@@ -63,157 +128,388 @@ - - - # Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || - echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - -+# CDPATH. -+$as_unset CDPATH - --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh -+if test "x$CONFIG_SHELL" = x; then -+ if (eval ":") 2>/dev/null; then -+ as_have_required=yes -+else -+ as_have_required=no - fi - -+ if test $as_have_required = yes && (eval ": -+(as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} - -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi - -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=\$LINENO -+ as_lineno_2=\$LINENO -+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && -+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -+") 2> /dev/null; then -+ : -+else -+ as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -+ case $as_dir in - /*) -- if ("$as_dir/$as_base" -c ' -+ for as_base in sh bash ksh sh5; do -+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" -+ done;; -+ esac -+done -+IFS=$as_save_IFS -+ -+ -+ for as_shell in $as_candidate_shells $SHELL; do -+ # Try only shells that exist, to save several forks. -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { ("$as_shell") 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+_ASEOF -+}; then -+ CONFIG_SHELL=$as_shell -+ as_have_required=yes -+ if { "$as_shell" 2> /dev/null <<\_ASEOF -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+(as_func_return () { -+ (exit $1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = "$1" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test $exitcode = 0) || { (exit 1); exit 1; } -+ -+( - as_lineno_1=$LINENO - as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } -+ -+_ASEOF -+}; then -+ break -+fi -+ -+fi -+ -+ done -+ -+ if test "x$CONFIG_SHELL" != x; then -+ for as_var in BASH_ENV ENV -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+fi -+ -+ -+ if test $as_have_required = no; then -+ echo This script requires a shell more modern than all the -+ echo shells that I found on your system. Please install a -+ echo modern shell, or manually run the script under such a -+ echo shell if you do have one. -+ { (exit 1); exit 1; } -+fi -+ -+ -+fi -+ -+fi -+ -+ -+ -+(eval "as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0") || { -+ echo No shell found that supports shell functions. -+ echo Please tell autoconf@gnu.org about your system, -+ echo including any error possibly output before this -+ echo message -+} -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -+ chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - - --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - - rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir -+fi - echo >conf$$.file - if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -- else -- as_ln_s='ln -s' -- fi - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -@@ -222,7 +518,28 @@ - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -231,15 +548,6 @@ - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- - - - # Check that we are running under the correct shell. -@@ -278,15 +586,15 @@ - - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. --if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - if test -z "$ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -- if (echo_test_string="`eval $cmd`") 2>/dev/null && -- echo_test_string="`eval $cmd`" && -+ if (echo_test_string=`eval $cmd`) 2>/dev/null && -+ echo_test_string=`eval $cmd` && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break -@@ -395,29 +703,26 @@ - - tagnames=${tagnames+${tagnames},}F77 - -+exec 7<&0 &1 -+ - # Name of the host. - # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 -- - # - # Initializations. - # - ac_default_prefix=/usr/local -+ac_clean_files= - ac_config_libobj_dir=. -+LIBOBJS= - cross_compiling=no - subdirs= - MFLAGS= - MAKEFLAGS= - SHELL=${CONFIG_SHELL-/bin/sh} - --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} -- - # Identity of this package. - PACKAGE_NAME= - PACKAGE_TARNAME= -@@ -430,42 +735,320 @@ - # Factoring default headers for most tests. - ac_includes_default="\ - #include --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include - # include - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include - # endif - # include - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include --#else --# if HAVE_STDINT_H --# include --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include -+#endif -+#ifdef HAVE_UNISTD_H - # include - #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 LIB_ARTS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIB_KIMIFACE TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE konversation_SUBDIR_included_TRUE konversation_SUBDIR_included_FALSE po_SUBDIR_included_TRUE po_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL -+PATH_SEPARATOR -+PACKAGE_NAME -+PACKAGE_TARNAME -+PACKAGE_VERSION -+PACKAGE_STRING -+PACKAGE_BUGREPORT -+exec_prefix -+prefix -+program_transform_name -+bindir -+sbindir -+libexecdir -+datarootdir -+datadir -+sysconfdir -+sharedstatedir -+localstatedir -+includedir -+oldincludedir -+docdir -+infodir -+htmldir -+dvidir -+pdfdir -+psdir -+libdir -+localedir -+mandir -+DEFS -+ECHO_C -+ECHO_N -+ECHO_T -+LIBS -+build_alias -+host_alias -+target_alias -+build -+build_cpu -+build_vendor -+build_os -+host -+host_cpu -+host_vendor -+host_os -+target -+target_cpu -+target_vendor -+target_os -+INSTALL_PROGRAM -+INSTALL_SCRIPT -+INSTALL_DATA -+CYGPATH_W -+PACKAGE -+VERSION -+ACLOCAL -+AUTOCONF -+AUTOMAKE -+AUTOHEADER -+MAKEINFO -+install_sh -+STRIP -+INSTALL_STRIP_PROGRAM -+mkdir_p -+AWK -+SET_MAKE -+am__leading_dot -+AMTAR -+am__tar -+am__untar -+MAINTAINER_MODE_TRUE -+MAINTAINER_MODE_FALSE -+MAINT -+KDECONFIG -+kde_libs_prefix -+kde_libs_htmldir -+CONF_FILES -+CC -+CFLAGS -+LDFLAGS -+CPPFLAGS -+ac_ct_CC -+EXEEXT -+OBJEXT -+DEPDIR -+am__include -+am__quote -+AMDEP_TRUE -+AMDEP_FALSE -+AMDEPBACKSLASH -+CCDEPMODE -+am__fastdepCC_TRUE -+am__fastdepCC_FALSE -+CPP -+CXX -+CXXFLAGS -+ac_ct_CXX -+CXXDEPMODE -+am__fastdepCXX_TRUE -+am__fastdepCXX_FALSE -+WOVERLOADED_VIRTUAL -+HAVE_GCC_VISIBILITY -+unsermake_enable_pch_TRUE -+unsermake_enable_pch_FALSE -+USE_EXCEPTIONS -+USE_RTTI -+CXXCPP -+NOOPT_CXXFLAGS -+NOOPT_CFLAGS -+ENABLE_PERMISSIVE_FLAG -+LDFLAGS_AS_NEEDED -+LDFLAGS_NEW_DTAGS -+KDE_USE_FINAL_TRUE -+KDE_USE_FINAL_FALSE -+KDE_USE_CLOSURE_TRUE -+KDE_USE_CLOSURE_FALSE -+KDE_NO_UNDEFINED -+KDE_USE_NMCHECK_TRUE -+KDE_USE_NMCHECK_FALSE -+SED -+GREP -+EGREP -+LN_S -+ECHO -+AR -+RANLIB -+F77 -+FFLAGS -+ac_ct_F77 -+LIBTOOL -+KDE_PLUGIN -+KDE_CHECK_PLUGIN -+MSGFMT -+GMSGFMT -+XGETTEXT -+LIBUTIL -+LIBCOMPAT -+LIBCRYPT -+LIBRESOLV -+LIB_POLL -+FRAMEWORK_COREAUDIO -+LIBSOCKET -+X_EXTRA_LIBS -+LIBUCB -+LIBDL -+KDE_USE_FPIE -+KDE_USE_PIE -+include_x11_TRUE -+include_x11_FALSE -+XMKMF -+X_PRE_LIBS -+LIB_X11 -+LIB_XRENDER -+LIBSM -+X_INCLUDES -+X_LDFLAGS -+x_includes -+x_libraries -+QTE_NORTTI -+LIB_XEXT -+LIBPTHREAD -+USE_THREADS -+KDE_MT_LDFLAGS -+KDE_MT_LIBS -+USER_INCLUDES -+USER_LDFLAGS -+LIBZ -+LIBPNG -+LIBJPEG -+qt_libraries -+qt_includes -+QT_INCLUDES -+QT_LDFLAGS -+PERL -+MOC -+UIC -+UIC_TR -+LIB_QT -+LIB_QPE -+kde_qtver -+KDE_EXTRA_RPATH -+KDE_RPATH -+X_RPATH -+kde_libraries -+kde_includes -+KDE_LDFLAGS -+KDE_INCLUDES -+all_includes -+all_libraries -+AUTODIRS -+include_ARTS_TRUE -+include_ARTS_FALSE -+MAKEKDEWIDGETS -+KCONFIG_COMPILER -+KCFG_DEPENDENCIES -+DCOPIDLNG -+DCOPIDL -+DCOPIDL2CPP -+DCOP_DEPENDENCIES -+MCOPIDL -+ARTSCCONFIG -+MEINPROC -+KDE_XSL_STYLESHEET -+XMLLINT -+kde_htmldir -+kde_appsdir -+kde_icondir -+kde_sounddir -+kde_datadir -+kde_locale -+kde_confdir -+kde_kcfgdir -+kde_mimedir -+kde_wallpaperdir -+kde_bindir -+xdg_appsdir -+xdg_menudir -+xdg_directorydir -+kde_templatesdir -+kde_servicesdir -+kde_servicetypesdir -+kde_moduledir -+kdeinitdir -+kde_styledir -+kde_widgetdir -+LIB_KDED -+LIB_KDECORE -+LIB_KDEUI -+LIB_KIO -+LIB_KJS -+LIB_SMB -+LIB_KAB -+LIB_KABC -+LIB_KHTML -+LIB_KSPELL -+LIB_KPARTS -+LIB_KDEPRINT -+LIB_KUTILS -+LIB_KDEPIM -+LIB_KIMPROXY -+LIB_KNEWSTUFF -+LIB_KDNSSD -+LIB_KUNITTEST -+LIB_KSYCOCA -+LIB_KFILE -+LIB_KFM -+LIB_ARTS -+QTDOCDIR -+KDE_HAVE_DOT -+DOXYGEN -+DOXYGEN_PROJECT_NAME -+DOXYGEN_PROJECT_NUMBER -+KDE_HAS_DOXYGEN -+LIB_KIMIFACE -+TOPSUBDIRS -+doc_SUBDIR_included_TRUE -+doc_SUBDIR_included_FALSE -+konversation_SUBDIR_included_TRUE -+konversation_SUBDIR_included_FALSE -+po_SUBDIR_included_TRUE -+po_SUBDIR_included_FALSE -+LIBOBJS -+LTLIBOBJS' - ac_subst_files='' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CPP -+CXX -+CXXFLAGS -+CCC -+CXXCPP -+F77 -+FFLAGS -+XMKMF' -+ - - # Initialize some variables set by options. - ac_init_help= -@@ -492,34 +1075,48 @@ - # and all the variables that are supposed to be based on exec_prefix - # by default will actually change. - # Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+docdir='${datarootdir}/doc/${PACKAGE}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -541,33 +1138,45 @@ - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -- esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` -+ eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -594,6 +1203,12 @@ - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -618,13 +1233,16 @@ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -689,6 +1307,16 @@ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -741,24 +1369,20 @@ - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -- esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'` -+ eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. -@@ -789,8 +1413,7 @@ - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) -@@ -810,27 +1433,19 @@ - { (exit 1); exit 1; }; } - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix -+# Be sure to have absolute directory names. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$ac_var - case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -- esac --done -- --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac -+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { (exit 1); exit 1; }; } - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -857,22 +1472,43 @@ - test "$silent" = yes && exec 6>/dev/null - - -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ { echo "$as_me: error: Working directory cannot be determined" >&2 -+ { (exit 1); exit 1; }; } -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ { echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { (exit 1); exit 1; }; } -+ -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$0" || - $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || - echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. -@@ -881,70 +1517,31 @@ - ac_srcdir_defaulted=no - fi - if test ! -r "$srcdir/$ac_unique_file"; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -- fi - fi --(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP --ac_env_CXX_set=${CXX+set} --ac_env_CXX_value=$CXX --ac_cv_env_CXX_set=${CXX+set} --ac_cv_env_CXX_value=$CXX --ac_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_env_CXXFLAGS_value=$CXXFLAGS --ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} --ac_cv_env_CXXFLAGS_value=$CXXFLAGS --ac_env_CXXCPP_set=${CXXCPP+set} --ac_env_CXXCPP_value=$CXXCPP --ac_cv_env_CXXCPP_set=${CXXCPP+set} --ac_cv_env_CXXCPP_value=$CXXCPP --ac_env_F77_set=${F77+set} --ac_env_F77_value=$F77 --ac_cv_env_F77_set=${F77+set} --ac_cv_env_F77_value=$F77 --ac_env_FFLAGS_set=${FFLAGS+set} --ac_env_FFLAGS_value=$FFLAGS --ac_cv_env_FFLAGS_set=${FFLAGS+set} --ac_cv_env_FFLAGS_value=$FFLAGS -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 -+ { (exit 1); exit 1; }; } -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done - - # - # Report the --help message. -@@ -973,9 +1570,6 @@ - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --_ACEOF -- -- cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] -@@ -993,15 +1587,22 @@ - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -1025,6 +1626,8 @@ - Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -+ --enable-maintainer-mode enable make rules and dependencies not useful -+ (and sometimes confusing) to the casual installer - --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 -@@ -1042,10 +1645,8 @@ - of memory) - --enable-closure delay template instantiation - --enable-nmcheck enable automatic namespace cleanness check -- --enable-shared[=PKGS] -- build shared libraries [default=yes] -- --enable-static[=PKGS] -- build static libraries [default=no] -+ --enable-shared[=PKGS] build shared libraries [default=yes] -+ --enable-static[=PKGS] build static libraries [default=no] - --enable-libsuffix /lib directory suffix (64,32,none,auto=default) - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] -@@ -1065,8 +1666,7 @@ - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pic try to use only PIC/non-PIC objects [default=use - both] -- --with-tags[=TAGS] -- include additional configurations [automatic] -+ --with-tags[=TAGS] include additional configurations [automatic] - --with-extra-includes=DIR - adds non standard include paths - --with-extra-libs=DIR adds non standard library paths -@@ -1080,131 +1680,101 @@ - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory -- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have -- headers in a nonstandard directory -+ LIBS libraries to pass to the linker, e.g. -l -+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if -+ you have headers in a nonstandard directory - CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor - F77 Fortran 77 compiler command - FFLAGS Fortran 77 compiler flags -+ XMKMF Path to xmkmf, Makefile generator for X Window System - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - - _ACEOF -+ac_status=$? - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -+ test -d "$ac_dir" || continue - ac_builddir=. - --if test "$ac_dir" != .; then -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF -+configure -+generated by GNU Autoconf 2.61 - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -- exit 0 -+ exit - fi --exec 5>config.log --cat >&5 <<_ACEOF -+cat >config.log <<_ACEOF - This file contains any messages produced by compilers while - running configure, to aid debugging if configure makes a mistake. - - It was created by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - - _ACEOF -+exec 5>>config.log - { - cat <<_ASUNAME - ## --------- ## -@@ -1223,7 +1793,7 @@ - /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` - /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` - /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` - /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` - /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` - /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -@@ -1237,6 +1807,7 @@ - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" - done -+IFS=$as_save_IFS - - } >&5 - -@@ -1258,7 +1829,6 @@ - ac_configure_args= - ac_configure_args0= - ac_configure_args1= --ac_sep= - ac_must_keep_next=false - for ac_pass in 1 2 - do -@@ -1269,7 +1839,7 @@ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -+ *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -@@ -1291,9 +1861,7 @@ - -* ) ac_must_keep_next=true ;; - esac - fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -+ ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -@@ -1304,8 +1872,8 @@ - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { -@@ -1318,20 +1886,34 @@ - _ASBOX - echo - # The following way of writing the cache mishandles newlines in values, --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( - *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} -+ esac | -+ sort -+) - echo - - cat <<\_ASBOX -@@ -1342,22 +1924,28 @@ - echo - for ac_var in $ac_subst_vars - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## -+## ------------------- ## -+## File substitutions. ## -+## ------------------- ## - _ASBOX - echo - for ac_var in $ac_subst_files - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi -@@ -1369,26 +1957,24 @@ - ## ----------- ## - _ASBOX - echo -- sed "/^$/d" confdefs.h | sort -+ cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 -- rm -f core *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 0 - for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -+rm -f -r conftest* confdefs.h - - # Predefined preprocessor variables. - -@@ -1419,14 +2005,17 @@ - - # Let the site file select an alternate cache file if it wants to. - # Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi -+if test -n "$CONFIG_SITE"; then -+ set x "$CONFIG_SITE" -+elif test "x$prefix" != xNONE; then -+ set x "$prefix/share/config.site" "$prefix/etc/config.site" -+else -+ set x "$ac_default_prefix/share/config.site" \ -+ "$ac_default_prefix/etc/config.site" - fi --for ac_site_file in $CONFIG_SITE; do -+shift -+for ac_site_file -+do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 - echo "$as_me: loading site script $ac_site_file" >&6;} -@@ -1442,8 +2031,8 @@ - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 - echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -@@ -1455,12 +2044,11 @@ - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -@@ -1485,8 +2073,7 @@ - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in -@@ -1503,12 +2090,6 @@ - { (exit 1); exit 1; }; } - fi - --ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- - - - -@@ -1525,110 +2106,165 @@ - - - -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - ac_aux_dir= --for ac_dir in admin $srcdir/admin; do -- if test -f $ac_dir/install-sh; then -+for ac_dir in admin "$srcdir"/admin; do -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&2;} -+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&5 -+echo "$as_me: error: cannot find install-sh or install.sh in admin \"$srcdir\"/admin" >&2;} - { (exit 1); exit 1; }; } - fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - - unset CDPATH - - # Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - --echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking build system type" >&5 -+echo $ECHO_N "checking build system type... $ECHO_C" >&6; } - if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 - echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - - fi --echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -+echo "${ECHO_T}$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -+echo "$as_me: error: invalid value of canonical build" >&2;} -+ { (exit 1); exit 1; }; };; -+esac - build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking host system type" >&5 -+echo $ECHO_N "checking host system type... $ECHO_C" >&6; } - if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -+echo "${ECHO_T}$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -+echo "$as_me: error: invalid value of canonical host" >&2;} -+ { (exit 1); exit 1; }; };; -+esac - host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - --echo "$as_me:$LINENO: checking target system type" >&5 --echo $ECHO_N "checking target system type... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking target system type" >&5 -+echo $ECHO_N "checking target system type... $ECHO_C" >&6; } - if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_target_alias=$target_alias --test "x$ac_cv_target_alias" = "x" && -- ac_cv_target_alias=$ac_cv_host_alias --ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} -+ if test "x$target_alias" = x; then -+ ac_cv_target=$ac_cv_host -+else -+ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_target" >&5 --echo "${ECHO_T}$ac_cv_target" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -+echo "${ECHO_T}$ac_cv_target" >&6; } -+case $ac_cv_target in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -+echo "$as_me: error: invalid value of canonical target" >&2;} -+ { (exit 1); exit 1; }; };; -+esac - target=$ac_cv_target --target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_target -+shift -+target_cpu=$1 -+target_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+target_os=$* -+IFS=$ac_save_IFS -+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac - - - # The aliases save the names the user supplied, while $host etc. -@@ -1638,17 +2274,17 @@ - NONENONEs,x,x, && - program_prefix=${target_alias}- - test "$program_prefix" != NONE && -- program_transform_name="s,^,$program_prefix,;$program_transform_name" -+ program_transform_name="s&^&$program_prefix&;$program_transform_name" - # Use a double $ so make ignores it. - test "$program_suffix" != NONE && -- program_transform_name="s,\$,$program_suffix,;$program_transform_name" -+ program_transform_name="s&\$&$program_suffix&;$program_transform_name" - # Double any \ or $. echo might interpret backslashes. - # By default was `s,x,x', remove it if useless. - cat <<\_ACEOF >conftest.sed - s/[\\$]/&&/g;s/;s,x,x,$// - _ACEOF - program_transform_name=`echo $program_transform_name | sed -f conftest.sed` --rm conftest.sed -+rm -f conftest.sed - - - am__api_version="1.9" -@@ -1670,8 +2306,8 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } - if test -z "$INSTALL"; then - if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -1693,7 +2329,7 @@ - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -@@ -1712,21 +2348,22 @@ - ;; - esac - done -+IFS=$as_save_IFS - - - fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else -- # As a last resort, use the slow shell script. We don't cache a -- # path for INSTALL within a source directory, because that will -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is -- # removed, or if the path is relative. -+ # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi - fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -+echo "${ECHO_T}$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -1740,8 +2377,8 @@ - if test -z "$kde_save_INSTALL_given" ; then - # OK, user hasn't given any INSTALL, autoconf found one for us - # now we test, if it supports the -p flag -- echo "$as_me:$LINENO: checking for -p flag to install" >&5 --echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for -p flag to install" >&5 -+echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6; } - rm -f confinst.$$.* > /dev/null 2>&1 - echo "Testtest" > confinst.$$.orig - ac_res=no -@@ -1753,8 +2390,8 @@ - fi - fi - rm -f confinst.$$.* -- echo "$as_me:$LINENO: result: $ac_res" >&5 --echo "${ECHO_T}$ac_res" >&6 -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - fi - - if test -z "$kde_save_INSTALL_PROGRAM_given" ; then -@@ -1764,8 +2401,8 @@ - INSTALL_SCRIPT='${INSTALL}' - fi - --echo "$as_me:$LINENO: checking whether build environment is sane" >&5 --echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } - # Just in case - sleep 1 - echo timestamp > conftest.file -@@ -1807,8 +2444,8 @@ - Check your system clock" >&2;} - { (exit 1); exit 1; }; } - fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+{ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - # expand $ac_aux_dir to an absolute path - am_aux_dir=`cd $ac_aux_dir && pwd` - -@@ -1859,8 +2496,8 @@ - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -1873,54 +2510,57 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - AWK=$ac_cv_prog_AWK - if test -n "$AWK"; then -- echo "$as_me:$LINENO: result: $AWK" >&5 --echo "${ECHO_T}$AWK" >&6 -+ { echo "$as_me:$LINENO: result: $AWK" >&5 -+echo "${ECHO_T}$AWK" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$AWK" && break - done - --echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 --set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` --if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh - all: -- @echo 'ac_maketemp="$(MAKE)"' -+ @echo '@@@%%%=$(MAKE)=@@@%%%' - _ACEOF - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. --eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` --if test -n "$ac_maketemp"; then -- eval ac_cv_prog_make_${ac_make}_set=yes --else -- eval ac_cv_prog_make_${ac_make}_set=no --fi -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; -+esac - rm -f conftest.make - fi --if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - SET_MAKE= - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - -@@ -1952,8 +2592,8 @@ - - - # Define the identity of the package. -- PACKAGE=konversation -- VERSION=1.0.1 -+ PACKAGE=konversation-1.0.1.n -+ VERSION="3.5.5" - - - cat >>confdefs.h <<_ACEOF -@@ -1991,8 +2631,8 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2005,32 +2645,34 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- echo "$as_me:$LINENO: result: $STRIP" >&5 --echo "${ECHO_T}$STRIP" >&6 -+ { echo "$as_me:$LINENO: result: $STRIP" >&5 -+echo "${ECHO_T}$STRIP" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2043,27 +2685,41 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" - fi - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 --echo "${ECHO_T}$ac_ct_STRIP" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+echo "${ECHO_T}$ac_ct_STRIP" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- STRIP=$ac_ct_STRIP -+ if test "x$ac_ct_STRIP" = x; then -+ STRIP=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ STRIP=$ac_ct_STRIP -+ fi - else - STRIP="$ac_cv_prog_STRIP" - fi -@@ -2083,6 +2739,31 @@ - - - -+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } -+ # Check whether --enable-maintainer-mode was given. -+if test "${enable_maintainer_mode+set}" = set; then -+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -+else -+ USE_MAINTAINER_MODE=no -+fi -+ -+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } -+ -+ -+if test $USE_MAINTAINER_MODE = yes; then -+ MAINTAINER_MODE_TRUE= -+ MAINTAINER_MODE_FALSE='#' -+else -+ MAINTAINER_MODE_TRUE='#' -+ MAINTAINER_MODE_FALSE= -+fi -+ -+ MAINT=$MAINTAINER_MODE_TRUE -+ -+ -+ - - unset CDPATH - -@@ -2101,14 +2782,14 @@ - - if test "x$prefix" = "xNONE"; then - -- echo "$as_me:$LINENO: checking for kde-config" >&5 --echo $ECHO_N "checking for kde-config... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for kde-config" >&5 -+echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } - if test -n "$KDECONFIG"; then - kde_cv_path="$KDECONFIG"; - else - kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -2151,8 +2832,8 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - { { echo "$as_me:$LINENO: error: The important program kde-config was not found! - Please check whether you installed KDE correctly. -@@ -2163,8 +2844,8 @@ - { (exit 1); exit 1; }; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - KDECONFIG=$kde_cv_path - - fi -@@ -2173,14 +2854,14 @@ - kde_save_PATH="$PATH" - PATH="$exec_prefix/bin:$prefix/bin:$PATH" - -- echo "$as_me:$LINENO: checking for kde-config" >&5 --echo $ECHO_N "checking for kde-config... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for kde-config" >&5 -+echo $ECHO_N "checking for kde-config... $ECHO_C" >&6; } - if test -n "$KDECONFIG"; then - kde_cv_path="$KDECONFIG"; - else - kde_cache=`echo kde-config | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -2223,8 +2904,8 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - { { echo "$as_me:$LINENO: error: The important program kde-config was not found! - Please check whether you installed KDE correctly. -@@ -2235,8 +2916,8 @@ - { (exit 1); exit 1; }; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - KDECONFIG=$kde_cv_path - - fi -@@ -2258,16 +2939,16 @@ - fi - kde_libs_htmldir=`$KDECONFIG --install html --expandvars` - -- echo "$as_me:$LINENO: checking where to install" >&5 --echo $ECHO_N "checking where to install... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking where to install" >&5 -+echo $ECHO_N "checking where to install... $ECHO_C" >&6; } - if test "x$prefix" = "xNONE"; then - prefix=$kde_libs_prefix -- echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5 --echo "${ECHO_T}$prefix (as returned by kde-config)" >&6 -+ { echo "$as_me:$LINENO: result: $prefix (as returned by kde-config)" >&5 -+echo "${ECHO_T}$prefix (as returned by kde-config)" >&6; } - else - given_prefix=$prefix -- echo "$as_me:$LINENO: result: $prefix (as requested)" >&5 --echo "${ECHO_T}$prefix (as requested)" >&6 -+ { echo "$as_me:$LINENO: result: $prefix (as requested)" >&5 -+echo "${ECHO_T}$prefix (as requested)" >&6; } - fi - - # And delete superfluous '/' to make compares easier -@@ -2280,13 +2961,13 @@ - - - -- # Check whether --enable-fast-perl or --disable-fast-perl was given. -+ # Check whether --enable-fast-perl was given. - if test "${enable_fast_perl+set}" = set; then -- enableval="$enable_fast_perl" -- with_fast_perl=$enableval -+ enableval=$enable_fast_perl; with_fast_perl=$enableval - else - with_fast_perl=yes --fi; -+fi -+ - - - val= -@@ -2303,11 +2984,11 @@ - - - -- ac_config_headers="$ac_config_headers config.h" -+ac_config_headers="$ac_config_headers config.h" - - DEPDIR="${am__leading_dot}deps" - -- ac_config_commands="$ac_config_commands depfiles" -+ac_config_commands="$ac_config_commands depfiles" - - - am_make=${MAKE-make} -@@ -2317,8 +2998,8 @@ - .PHONY: am__doit - END - # If we don't find an include directive, just comment out the code. --echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 --echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } - am__include="#" - am__quote= - _am_result=none -@@ -2345,15 +3026,15 @@ - fi - - --echo "$as_me:$LINENO: result: $_am_result" >&5 --echo "${ECHO_T}$_am_result" >&6 -+{ echo "$as_me:$LINENO: result: $_am_result" >&5 -+echo "${ECHO_T}$_am_result" >&6; } - rm -f confinc confmf - --# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. -+# Check whether --enable-dependency-tracking was given. - if test "${enable_dependency_tracking+set}" = set; then -- enableval="$enable_dependency_tracking" -+ enableval=$enable_dependency_tracking; -+fi - --fi; - if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -@@ -2373,10 +3054,9 @@ - - - -- # Check whether --enable-debug or --disable-debug was given. -+ # Check whether --enable-debug was given. - if test "${enable_debug+set}" = set; then -- enableval="$enable_debug" -- -+ enableval=$enable_debug; - case $enableval in - yes) - kde_use_debug_code="yes" -@@ -2396,18 +3076,18 @@ - kde_use_debug_code="no" - kde_use_debug_define=no - --fi; -+fi -+ - -- # Check whether --enable-dummyoption or --disable-dummyoption was given. -+ # Check whether --enable-dummyoption was given. - if test "${enable_dummyoption+set}" = set; then -- enableval="$enable_dummyoption" -+ enableval=$enable_dummyoption; -+fi - --fi; - -- # Check whether --enable-strict or --disable-strict was given. -+ # Check whether --enable-strict was given. - if test "${enable_strict+set}" = set; then -- enableval="$enable_strict" -- -+ enableval=$enable_strict; - if test $enableval = "no"; then - kde_use_strict_options="no" - else -@@ -2416,12 +3096,12 @@ - - else - kde_use_strict_options="no" --fi; -+fi - -- # Check whether --enable-warnings or --disable-warnings was given. --if test "${enable_warnings+set}" = set; then -- enableval="$enable_warnings" - -+ # Check whether --enable-warnings was given. -+if test "${enable_warnings+set}" = set; then -+ enableval=$enable_warnings; - if test $enableval = "no"; then - kde_use_warnings="no" - else -@@ -2430,20 +3110,21 @@ - - else - kde_use_warnings="yes" --fi; -+fi -+ - - if test "$kde_use_debug_code" != "no"; then - kde_use_warnings=yes - fi - -- # Check whether --enable-profile or --disable-profile was given. -+ # Check whether --enable-profile was given. - if test "${enable_profile+set}" = set; then -- enableval="$enable_profile" -- kde_use_profiling=$enableval -+ enableval=$enable_profile; kde_use_profiling=$enableval - else - kde_use_profiling="no" - --fi; -+fi -+ - - CFLAGS=" $CFLAGS" - -@@ -2455,8 +3136,8 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2469,32 +3150,34 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2507,36 +3190,51 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else - CC="$ac_cv_prog_CC" - fi - - if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2549,74 +3247,34 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi - -+ fi - fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2630,7 +3288,7 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -@@ -2641,6 +3299,7 @@ - fi - done - done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -2658,22 +3317,23 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2686,36 +3346,38 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$CC" && break - done - fi - if test -z "$CC"; then - ac_ct_CC=$CC -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2728,29 +3390,45 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi -@@ -2763,21 +3441,35 @@ - { (exit 1); exit 1; }; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 -+echo "$as_me:$LINENO: checking for C compiler version" >&5 - ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -@@ -2802,47 +3494,77 @@ - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } - ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -+# -+# List of possible output files, starting from the most likely. -+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -+# only as a last resort. b.out is created by i960 compilers. -+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -+# -+# The IRIX 6 linker writes into existing files which may not be -+# executable, retaining their permissions. Remove them first so a -+# subsequent execution test works. -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { (ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link_default") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -- --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. - break;; - * ) - break;; - esac - done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ - else -+ ac_file='' -+fi -+ -+{ echo "$as_me:$LINENO: result: $ac_file" >&5 -+echo "${ECHO_T}$ac_file" >&6; } -+if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -@@ -2854,19 +3576,21 @@ - fi - - ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 - --# Check the compiler produces executables we can run. If not, either -+# Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } - # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 - # If not cross compiling, check that we can run a simple program. - if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -2885,22 +3609,27 @@ - fi - fi - fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+{ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - - rm -f a.out a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either -+# Check that the compiler produces executables we can run. If not, either - # the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -+echo "${ECHO_T}$cross_compiling" >&6; } -+ -+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -@@ -2911,9 +3640,8 @@ - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext - break;; - * ) break;; - esac -@@ -2927,14 +3655,14 @@ - fi - - rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -+echo "${ECHO_T}$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } - if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -2954,14 +3682,20 @@ - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -@@ -2979,12 +3713,12 @@ - - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -+echo "${ECHO_T}$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } - if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3007,50 +3741,49 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } - GCC=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } - if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -3066,38 +3799,118 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_g=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ CFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_prog_cc_g=no -+ -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -3113,12 +3926,12 @@ - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- ac_cv_prog_cc_stdc=no -+ ac_cv_prog_cc_c89=no - ac_save_CC=$CC - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3152,12 +3965,17 @@ - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated -- as 'x'. The following induces an error, until -std1 is added to get -+ as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something -- that's true only with -std1. */ -+ that's true only with -std. */ - int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -3172,205 +3990,57 @@ - return 0; - } - _ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cc_c89=$ac_arg - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext -+ -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --rm -f conftest.$ac_ext conftest.$ac_objext -+rm -f conftest.$ac_ext - CC=$ac_save_CC - - fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6; } ;; -+ xno) -+ { echo "$as_me:$LINENO: result: unsupported" >&5 -+echo "${ECHO_T}unsupported" >&6; } ;; - *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; -+ CC="$CC $ac_cv_prog_cc_c89" -+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; - esac - --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --#include --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -3379,8 +4049,8 @@ - - depcc="$CC" am_compiler_list= - --echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } - if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3469,8 +4139,8 @@ - fi - - fi --echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 --echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 -+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } - CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -@@ -3492,8 +4162,8 @@ - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -3527,24 +4197,22 @@ - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -3553,9 +4221,10 @@ - # Broken: fails on valid input. - continue - fi -+ - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3565,24 +4234,22 @@ - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -3593,6 +4260,7 @@ - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done -@@ -3610,8 +4278,8 @@ - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 -+{ echo "$as_me:$LINENO: result: $CPP" >&5 -+echo "${ECHO_T}$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do -@@ -3634,24 +4302,22 @@ - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -3660,9 +4326,10 @@ - # Broken: fails on valid input. - continue - fi -+ - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -3672,24 +4339,22 @@ - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -3700,6 +4365,7 @@ - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done -@@ -3750,18 +4416,22 @@ - - CXXFLAGS=" $CXXFLAGS" - -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --if test -n "$ac_tool_prefix"; then -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -+if test -z "$CXX"; then -+ if test -n "$CCC"; then -+ CXX=$CCC -+ else -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3774,36 +4444,38 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - CXX=$ac_cv_prog_CXX - if test -n "$CXX"; then -- echo "$as_me:$LINENO: result: $CXX" >&5 --echo "${ECHO_T}$CXX" >&6 -+ { echo "$as_me:$LINENO: result: $CXX" >&5 -+echo "${ECHO_T}$CXX" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$CXX" && break - done - fi - if test -z "$CXX"; then - ac_ct_CXX=$CXX -- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3816,55 +4488,85 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CXX=$ac_cv_prog_ac_ct_CXX - if test -n "$ac_ct_CXX"; then -- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 --echo "${ECHO_T}$ac_ct_CXX" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -+echo "${ECHO_T}$ac_ct_CXX" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$ac_ct_CXX" && break - done --test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - -- CXX=$ac_ct_CXX -+ if test "x$ac_ct_CXX" = x; then -+ CXX="g++" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ CXX=$ac_ct_CXX -+ fi - fi - -- -+ fi -+fi - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C++ compiler version" >&5 -+echo "$as_me:$LINENO: checking for C++ compiler version" >&5 - ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - --echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } - if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -3887,50 +4589,49 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } - GXX=`test $ac_compiler_gnu = yes && echo yes` - ac_test_CXXFLAGS=${CXXFLAGS+set} - ac_save_CXXFLAGS=$CXXFLAGS --CXXFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 --echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -+echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } - if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- cat >conftest.$ac_ext <<_ACEOF -+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag -+ ac_cxx_werror_flag=yes -+ ac_cv_prog_cxx_g=no -+ CXXFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -3946,159 +4647,133 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_cxx_g=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_prog_cxx_g=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 --if test "$ac_test_CXXFLAGS" = set; then -- CXXFLAGS=$ac_save_CXXFLAGS --elif test $ac_cv_prog_cxx_g = yes; then -- if test "$GXX" = yes; then -- CXXFLAGS="-g -O2" -- else -- CXXFLAGS="-g" -- fi --else -- if test "$GXX" = yes; then -- CXXFLAGS="-O2" -- else -- CXXFLAGS= -- fi --fi --for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF -+ CXXFLAGS="" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_declaration --#include -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - : - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+ CXXFLAGS="-g" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --$ac_declaration -+ - int - main () - { --exit (42); -+ - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_cv_prog_cxx_g=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } -+if test "$ac_test_CXXFLAGS" = set; then -+ CXXFLAGS=$ac_save_CXXFLAGS -+elif test $ac_cv_prog_cxx_g = yes; then -+ if test "$GXX" = yes; then -+ CXXFLAGS="-g -O2" -+ else -+ CXXFLAGS="-g" -+ fi -+else -+ if test "$GXX" = yes; then -+ CXXFLAGS="-O2" -+ else -+ CXXFLAGS= -+ fi -+fi - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -4107,8 +4782,8 @@ - - depcc="$CXX" am_compiler_list= - --echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 --echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } - if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -4197,8 +4872,8 @@ - fi - - fi --echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 --echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 -+{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } - CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - -@@ -4216,8 +4891,8 @@ - - - -- echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5 --echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether $CC is blacklisted" >&5 -+echo $ECHO_N "checking whether $CC is blacklisted... $ECHO_C" >&6; } - - - cat >conftest.$ac_ext <<_ACEOF -@@ -4242,39 +4917,35 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - kde_bad_compiler=no - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --kde_bad_compiler=yes -+ kde_bad_compiler=yes - - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -- echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5 --echo "${ECHO_T}$kde_bad_compiler" >&6 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+ { echo "$as_me:$LINENO: result: $kde_bad_compiler" >&5 -+echo "${ECHO_T}$kde_bad_compiler" >&6; } - - if test "$kde_bad_compiler" = "yes"; then - { { echo "$as_me:$LINENO: error: -@@ -4316,17 +4987,16 @@ - fi - fi - --echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5 --echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5 -+echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6; } - kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - - -- --ac_ext=cc -+ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -4354,34 +5024,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -4394,29 +5062,28 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="-fno-builtin $CXXFLAGS" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - - --echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5 --echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5 -+echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6; } - kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -4443,34 +5110,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -4483,13 +5148,13 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - WOVERLOADED_VIRTUAL="-Woverloaded-virtual" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - WOVERLOADED_VRITUAL="" - fi -@@ -4510,16 +5175,15 @@ - - if test "$kde_use_profiling" = "yes"; then - --echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5 --echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5 -+echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6; } - kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -4546,34 +5210,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -4586,16 +5248,16 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - - CFLAGS="-pg $CFLAGS" - CXXFLAGS="-pg $CXXFLAGS" - - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi -@@ -4610,16 +5272,15 @@ - CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" - CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS" - --echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5 --echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5 -+echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6; } - kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -4646,34 +5307,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -4686,27 +5345,26 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - --echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5 --echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CC supports -Wmissing-format-attribute" >&5 -+echo $ECHO_N "checking whether $CC supports -Wmissing-format-attribute... $ECHO_C" >&6; } - kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cc_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cc_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -4731,34 +5389,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cc_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$save_CFLAGS" - ac_ext=c -@@ -4771,13 +5427,13 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi -@@ -4785,16 +5441,15 @@ - ;; - esac - --echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5 --echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5 -+echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6; } - kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -4821,34 +5476,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -4861,28 +5514,27 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="-Wundef $CXXFLAGS" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - --echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5 --echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5 -+echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6; } - kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -4909,34 +5561,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -4949,28 +5599,27 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="-Wno-long-long $CXXFLAGS" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - --echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5 --echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wno-non-virtual-dtor" >&5 -+echo $ECHO_N "checking whether $CXX supports -Wno-non-virtual-dtor... $ECHO_C" >&6; } - kde_cache=`echo Wno-non-virtual-dtor | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -4997,34 +5646,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -5037,13 +5684,13 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi -@@ -5055,13 +5702,13 @@ - CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS" - fi - -- # Check whether --enable-pch or --disable-pch was given. -+ # Check whether --enable-pch was given. - if test "${enable_pch+set}" = set; then -- enableval="$enable_pch" -- kde_use_pch=$enableval -+ enableval=$enable_pch; kde_use_pch=$enableval - else - kde_use_pch=no --fi; -+fi -+ - - HAVE_GCC_VISIBILITY=0 - -@@ -5069,16 +5716,15 @@ - if test "$GXX" = "yes"; then - gcc_no_reorder_blocks=NO - --echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5 --echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-reorder-blocks" >&5 -+echo $ECHO_N "checking whether $CXX supports -fno-reorder-blocks... $ECHO_C" >&6; } - kde_cache=`echo fno-reorder-blocks | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -5105,34 +5751,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -5145,13 +5789,13 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - gcc_no_reorder_blocks=YES - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi -@@ -5163,16 +5807,15 @@ - CFLAGS="$CFLAGS -fno-reorder-blocks" - fi - --echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5 --echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5 -+echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6; } - kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -5199,34 +5842,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -5239,28 +5880,27 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="$CXXFLAGS -fno-exceptions" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - --echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5 --echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5 -+echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6; } - kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -5287,34 +5927,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -5327,28 +5965,27 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="$CXXFLAGS -fno-check-new" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - --echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5 --echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5 -+echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6; } - kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -5375,34 +6012,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -5415,28 +6050,27 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="$CXXFLAGS -fno-common" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - --echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5 --echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5 -+echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6; } - kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -5463,34 +6097,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -5503,13 +6135,13 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - USE_EXCEPTIONS="-fexceptions" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - USE_EXCEPTIONS= - fi -@@ -5517,37 +6149,37 @@ - ENABLE_PERMISSIVE_FLAG="-fpermissive" - - if test "$kde_use_pch" = "yes"; then -- echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5 --echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether gcc supports precompiling c header files" >&5 -+echo $ECHO_N "checking whether gcc supports precompiling c header files... $ECHO_C" >&6; } - echo >conftest.h - if $CC -x c-header conftest.h >/dev/null 2>/dev/null; then - kde_gcc_supports_pch=yes -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else - kde_gcc_supports_pch=no -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - if test "$kde_gcc_supports_pch" = "yes"; then -- echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5 --echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether gcc supports precompiling c++ header files" >&5 -+echo $ECHO_N "checking whether gcc supports precompiling c++ header files... $ECHO_C" >&6; } - if $CXX -x c++-header conftest.h >/dev/null 2>/dev/null; then - kde_gcc_supports_pch=yes -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else - kde_gcc_supports_pch=no -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - fi - rm -f conftest.h conftest.h.gch - fi - - -- echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5 --echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether system headers can cope with -O2 -fno-inline" >&5 -+echo $ECHO_N "checking whether system headers can cope with -O2 -fno-inline... $ECHO_C" >&6; } - if test "${kde_cv_opt_noinline_match+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -5579,44 +6211,41 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - kde_cv_opt_noinline_match=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --kde_cv_opt_noinline_match=no -+ kde_cv_opt_noinline_match=no - - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - - CFLAGS="$ac_cflags_save" - fi - - fi --echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5 --echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6 -+{ echo "$as_me:$LINENO: result: $kde_cv_opt_noinline_match" >&5 -+echo "${ECHO_T}$kde_cv_opt_noinline_match" >&6; } - - if test "x$kde_cv_opt_noinline_match" = "xno" ; then - CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`" -@@ -5636,16 +6265,15 @@ - - if test "$kde_use_pch" = "yes"; then - --echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5 --echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5 -+echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6; } - kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -5672,34 +6300,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -5712,29 +6338,28 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="$CXXFLAGS --pch" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - fi - --echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5 --echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5 -+echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6; } - kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -5761,34 +6386,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -5801,28 +6424,27 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - --echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5 --echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5 -+echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6; } - kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -5849,34 +6471,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -5889,28 +6509,27 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - --echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5 --echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5 -+echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6; } - kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -5937,34 +6556,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -5977,28 +6594,27 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - --echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5 --echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5 -+echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6; } - kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -6025,34 +6641,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -6065,28 +6679,27 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - --echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5 --echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5 -+echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6; } - kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -6113,34 +6726,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -6153,13 +6764,13 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - CXXFLAGS="$CXXFLAGS --one_per" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi -@@ -6266,13 +6877,13 @@ - fi - - -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_cxx_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 --echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } - if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -6302,24 +6913,22 @@ - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -6328,9 +6937,10 @@ - # Broken: fails on valid input. - continue - fi -+ - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -6340,24 +6950,22 @@ - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -6368,6 +6976,7 @@ - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done -@@ -6385,8 +6994,8 @@ - else - ac_cv_prog_CXXCPP=$CXXCPP - fi --echo "$as_me:$LINENO: result: $CXXCPP" >&5 --echo "${ECHO_T}$CXXCPP" >&6 -+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -+echo "${ECHO_T}$CXXCPP" >&6; } - ac_preproc_ok=false - for ac_cxx_preproc_warn_flag in '' yes - do -@@ -6409,24 +7018,22 @@ - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then - : - else - echo "$as_me: failed program was:" >&5 -@@ -6435,9 +7042,10 @@ - # Broken: fails on valid input. - continue - fi -+ - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -6447,24 +7055,22 @@ - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then - # Broken: success on invalid input. - continue - else -@@ -6475,6 +7081,7 @@ - ac_preproc_ok=: - break - fi -+ - rm -f conftest.err conftest.$ac_ext - - done -@@ -6501,16 +7108,15 @@ - NOOPT_CFLAGS=-O0 - fi - --echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5 --echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5 -+echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6; } - kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -6537,34 +7143,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -6577,22 +7181,21 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - NOOPT_CXXFLAGS=-O0 - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - -- # Check whether --enable-coverage or --disable-coverage was given. -+ # Check whether --enable-coverage was given. - if test "${enable_coverage+set}" = set; then -- enableval="$enable_coverage" -- -+ enableval=$enable_coverage; - if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then - ac_coverage_compiler="-fprofile-arcs -ftest-coverage" - ac_coverage_linker="-lgcc" -@@ -6608,36 +7211,36 @@ - CXXFLAGS="$CXXFLAGS $ac_coverage_compiler" - LDFLAGS="$LDFLAGS $ac_coverage_linker" - --fi; -+fi -+ - - - - - - -- # Check whether --enable-new_ldflags or --disable-new_ldflags was given. -+ # Check whether --enable-new_ldflags was given. - if test "${enable_new_ldflags+set}" = set; then -- enableval="$enable_new_ldflags" -- kde_use_new_ldflags=$enableval -+ enableval=$enable_new_ldflags; kde_use_new_ldflags=$enableval - else - kde_use_new_ldflags=no --fi; -+fi -+ - - LDFLAGS_AS_NEEDED="" - LDFLAGS_NEW_DTAGS="" - if test "x$kde_use_new_ldflags" = "xyes"; then - LDFLAGS_NEW_DTAGS="" - --echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5 --echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--enable-new-dtags" >&5 -+echo $ECHO_N "checking whether $CXX supports -Wl,--enable-new-dtags... $ECHO_C" >&6; } - kde_cache=`echo Wl,--enable-new-dtags | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -6664,34 +7267,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -6704,29 +7305,28 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - LDFLAGS_NEW_DTAGS="-Wl,--enable-new-dtags" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi - - - --echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5 --echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--as-needed" >&5 -+echo $ECHO_N "checking whether $CXX supports -Wl,--as-needed... $ECHO_C" >&6; } - kde_cache=`echo Wl,--as-needed | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -6753,34 +7353,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -6793,13 +7391,13 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - LDFLAGS_AS_NEEDED="-Wl,--as-needed" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi -@@ -6809,13 +7407,13 @@ - - - -- # Check whether --enable-final or --disable-final was given. -+ # Check whether --enable-final was given. - if test "${enable_final+set}" = set; then -- enableval="$enable_final" -- kde_use_final=$enableval -+ enableval=$enable_final; kde_use_final=$enableval - else - kde_use_final=no --fi; -+fi -+ - - if test "x$kde_use_final" = "xyes"; then - KDE_USE_FINAL_TRUE="" -@@ -6828,13 +7426,13 @@ - - - -- # Check whether --enable-closure or --disable-closure was given. -+ # Check whether --enable-closure was given. - if test "${enable_closure+set}" = set; then -- enableval="$enable_closure" -- kde_use_closure=$enableval -+ enableval=$enable_closure; kde_use_closure=$enableval - else - kde_use_closure=no --fi; -+fi -+ - - KDE_NO_UNDEFINED="" - if test "x$kde_use_closure" = "xyes"; then -@@ -6845,216 +7443,36 @@ - KDE_USE_CLOSURE_TRUE="#" - KDE_USE_CLOSURE_FALSE="" - KDE_NO_UNDEFINED="" -- case $host in -- *-*-linux-gnu) -+ fi - --echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5 --echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6 --kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ -+ -+ -+ -+ # Check whether --enable-nmcheck was given. -+if test "${enable_nmcheck+set}" = set; then -+ enableval=$enable_nmcheck; kde_use_nmcheck=$enableval - else -+ kde_use_nmcheck=no -+fi - - -+ if test "$kde_use_nmcheck" = "yes"; then -+ KDE_USE_NMCHECK_TRUE="" -+ KDE_USE_NMCHECK_FALSE="#" -+ else -+ KDE_USE_NMCHECK_TRUE="#" -+ KDE_USE_NMCHECK_FALSE="" -+ fi - -- ac_ext=cc --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - --ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - - -- save_CXXFLAGS="$CXXFLAGS" -- CXXFLAGS="$CXXFLAGS -Wl,--no-undefined" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- return 0; -- ; -- 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' -- { (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 -- eval "kde_cv_prog_cxx_$kde_cache=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- CXXFLAGS="$save_CXXFLAGS" -- ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- --fi -- --if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- : -- --echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5 --echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6 --kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- -- -- -- ac_ext=cc --ac_cpp='$CXXCPP $CPPFLAGS' --ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -- --ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -- -- -- save_CXXFLAGS="$CXXFLAGS" -- CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- return 0; -- ; -- 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' -- { (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 -- eval "kde_cv_prog_cxx_$kde_cache=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -- CXXFLAGS="$save_CXXFLAGS" -- ac_ext=c --ac_cpp='$CPP $CPPFLAGS' --ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' --ac_compiler_gnu=$ac_cv_c_compiler_gnu -- -- --fi -- --if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -- : -- KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined" --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- : -- KDE_NO_UNDEFINED="" --fi -- --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- : -- KDE_NO_UNDEFINED="" --fi -- -- ;; -- esac -- fi -- -- -- -- -- -- # Check whether --enable-nmcheck or --disable-nmcheck was given. --if test "${enable_nmcheck+set}" = set; then -- enableval="$enable_nmcheck" -- kde_use_nmcheck=$enableval --else -- kde_use_nmcheck=no --fi; -- -- if test "$kde_use_nmcheck" = "yes"; then -- KDE_USE_NMCHECK_TRUE="" -- KDE_USE_NMCHECK_FALSE="#" -- else -- KDE_USE_NMCHECK_TRUE="#" -- KDE_USE_NMCHECK_FALSE="" -- fi -- - - -- -- -- --# Check whether --enable-shared or --disable-shared was given. -+# Check whether --enable-shared was given. - if test "${enable_shared+set}" = set; then -- enableval="$enable_shared" -- p=${PACKAGE-default} -+ enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; -@@ -7073,12 +7491,12 @@ - esac - else - enable_shared=yes --fi; -+fi - --# Check whether --enable-static or --disable-static was given. -+ -+# Check whether --enable-static was given. - if test "${enable_static+set}" = set; then -- enableval="$enable_static" -- p=${PACKAGE-default} -+ enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; -@@ -7097,18 +7515,19 @@ - esac - else - enable_static=no --fi; -+fi - - - - -- # Check whether --enable-libsuffix or --disable-libsuffix was given. -+ -+ # Check whether --enable-libsuffix was given. - if test "${enable_libsuffix+set}" = set; then -- enableval="$enable_libsuffix" -- kdelibsuff=$enableval -+ enableval=$enable_libsuffix; kdelibsuff=$enableval - else - kdelibsuff="auto" --fi; -+fi -+ - - if test "$kdelibsuff" = "auto"; then - -@@ -7129,8 +7548,8 @@ - kdelibsuff= - fi - if test -z "$kdelibsuff"; then -- echo "$as_me:$LINENO: result: not using lib directory suffix" >&5 --echo "${ECHO_T}not using lib directory suffix" >&6 -+ { echo "$as_me:$LINENO: result: not using lib directory suffix" >&5 -+echo "${ECHO_T}not using lib directory suffix" >&6; } - - cat >>confdefs.h <<\_ACEOF - #define KDELIBSUFF "" -@@ -7146,14 +7565,13 @@ - #define KDELIBSUFF "${kdelibsuff}" - _ACEOF - -- echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5 --echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6 -+ { echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5 -+echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6; } - fi - --# Check whether --enable-fast-install or --disable-fast-install was given. -+# Check whether --enable-fast-install was given. - if test "${enable_fast_install+set}" = set; then -- enableval="$enable_fast_install" -- p=${PACKAGE-default} -+ enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; -@@ -7172,10 +7590,11 @@ - esac - else - enable_fast_install=yes --fi; -+fi - --echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 --echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 -+ -+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } - if test "${lt_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -7188,18 +7607,19 @@ - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then -+ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done - done -+IFS=$as_save_IFS - lt_ac_max=0 - lt_ac_count=0 - # Add /usr/xpg4/bin/sed as it is typically found on Solaris - # along with /bin/sed that truncates output. - for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -- test ! -f $lt_ac_sed && break -+ test ! -f $lt_ac_sed && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in -@@ -7228,37 +7648,185 @@ - fi - - SED=$lt_cv_path_SED --echo "$as_me:$LINENO: result: $SED" >&5 --echo "${ECHO_T}$SED" >&6 - --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -+{ echo "$as_me:$LINENO: result: $SED" >&5 -+echo "${ECHO_T}$SED" >&6; } -+ -+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -+if test "${ac_cv_path_GREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # Extract the first word of "grep ggrep" to use in msg output -+if test -z "$GREP"; then -+set dummy grep ggrep; ac_prog_name=$2 -+if test "${ac_cv_path_GREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_path_GREP_found=false -+# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+ # Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ -+ $ac_path_GREP_found && break 3 -+ done -+done -+ -+done -+IFS=$as_save_IFS -+ -+ -+fi -+ -+GREP="$ac_cv_path_GREP" -+if test -z "$GREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+else -+ ac_cv_path_GREP=$GREP -+fi -+ -+ -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -+echo "${ECHO_T}$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ echo "$as_me:$LINENO: checking for egrep" >&5 -+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -+if test "${ac_cv_path_EGREP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ # Extract the first word of "egrep" to use in msg output -+if test -z "$EGREP"; then -+set dummy egrep; ac_prog_name=$2 -+if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -+ ac_path_EGREP_found=false -+# Loop through the user's path and test for each of PROGNAME-LIST -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+ # Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ ac_count=`expr $ac_count + 1` -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count - fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ -+ $ac_path_EGREP_found && break 3 -+ done -+done -+ -+done -+IFS=$as_save_IFS -+ -+ -+fi -+ -+EGREP="$ac_cv_path_EGREP" -+if test -z "$EGREP"; then -+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+else -+ ac_cv_path_EGREP=$EGREP - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep -+ -+ -+ fi -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" - - - --# Check whether --with-gnu-ld or --without-gnu-ld was given. -+# Check whether --with-gnu-ld was given. - if test "${with_gnu_ld+set}" = set; then -- withval="$with_gnu_ld" -- test "$withval" = no || with_gnu_ld=yes -+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes - else - with_gnu_ld=no --fi; -+fi -+ - ac_prog=ld - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. -- echo "$as_me:$LINENO: checking for ld used by $CC" >&5 --echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw -@@ -7287,11 +7855,11 @@ - ;; - esac - elif test "$with_gnu_ld" = yes; then -- echo "$as_me:$LINENO: checking for GNU ld" >&5 --echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for GNU ld" >&5 -+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } - else -- echo "$as_me:$LINENO: checking for non-GNU ld" >&5 --echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } - fi - if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -7304,7 +7872,7 @@ - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some GNU ld's only accept -v. -+ # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 --echo "${ECHO_T}$LD" >&6 -+ { echo "$as_me:$LINENO: result: $LD" >&5 -+echo "${ECHO_T}$LD" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 - echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } --echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 --echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } - if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # I'd rather use --version here, but apparently some GNU ld's only accept -v. -+ # I'd rather use --version here, but apparently some GNU lds only accept -v. - case `$LD -v 2>&1 &5 --echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } - with_gnu_ld=$lt_cv_prog_gnu_ld - - --echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 --echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } - if test "${lt_cv_ld_reload_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_ld_reload_flag='-r' - fi --echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 --echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } - reload_flag=$lt_cv_ld_reload_flag - case $reload_flag in - "" | " "*) ;; - *) reload_flag=" $reload_flag" ;; - esac - reload_cmds='$LD$reload_flag -o $output$reload_objs' -+case $host_os in -+ darwin*) -+ if test "$GCC" = yes; then -+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' -+ else -+ reload_cmds='$LD$reload_flag -o $output$reload_objs' -+ fi -+ ;; -+esac - --echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 --echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } - if test "${lt_cv_path_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -7378,56 +7955,63 @@ - # 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 --echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 --echo "${ECHO_T}$lt_cv_path_NM" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -+echo "${ECHO_T}$lt_cv_path_NM" >&6; } - NM="$lt_cv_path_NM" - --echo "$as_me:$LINENO: checking whether ln -s works" >&5 --echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } - LN_S=$as_ln_s - if test "$LN_S" = "ln -s"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else -- echo "$as_me:$LINENO: result: no, using $LN_S" >&5 --echo "${ECHO_T}no, using $LN_S" >&6 -+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -+echo "${ECHO_T}no, using $LN_S" >&6; } - fi - --echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 --echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } - if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -7454,44 +8038,42 @@ - lt_cv_deplibs_check_method=pass_all - ;; - --bsdi4*) -+bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - - cygwin*) -- lt_cv_deplibs_check_method=pass_all -+ # func_win32_libid is a shell function defined in ltmain.sh -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' - ;; - - mingw* | pw32*) -- # win32_libid is a shell function defined in ltmain.sh -- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -- lt_cv_file_magic_cmd='win32_libid' -+ # Base MSYS/MinGW do not provide the 'file' command needed by -+ # func_win32_libid shell function, so use a weaker test based on 'objdump', -+ # unless we find 'file', for example because we are cross-compiling. -+ if ( file / ) >/dev/null 2>&1; then -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ else -+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ fi - ;; - - darwin* | rhapsody*) -- # this will be overwritten by pass_all, but leave it in just in case -- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' -- lt_cv_file_magic_cmd='/usr/bin/file -L' -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System` -- ;; -- *) # Darwin 1.3 on -- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' -- ;; -- esac - lt_cv_deplibs_check_method=pass_all - ;; - --freebsd* | kfreebsd*-gnu) -+freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; -@@ -7507,7 +8089,7 @@ - - hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file -- case "$host_cpu" in -+ case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -@@ -7523,43 +8105,27 @@ - esac - ;; - -+interix[3-9]*) -+ # 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*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" -- ;; -- *) -- case $LD in -- *-32|*"-32 ") libmagic=32-bit;; -- *-n32|*"-n32 ") libmagic=N32;; -- *-64|*"-64 ") libmagic=64-bit;; -- *) libmagic=never-match;; -- esac -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1" -- ;; -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-n32|*"-n32 ") libmagic=N32;; -+ *-64|*"-64 ") libmagic=64-bit;; -+ *) libmagic=never-match;; - esac -- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` - lt_cv_deplibs_check_method=pass_all - ;; - - # This must be Linux ELF. --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 ;; -- # the debian people say, arm and glibc 2.3.1 works for them with pass_all -- arm* ) -- lt_cv_deplibs_check_method=pass_all ;; -- *) -- # glibc up to 2.1.1 does not perform some relocations on ARM -- 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) - 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 -@@ -7578,32 +8144,26 @@ - ;; - - openbsd*) -- lt_cv_file_magic_cmd=/usr/bin/file -- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else -- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' -+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; - - osf3* | osf4* | osf5*) -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' -- lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - --sco3.2v5*) -+rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - - solaris*) - lt_cv_deplibs_check_method=pass_all -- lt_cv_file_magic_test_file=/lib/libc.so - ;; - --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]' -@@ -7624,17 +8184,20 @@ - 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 - - fi --echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 --echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } - file_magic_cmd=$lt_cv_file_magic_cmd - deplibs_check_method=$lt_cv_deplibs_check_method - test -z "$deplibs_check_method" && deplibs_check_method=unknown -@@ -7643,14 +8206,17 @@ - # 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 whether --enable-libtool-lock or --disable-libtool-lock was given. -+# Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then -- enableval="$enable_libtool_lock" -+ enableval=$enable_libtool_lock; -+fi - --fi; - test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - - # Some flags need to be propagated to the compiler or linker for good -@@ -7677,7 +8243,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 7680 "configure"' > conftest.$ac_ext -+ echo '#line 8246 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -7712,7 +8278,8 @@ - rm -rf conftest* - ;; - --x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -7720,14 +8287,16 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- case "`/usr/bin/file conftest.o`" in -+ case `/usr/bin/file conftest.o` in - *32-bit*) -- LINUX_64_MODE="32" - case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; -- ppc64-*linux*) -+ ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) -@@ -7739,8 +8308,10 @@ - esac - ;; - *64-bit*) -- LINUX_64_MODE="64" - case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; -@@ -7764,8 +8335,8 @@ - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" -- echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 --echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } - if test "${lt_cv_cc_needs_belf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -7791,35 +8362,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - lt_cv_cc_needs_belf=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --lt_cv_cc_needs_belf=no -+ lt_cv_cc_needs_belf=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -7828,13 +8396,33 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 --echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -+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 - -@@ -7842,8 +8430,8 @@ - - - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } - if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -7867,35 +8455,31 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_header_stdc=no -+ ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -@@ -7951,6 +8535,7 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include -+#include - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -7970,18 +8555,27 @@ - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -7994,12 +8588,14 @@ - ( exit $ac_status ) - ac_cv_header_stdc=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi -+ -+ - fi - fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -+echo "${ECHO_T}$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -8022,9 +8618,9 @@ - inttypes.h stdint.h unistd.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -8038,38 +8634,35 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_Header=no" -+ eval "$as_ac_Header=no" - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -@@ -8084,18 +8677,19 @@ - for ac_header in dlfcn.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -8106,41 +8700,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -8149,24 +8739,22 @@ - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -8174,9 +8762,10 @@ - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -8200,25 +8789,19 @@ - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -8230,17 +8813,250 @@ - - done - -+ -+ -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } -+if test -z "$CXXCPP"; then -+ if test "${ac_cv_prog_CXXCPP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # Double quotes because CXXCPP needs to be expanded -+ for CXXCPP in "$CXX -E" "/lib/cpp" -+ do -+ ac_preproc_ok=false -+for ac_cxx_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Broken: fails on valid input. -+continue -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+ -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ # Broken: success on invalid input. -+continue -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+ -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ break -+fi -+ -+ done -+ ac_cv_prog_CXXCPP=$CXXCPP -+ -+fi -+ CXXCPP=$ac_cv_prog_CXXCPP -+else -+ ac_cv_prog_CXXCPP=$CXXCPP -+fi -+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -+echo "${ECHO_T}$CXXCPP" >&6; } -+ac_preproc_ok=false -+for ac_cxx_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer to if __STDC__ is defined, since -+ # exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ Syntax error -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Broken: fails on valid input. -+continue -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+ -+ # OK, works on sane cases. Now check whether nonexistent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ # Broken: success on invalid input. -+continue -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+ -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ : -+else -+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+See \`config.log' for more details." >&5 -+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+ac_ext=cpp -+ac_cpp='$CXXCPP $CPPFLAGS' -+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -+ -+fi -+ - ac_ext=f - ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' - ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_f77_compiler_gnu - if test -n "$ac_tool_prefix"; then -- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran -+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -8253,36 +9069,38 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - F77=$ac_cv_prog_F77 - if test -n "$F77"; then -- echo "$as_me:$LINENO: result: $F77" >&5 --echo "${ECHO_T}$F77" >&6 -+ { echo "$as_me:$LINENO: result: $F77" >&5 -+echo "${ECHO_T}$F77" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$F77" && break - done - fi - if test -z "$F77"; then - ac_ct_F77=$F77 -- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran -+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -8295,48 +9113,78 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_F77="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - ac_ct_F77=$ac_cv_prog_ac_ct_F77 - if test -n "$ac_ct_F77"; then -- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 --echo "${ECHO_T}$ac_ct_F77" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -+echo "${ECHO_T}$ac_ct_F77" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - test -n "$ac_ct_F77" && break - done - -- F77=$ac_ct_F77 -+ if test "x$ac_ct_F77" = x; then -+ F77="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ F77=$ac_ct_F77 -+ fi - fi - - - # Provide some information about the compiler. --echo "$as_me:8325:" \ -- "checking for Fortran 77 compiler version" >&5 -+echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 - ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -+{ (ac_try="$ac_compiler --version >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -+{ (ac_try="$ac_compiler -v >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+{ (ac_try="$ac_compiler -V >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -@@ -8346,8 +9194,8 @@ - # input file. (Note that this only needs to work for GNU compilers.) - ac_save_ext=$ac_ext - ac_ext=F --echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } - if test "${ac_cv_f77_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -8360,46 +9208,42 @@ - end - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_f77_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } - ac_ext=$ac_save_ext - ac_test_FFLAGS=${FFLAGS+set} - ac_save_FFLAGS=$FFLAGS - FFLAGS= --echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 --echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -+echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } - if test "${ac_cv_prog_f77_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -8410,39 +9254,35 @@ - end - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_prog_f77_g=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_prog_f77_g=no -+ ac_cv_prog_f77_g=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 --echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } - if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS - elif test $ac_cv_prog_f77_g = yes; then -@@ -8471,13 +9311,13 @@ - # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! - - # find the maximum length of command line arguments --echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 --echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -+echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } - if test "${lt_cv_sys_max_cmd_len+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - i=0 -- testring="ABCD" -+ teststring="ABCD" - - case $build_os in - msdosdjgpp*) -@@ -8506,43 +9346,97 @@ - lt_cv_sys_max_cmd_len=8192; - ;; - -- *) -- # If test is not a shell built-in, we'll probably end up computing a -- # maximum length that is only half of the actual maximum length, but -- # we can't tell. -- while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \ -- = "XX$testring") >/dev/null 2>&1 && -- new_result=`expr "X$testring" : ".*" 2>&1` && -- lt_cv_sys_max_cmd_len=$new_result && -- test $i != 17 # 1/2 MB should be enough -- do -- i=`expr $i + 1` -- testring=$testring$testring -- done -- testring= -- # 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. -- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ ;; -+ -+ 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 -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac -+ fi -+ ;; -+ 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 -+ ;; -+ *) -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ 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` -+ else -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ -+ = "XX$teststring") >/dev/null 2>&1 && -+ new_result=`expr "X$teststring" : ".*" 2>&1` && -+ lt_cv_sys_max_cmd_len=$new_result && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ teststring= -+ # 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. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ fi - ;; - esac - - fi - - if test -n $lt_cv_sys_max_cmd_len ; then -- echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 --echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 -+ { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -+echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } - else -- echo "$as_me:$LINENO: result: none" >&5 --echo "${ECHO_T}none" >&6 -+ { echo "$as_me:$LINENO: result: none" >&5 -+echo "${ECHO_T}none" >&6; } - fi - - - - -+ - # Check for command to grab the raw symbol name followed by C symbol from nm. --echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 --echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -+echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } - if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -8556,9 +9450,6 @@ - # Regexp to match symbols that can be accessed directly from C. - sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - --# Transform the above into a raw symbol and a C symbol. --symxfrm='\1 \2\3 \3' -- - # Transform an extracted symbol line into a proper C declaration - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" - -@@ -8580,14 +9471,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* | 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'" -+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" -+ fi -+ ;; - irix* | nonstopux*) - symcode='[BCDEGRST]' - ;; - osf*) - symcode='[BCDEGQRST]' - ;; --solaris* | sysv5*) -- symcode='[BDT]' -+solaris*) -+ symcode='[BDRT]' -+ ;; -+sco3.2v5*) -+ symcode='[DT]' -+ ;; -+sysv4.2uw2*) -+ symcode='[DT]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[ABDT]' - ;; - sysv4) - symcode='[DFNSTU]' -@@ -8605,14 +9512,17 @@ - # If we're using GNU nm, then use its standard symbol codes. - case `$NM -V 2>&1` in - *GNU* | *'with BFD'*) -- symcode='[ABCDGISTW]' ;; -+ symcode='[ABCDGIRSTW]' ;; - esac - - # Try without a prefix undercore, then with it. - for ac_symprfx in "" "_"; do - -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" -+ - # Write the raw and C identifiers. -- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" - - # Check to see that the pipe works correctly. - pipe_works=no -@@ -8730,15 +9640,15 @@ - lt_cv_sys_global_symbol_to_cdecl= - fi - if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -- echo "$as_me:$LINENO: result: failed" >&5 --echo "${ECHO_T}failed" >&6 -+ { echo "$as_me:$LINENO: result: failed" >&5 -+echo "${ECHO_T}failed" >&6; } - else -- echo "$as_me:$LINENO: result: ok" >&5 --echo "${ECHO_T}ok" >&6 -+ { echo "$as_me:$LINENO: result: ok" >&5 -+echo "${ECHO_T}ok" >&6; } - fi - --echo "$as_me:$LINENO: checking for objdir" >&5 --echo $ECHO_N "checking for objdir... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for objdir" >&5 -+echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } - if test "${lt_cv_objdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -8752,8 +9662,8 @@ - fi - rmdir .libs 2>/dev/null - fi --echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 --echo "${ECHO_T}$lt_cv_objdir" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -+echo "${ECHO_T}$lt_cv_objdir" >&6; } - objdir=$lt_cv_objdir - - -@@ -8774,7 +9684,7 @@ - - # Sed substitution that helps us do robust quoting. It backslashifies - # metacharacters that are still active within double-quoted strings. --Xsed='sed -e s/^X//' -+Xsed='sed -e 1s/^X//' - sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' - - # Same as above, but do not quote variable references. -@@ -8794,7 +9704,7 @@ - default_ofile=libtool - can_build_shared=yes - --# All known linkers require a `.a' archive for static linking (except M$VC, -+# All known linkers require a `.a' archive for static linking (except MSVC, - # which needs '.lib'). - libext=a - ltmain="$ac_aux_dir/ltmain.sh" -@@ -8804,8 +9714,8 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -8818,32 +9728,34 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="${ac_tool_prefix}ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - AR=$ac_cv_prog_AR - if test -n "$AR"; then -- echo "$as_me:$LINENO: result: $AR" >&5 --echo "${ECHO_T}$AR" >&6 -+ { echo "$as_me:$LINENO: result: $AR" >&5 -+echo "${ECHO_T}$AR" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. - set dummy ar; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -8856,27 +9768,41 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" - fi - fi - ac_ct_AR=$ac_cv_prog_ac_ct_AR - if test -n "$ac_ct_AR"; then -- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 --echo "${ECHO_T}$ac_ct_AR" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -+echo "${ECHO_T}$ac_ct_AR" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- AR=$ac_ct_AR -+ if test "x$ac_ct_AR" = x; then -+ AR="false" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ AR=$ac_ct_AR -+ fi - else - AR="$ac_cv_prog_AR" - fi -@@ -8884,8 +9810,8 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -8898,32 +9824,34 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+ { echo "$as_me:$LINENO: result: $RANLIB" >&5 -+echo "${ECHO_T}$RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -8936,27 +9864,41 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" - fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -+echo "${ECHO_T}$ac_ct_RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- RANLIB=$ac_ct_RANLIB -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ RANLIB=$ac_ct_RANLIB -+ fi - else - RANLIB="$ac_cv_prog_RANLIB" - fi -@@ -8964,8 +9906,8 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -8978,32 +9920,34 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - fi - fi - STRIP=$ac_cv_prog_STRIP - if test -n "$STRIP"; then -- echo "$as_me:$LINENO: result: $STRIP" >&5 --echo "${ECHO_T}$STRIP" >&6 -+ { echo "$as_me:$LINENO: result: $STRIP" >&5 -+echo "${ECHO_T}$STRIP" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -9016,27 +9960,41 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" - fi - fi - ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP - if test -n "$ac_ct_STRIP"; then -- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 --echo "${ECHO_T}$ac_ct_STRIP" >&6 -+ { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -+echo "${ECHO_T}$ac_ct_STRIP" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - -- STRIP=$ac_ct_STRIP -+ if test "x$ac_ct_STRIP" = x; then -+ STRIP=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&5 -+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -+whose name does not start with the host triplet. If you think this -+configuration is useful to you, please write to autoconf@gnu.org." >&2;} -+ac_tool_warned=yes ;; -+esac -+ STRIP=$ac_ct_STRIP -+ fi - else - STRIP="$ac_cv_prog_STRIP" - fi -@@ -9051,6 +10009,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" -@@ -9063,28 +10022,39 @@ - test -z "$ac_objext" && ac_objext=o - - # Determine commands to create old-style static archives. --old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' - old_postinstall_cmds='chmod 644 $oldlib' - old_postuninstall_cmds= - - 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 - -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ -+ - # Only perform the check for file, if the check method requires it - case $deplibs_check_method in - file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then -- echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 --echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -+echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } - if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -9104,7 +10074,7 @@ - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) -- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then -@@ -9136,17 +10106,17 @@ - - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if test -n "$MAGIC_CMD"; then -- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 --echo "${ECHO_T}$MAGIC_CMD" >&6 -+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+echo "${ECHO_T}$MAGIC_CMD" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then -- echo "$as_me:$LINENO: checking for file" >&5 --echo $ECHO_N "checking for file... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for file" >&5 -+echo $ECHO_N "checking for file... $ECHO_C" >&6; } - if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -9166,7 +10136,7 @@ - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) -- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then -@@ -9198,11 +10168,11 @@ - - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if test -n "$MAGIC_CMD"; then -- echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 --echo "${ECHO_T}$MAGIC_CMD" >&6 -+ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -+echo "${ECHO_T}$MAGIC_CMD" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - else -@@ -9217,21 +10187,21 @@ - enable_dlopen=yes - enable_win32_dll=no - --# Check whether --enable-libtool-lock or --disable-libtool-lock was given. -+# Check whether --enable-libtool-lock was given. - if test "${enable_libtool_lock+set}" = set; then -- enableval="$enable_libtool_lock" -+ enableval=$enable_libtool_lock; -+fi - --fi; - test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - - --# Check whether --with-pic or --without-pic was given. -+# Check whether --with-pic was given. - if test "${with_pic+set}" = set; then -- withval="$with_pic" -- pic_mode="$withval" -+ withval=$with_pic; pic_mode="$withval" - else - pic_mode=default --fi; -+fi -+ - test -z "$pic_mode" && pic_mode=default - - # Use C for the default configuration in the libtool script -@@ -9252,77 +10222,34 @@ - objext=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -+lt_simple_compile_test_code="int some_variable = 0;" - - # Code to be used in simple link tests --lt_simple_link_test_code='int main(){return(0);}\n' -+lt_simple_link_test_code='int main(){return(0);}' - - - # 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 -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+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 -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* - - - ## CAVEAT EMPTOR: -@@ -9336,14 +10263,14 @@ - lt_prog_compiler_no_builtin_flag=' -fno-builtin' - - --echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 --echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -9351,26 +10278,28 @@ - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9357: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10284: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9361: \$? = $ac_status" >&5 -+ echo "$as_me:10288: \$? = $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 -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 - $rm conftest* - - fi --echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } - - if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -@@ -9384,8 +10313,8 @@ - lt_prog_compiler_pic= - lt_prog_compiler_static= - --echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -9407,13 +10336,15 @@ - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - -@@ -9423,6 +10354,11 @@ - lt_prog_compiler_pic='-fno-common' - ;; - -+ interix[3-9]*) -+ # 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. -@@ -9439,7 +10375,7 @@ - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -9465,8 +10401,18 @@ - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic='-qnocommon' -+ lt_prog_compiler_wl='-Wl,' -+ ;; -+ esac -+ ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' -@@ -9476,7 +10422,7 @@ - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -9499,18 +10445,41 @@ - lt_prog_compiler_static='-Bstatic' - ;; - -- linux*) -- case $CC in -+ linux* | k*bsd*-gnu) -+ case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl='-Wl,' -+ lt_prog_compiler_pic='-fpic' -+ lt_prog_compiler_static='-Bstatic' -+ ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ lt_prog_compiler_wl='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic='-KPIC' -+ lt_prog_compiler_static='-Bstatic' -+ lt_prog_compiler_wl='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -9520,15 +10489,19 @@ - lt_prog_compiler_static='-non_shared' - ;; - -- sco3.2v5*) -- lt_prog_compiler_pic='-Kpic' -- lt_prog_compiler_static='-dn' -+ rdos*) -+ lt_prog_compiler_static='-non_shared' - ;; - - solaris*) -- lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl='-Wl,';; -+ esac - ;; - - sunos4*) -@@ -9537,7 +10510,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' -@@ -9550,6 +10523,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 -+ ;; -+ - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' -@@ -9561,22 +10545,22 @@ - esac - fi - --echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic" >&6 -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic"; then - --echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 --echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } - if test "${lt_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -9584,26 +10568,28 @@ - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9590: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10574: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9594: \$? = $ac_status" >&5 -+ echo "$as_me:10578: \$? = $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 -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 - $rm conftest* - - fi --echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; } - - if test x"$lt_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in -@@ -9616,7 +10602,7 @@ - fi - - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= -@@ -9626,8 +10612,50 @@ - ;; - esac - --echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+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" -+ echo "$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 - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -9636,14 +10664,7 @@ - mkdir conftest - cd conftest - mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -- -- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers -- # that will create temporary files in the current directory regardless of -- # the output directory. Thus, making CWD read-only will cause this test -- # to fail, enabling locking or at least warning the user not to do parallel -- # builds. -- chmod -w . -+ echo "$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 -@@ -9651,47 +10672,52 @@ - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9657: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10678: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:9661: \$? = $ac_status" >&5 -+ echo "$as_me:10682: \$? = $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 -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 -- chmod u+w . -- $rm conftest* out/* -- rmdir out -+ chmod u+w . 2>&5 -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* - - fi --echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } - - - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 --echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- echo "$as_me:$LINENO: result: $hard_links" >&5 --echo "${ECHO_T}$hard_links" >&6 -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 - echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -@@ -9701,8 +10727,8 @@ - need_locks=no - fi - --echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - runpath_var= - allow_undefined_flag= -@@ -9740,6 +10766,16 @@ - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -9750,6 +10786,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 - ;; -@@ -9760,6 +10800,27 @@ - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) -@@ -9797,7 +10858,7 @@ - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME -- archive_cmds='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' -+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi -@@ -9807,13 +10868,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' -- allow_undefined_flag=no -+ allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes -- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ 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 -@@ -9822,23 +10883,79 @@ - 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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ -+ interix[3-9]*) -+ 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' -+ ;; -+ -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ link_all_deplibs=no - else - ld_shlibs=no - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else -- archive_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -- solaris* | sysv5*) -+ solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <&2 -@@ -9852,13 +10969,40 @@ - - EOF - elif $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' -- archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - -+ 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= -@@ -9868,24 +11012,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' -- archive_expsym_cmds='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - -- if test "$ld_shlibs" = yes; then -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec='${wl}--export-dynamic' -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec= -- fi -+ if test "$ld_shlibs" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec= -+ export_dynamic_flag_spec= -+ whole_archive_flag_spec= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) -@@ -9897,7 +11036,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 -@@ -9919,9 +11058,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 -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac - -- # KDE requires run time linking. Make it the default. -- aix_use_runtimelinking=yes - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi -@@ -9938,7 +11089,7 @@ - link_all_deplibs=yes - - if test "$GCC" = yes; then -- case $host_os in aix4.012|aix4.012.*) -+ case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` -@@ -9946,7 +11097,7 @@ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- hardcode_direct=yes -+ : - else - # We have old collect2 - hardcode_direct=unsupported -@@ -9957,8 +11108,12 @@ - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi -+ ;; - esac - shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -9966,22 +11121,23 @@ - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else -- 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 - -- # Let the compiler handle the export list. -- always_export_symbols=no -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols=yes - 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. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an empty executable. -- cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -9997,50 +11153,54 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - -- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -- 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 '"\${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 '"\${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 -@@ -10059,39 +11219,44 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - -@@ -10100,13 +11265,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='$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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; -@@ -10119,7 +11282,7 @@ - ld_shlibs=no - ;; - -- bsdi4*) -+ bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - -@@ -10129,68 +11292,68 @@ - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' -- allow_undefined_flag=no -+ allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. -- shrext=".dll" -+ shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. -- archive_cmds='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds='true' - # FIXME: Should let the user specify the lib program. -- old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' -+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes - ;; - - darwin* | rhapsody*) -- if test "$GXX" = yes ; then -- archive_cmds_need_lc=no -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag='-Wl,-undefined -Wl,suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.012) -- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- ;; -- 10.*) -- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup' -- ;; -- esac -- fi -- ;; -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; - esac -- lt_int_apple_cc_single_mod=no -- output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -- fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' -- else -- archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' -- fi -- module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported -- whole_archive_flag_spec='-all_load $convenience' -+ whole_archive_flag_spec='' - link_all_deplibs=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else -- ld_shlibs=no -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs=no -+ ;; -+ esac - fi - ;; - -@@ -10224,8 +11387,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* | dragonfly*) -+ archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no -@@ -10233,7 +11396,7 @@ - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - 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 -@@ -10247,47 +11410,62 @@ - export_dynamic_flag_spec='${wl}-E' - ;; - -- 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*) -+ 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' -+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - 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*) -+ 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' - ;; - *) -- 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*|ia64*) - hardcode_libdir_flag_spec_ld='+b $libdir' -- 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' - -@@ -10301,7 +11479,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' -+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds='$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' -@@ -10311,7 +11489,7 @@ - link_all_deplibs=yes - ;; - -- netbsd*) -+ 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 -@@ -10331,23 +11509,28 @@ - ;; - - openbsd*) -- hardcode_direct=yes -- hardcode_shlibpath_var=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- export_dynamic_flag_spec='${wl}-E' -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct=yes -+ hardcode_shlibpath_var=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi - else -- case $host_os in -- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec='-R$libdir' -- ;; -- *) -- archive_cmds='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' -- hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -- ;; -- esac -+ ld_shlibs=no - fi - ;; - -@@ -10355,14 +11538,14 @@ - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported -- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' -+ archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $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' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - 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' -@@ -10374,13 +11557,13 @@ - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' -@@ -10388,21 +11571,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 -- archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' -+ wlarc='${wl}' -+ archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else -+ wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -@@ -10411,8 +11588,17 @@ - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; -- *) # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - esac - link_all_deplibs=yes - ;; -@@ -10421,7 +11607,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. -- archive_cmds='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' -+ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -10469,36 +11655,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* | sco3.2v5.0.[024]*) -+ 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,$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,$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' -+ -+ 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*) -@@ -10513,15 +11708,10 @@ - esac - fi - --echo "$as_me:$LINENO: result: $ld_shlibs" >&5 --echo "${ECHO_T}$ld_shlibs" >&6 -+{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -+echo "${ECHO_T}$ld_shlibs" >&6; } - test "$ld_shlibs" = no && can_build_shared=no - --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --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? - # -@@ -10539,10 +11729,10 @@ - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. -- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -10554,6 +11744,7 @@ - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl -+ pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= -@@ -10576,20 +11767,20 @@ - cat conftest.err 1>&5 - fi - $rm conftest* -- echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 --echo "${ECHO_T}$archive_cmds_need_lc" >&6 -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc" >&6; } - ;; - esac - fi - ;; - esac - --echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } - library_names_spec= - libname_spec='lib$name' - soname_spec= --shrext=".so" -+shrext_cmds=".so" - postinstall_cmds= - postuninstall_cmds= - finish_cmds= -@@ -10599,7 +11790,58 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+ -+if test "$GCC" = yes; then -+ case $host_os in -+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -+ *) lt_awk_arg="/^libraries:/" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[lt_foo]++; } -+ if (lt_freq[lt_foo] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -10664,7 +11906,7 @@ - amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - - beos*) -@@ -10673,7 +11915,7 @@ - shlibpath_var=LIBRARY_PATH - ;; - --bsdi4*) -+bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -10689,7 +11931,7 @@ - - cygwin* | mingw* | pw32*) - version_type=windows -- shrext=".dll" -+ shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - -@@ -10701,7 +11943,8 @@ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname' -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -@@ -10731,7 +11974,7 @@ - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; -@@ -10754,13 +11997,9 @@ - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH -- shrext='$(test .$module = .yes && echo .so || echo .dylib)' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -10777,20 +12016,17 @@ - dynamic_linker=no - ;; - --kfreebsd*-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' -- ;; -- --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -10808,14 +12044,19 @@ - freebsd2*) - shlibpath_overrides_runpath=yes - ;; -- freebsd3.01* | freebsdelf3.01*) -+ freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -- *) # 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 - ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - esac - ;; - -@@ -10835,9 +12076,9 @@ - version_type=sunos - need_lib_prefix=no - need_version=no -- case "$host_cpu" in -+ case $host_cpu in - ia64*) -- shrext='.so' -+ shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH -@@ -10852,7 +12093,7 @@ - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) -- shrext='.sl' -+ shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -@@ -10863,7 +12104,7 @@ - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) -- shrext='.sl' -+ shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -@@ -10875,6 +12116,18 @@ - postinstall_cmds='chmod 555 $lib' - ;; - -+interix[3-9]*) -+ 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 ;; -@@ -10918,29 +12171,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' -- libsuff= -- if test "x$LINUX_64_MODE" = x64; then -- # Some platforms are per default 64-bit, so there's no /lib64 -- if test -d /lib64; then -- libsuff=64 -- fi -- fi - 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 - -+ # 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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;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, -@@ -10950,6 +12200,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -10959,7 +12221,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 -@@ -10987,8 +12249,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. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -@@ -11008,7 +12275,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' -@@ -11026,11 +12293,8 @@ - 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 -+rdos*) -+ dynamic_linker=no - ;; - - solaris*) -@@ -11058,7 +12322,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' -@@ -11091,6 +12355,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}' -@@ -11102,16 +12389,21 @@ - dynamic_linker=no - ;; - esac --echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --echo "${ECHO_T}$dynamic_linker" >&6 -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - --echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } - hardcode_action= - if test -n "$hardcode_libdir_flag_spec" || \ -- test -n "$runpath_var " || \ -- test "X$hardcode_automatic"="Xyes" ; then -+ test -n "$runpath_var" || \ -+ test "X$hardcode_automatic" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && -@@ -11131,8 +12423,8 @@ - # directories. - hardcode_action=unsupported - fi --echo "$as_me:$LINENO: result: $hardcode_action" >&5 --echo "${ECHO_T}$hardcode_action" >&6 -+{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 -+echo "${ECHO_T}$hardcode_action" >&6; } - - if test "$hardcode_action" = relink; then - # Fast installation is not supported -@@ -11145,29 +12437,30 @@ - - striplib= - old_striplib= --echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 --echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } - if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else - # FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ old_striplib="$STRIP -S" -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - ;; - *) -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - ;; - esac - fi -@@ -11199,8 +12492,8 @@ - - darwin*) - # if libdl is installed we need to link against it -- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 --echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } - if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -11213,56 +12506,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char dlopen (); - int - main () - { --dlopen (); -+return dlopen (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_dl_dlopen=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } - if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" - else -@@ -11276,8 +12566,8 @@ - ;; - - *) -- echo "$as_me:$LINENO: checking for shl_load" >&5 --echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for shl_load" >&5 -+echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } - if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -11304,73 +12594,64 @@ - - #undef shl_load - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char shl_load (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_shl_load) || defined (__stub___shl_load) -+#if defined __stub_shl_load || defined __stub___shl_load - choke me --#else --char (*f) () = shl_load; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != shl_load; -+return shl_load (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_func_shl_load=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 --echo "${ECHO_T}$ac_cv_func_shl_load" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -+echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } - if test $ac_cv_func_shl_load = yes; then - lt_cv_dlopen="shl_load" - else -- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 --echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -+echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } - if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -11383,61 +12664,58 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char shl_load (); - int - main () - { --shl_load (); -+return shl_load (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_dld_shl_load=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 --echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -+echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } - if test $ac_cv_lib_dld_shl_load = yes; then - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld" - else -- echo "$as_me:$LINENO: checking for dlopen" >&5 --echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for dlopen" >&5 -+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } - if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -11464,73 +12742,64 @@ - - #undef dlopen - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char dlopen (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_dlopen) || defined (__stub___dlopen) -+#if defined __stub_dlopen || defined __stub___dlopen - choke me --#else --char (*f) () = dlopen; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != dlopen; -+return dlopen (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_func_dlopen=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 --echo "${ECHO_T}$ac_cv_func_dlopen" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } - if test $ac_cv_func_dlopen = yes; then - lt_cv_dlopen="dlopen" - else -- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 --echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } - if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -11543,61 +12812,58 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char dlopen (); - int - main () - { --dlopen (); -+return dlopen (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_dl_dlopen=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } - if test $ac_cv_lib_dl_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" - else -- echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 --echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -+echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } - if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -11610,61 +12876,58 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char dlopen (); - int - main () - { --dlopen (); -+return dlopen (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_svld_dlopen=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } - if test $ac_cv_lib_svld_dlopen = yes; then - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" - else -- echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 --echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -+echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } - if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -11677,56 +12940,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char dld_link (); - int - main () - { --dld_link (); -+return dld_link (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_dld_dld_link=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 --echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -+echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } - if test $ac_cv_lib_dld_dld_link = yes; then - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld" - fi -@@ -11761,13 +13021,13 @@ - 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" - -- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 --echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -+echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } - if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -11777,7 +13037,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <&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 ;; - 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 -@@ -11859,13 +13121,13 @@ - - - fi --echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 --echo "${ECHO_T}$lt_cv_dlopen_self" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } - - if test "x$lt_cv_dlopen_self" = xyes; then -- LDFLAGS="$LDFLAGS $link_static_flag" -- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 --echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -+echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } - if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -11875,7 +13137,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <&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 ;; - 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 -@@ -11957,8 +13221,8 @@ - - - fi --echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 --echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -+echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } - fi - - CPPFLAGS="$save_CPPFLAGS" -@@ -11979,19 +13243,19 @@ - fi - - --# Report which librarie types wil actually be built --echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 --echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $can_build_shared" >&5 --echo "${ECHO_T}$can_build_shared" >&6 -+# Report which library types will actually be built -+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+echo "${ECHO_T}$can_build_shared" >&6; } - --echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 --echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. --case "$host_os" in -+case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then -@@ -12000,58 +13264,21 @@ - fi - ;; - --aix4*) -+aix4* | aix5*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi -- ;; -- darwin* | rhapsody*) -- if test "$GCC" = yes; then -- archive_cmds_need_lc=no -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag='-Wl,-undefined -Wl,suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.012) -- allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- ;; -- 10.*) -- allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup' -- ;; -- esac -- fi -- ;; -- esac -- output_verbose_link_cmd='echo' -- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' -- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- hardcode_direct=no -- hardcode_automatic=yes -- hardcode_shlibpath_var=unsupported -- whole_archive_flag_spec='-all_load $convenience' -- link_all_deplibs=yes -- else -- ld_shlibs=no -- fi - ;; - esac --echo "$as_me:$LINENO: result: $enable_shared" >&5 --echo "${ECHO_T}$enable_shared" >&6 -+{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -+echo "${ECHO_T}$enable_shared" >&6; } - --echo "$as_me:$LINENO: checking whether to build static libraries" >&5 --echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes --echo "$as_me:$LINENO: result: $enable_static" >&5 --echo "${ECHO_T}$enable_static" >&6 -+{ echo "$as_me:$LINENO: result: $enable_static" >&5 -+echo "${ECHO_T}$enable_static" >&6; } - - # The else clause should only fire when bootstrapping the - # libtool distribution, otherwise you forgot to ship ltmain.sh -@@ -12066,7 +13293,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 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 \ -@@ -12107,6 +13335,7 @@ - module_cmds \ - module_expsym_cmds \ - lt_cv_prog_compiler_c_o \ -+ fix_srcfile_path \ - exclude_expsyms \ - include_expsyms; do - -@@ -12151,7 +13380,7 @@ - # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - # --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 - # Free Software Foundation, Inc. - # - # This file is part of GNU Libtool: -@@ -12180,11 +13409,11 @@ - SED=$lt_SED - - # Sed that helps us avoid accidentally triggering echo(1) options like -n. --Xsed="$SED -e s/^X//" -+Xsed="$SED -e 1s/^X//" - - # The HP-UX ksh and POSIX shell print the target directory to stdout - # if CDPATH is set. --if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - # The names of the tagged configurations supported by this script. - available_tags= -@@ -12214,6 +13443,12 @@ - # The host system. - host_alias=$host_alias - host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - - # An echo program that does not interpret backslashes. - echo=$lt_echo -@@ -12225,6 +13460,9 @@ - # A C compiler. - LTCC=$lt_LTCC - -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ - # A language-specific compiler. - CC=$lt_compiler - -@@ -12244,7 +13482,7 @@ - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -12275,7 +13513,7 @@ - libext="$libext" - - # Shared library suffix (normally ".so"). --shrext='$shrext' -+shrext_cmds='$shrext_cmds' - - # Executable file suffix (normally ""). - exeext="$exeext" -@@ -12290,7 +13528,7 @@ - # Does compiler simultaneously support -c and -o options? - compiler_c_o=$lt_lt_cv_prog_compiler_c_o - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -12466,7 +13704,7 @@ - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols -@@ -12517,7 +13755,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. -- test -f Makefile && make "$ltmain" -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi - - -@@ -12530,11 +13771,11 @@ - CC="$lt_save_CC" - - --# Check whether --with-tags or --without-tags was given. -+# Check whether --with-tags was given. - if test "${with_tags+set}" = set; then -- withval="$with_tags" -- tagnames="$withval" --fi; -+ withval=$with_tags; tagnames="$withval" -+fi -+ - - if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then -@@ -12552,6 +13793,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. -@@ -12582,8 +13826,10 @@ - - case $tagname in - CXX) -- if test -n "$CXX" && test "X$CXX" != "Xno"; then -- ac_ext=cc -+ if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -12602,6 +13848,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= -@@ -12619,27 +13866,44 @@ - compiler_lib_search_path_CXX= - - # Source file extension for C++ test sources. --ac_ext=cc -+ac_ext=cpp - - # Object file extension for compiled C++ test sources. - objext=o - objext_CXX=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="int some_variable = 0;\n" -+lt_simple_compile_test_code="int some_variable = 0;" - - # 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); }' - - # 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 -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+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 -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ - # Allow CC to be a program name with arguments. - lt_save_CC=$CC - lt_save_LD=$LD -@@ -12650,18 +13914,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 --cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ - - # We don't want -fno-exception wen compiling C++ code, so set the - # no_builtin_flag separately -@@ -12675,18 +13948,18 @@ - # Set up default GNU C++ configuration - - --# Check whether --with-gnu-ld or --without-gnu-ld was given. -+# Check whether --with-gnu-ld was given. - if test "${with_gnu_ld+set}" = set; then -- withval="$with_gnu_ld" -- test "$withval" = no || with_gnu_ld=yes -+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes - else - with_gnu_ld=no --fi; -+fi -+ - ac_prog=ld - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. -- echo "$as_me:$LINENO: checking for ld used by $CC" >&5 --echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw -@@ -12715,11 +13988,11 @@ - ;; - esac - elif test "$with_gnu_ld" = yes; then -- echo "$as_me:$LINENO: checking for GNU ld" >&5 --echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for GNU ld" >&5 -+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } - else -- echo "$as_me:$LINENO: checking for non-GNU ld" >&5 --echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } - fi - if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -12732,7 +14005,7 @@ - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some GNU ld's only accept -v. -+ # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 --echo "${ECHO_T}$LD" >&6 -+ { echo "$as_me:$LINENO: result: $LD" >&5 -+echo "${ECHO_T}$LD" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 - echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } --echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 --echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } - if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- # I'd rather use --version here, but apparently some GNU ld's only accept -v. -+ # I'd rather use --version here, but apparently some GNU lds only accept -v. - case `$LD -v 2>&1 &5 --echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 -+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } - with_gnu_ld=$lt_cv_prog_gnu_ld - - -@@ -12785,8 +14058,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 -- archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -@@ -12812,7 +14085,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. -- archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib' -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists -@@ -12827,8 +14100,8 @@ - fi - - # PORTME: fill in a description of your system's C++ link characteristics --echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - ld_shlibs_CXX=yes - case $host_os in - aix3*) -@@ -12843,8 +14116,23 @@ - exp_sym_flag='-Bexport' - no_entry_flag="" - else -- # KDE requires run time linking. Make it the default. -- aix_use_runtimelinking=yes -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done -+ ;; -+ esac -+ - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi -@@ -12861,7 +14149,7 @@ - link_all_deplibs_CXX=yes - - if test "$GXX" = yes; then -- case $host_os in aix4.012|aix4.012.*) -+ case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` -@@ -12869,7 +14157,7 @@ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- hardcode_direct_CXX=yes -+ : - else - # We have old collect2 - hardcode_direct_CXX=unsupported -@@ -12880,8 +14168,12 @@ - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - fi -+ ;; - esac - shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -12890,15 +14182,16 @@ - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then -- shared_flag='-qmkshrobj ${wl}-G' -+ shared_flag='${wl}-G' - else -- shared_flag='-qmkshrobj' -+ shared_flag='${wl}-bM:SRE' - fi - fi - fi - -- # Let the compiler handle the export list. -- always_export_symbols_CXX=no -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols_CXX=yes - 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. -@@ -12920,51 +14213,55 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - -- archive_cmds_CXX="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" -- 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 '"\${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 '"\${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 -@@ -12983,39 +14280,44 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - -@@ -13024,16 +14326,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='$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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; -+ -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ allow_undefined_flag_CXX=unsupported -+ # Joseph Beckenbach 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 - *) -@@ -13047,12 +14359,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' -- allow_undefined_flag_CXX=no -+ allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - 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}--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 -@@ -13061,70 +14373,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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - ld_shlibs_CXX=no - fi - ;; -+ darwin* | rhapsody*) -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ archive_cmds_need_lc_CXX=no -+ hardcode_direct_CXX=no -+ hardcode_automatic_CXX=yes -+ hardcode_shlibpath_var_CXX=unsupported -+ whole_archive_flag_spec_CXX='' -+ link_all_deplibs_CXX=yes - -- darwin* | rhapsody*) -- if test "$GXX" = yes; then -- archive_cmds_need_lc_CXX=no -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag_CXX='-Wl,-undefined -Wl,suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.012) -- allow_undefined_flag_CXX='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- ;; -- 10.*) -- allow_undefined_flag_CXX='-Wl,-undefined -Wl,dynamic_lookup' -- ;; -- esac -+ if test "$GXX" = yes ; then -+ lt_int_apple_cc_single_mod=no -+ output_verbose_link_cmd='echo' -+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -+ lt_int_apple_cc_single_mod=yes - fi -- ;; -- esac -- lt_int_apple_cc_single_mod=no -- output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -- fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' -- else -- archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' -- fi -- module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' -- -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- hardcode_direct_CXX=no -- hardcode_automatic_CXX=yes -- hardcode_shlibpath_var_CXX=unsupported -- whole_archive_flag_spec_CXX='-all_load $convenience' -- link_all_deplibs_CXX=yes -- else -- ld_shlibs_CXX=no -- fi -- ;; -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ else -+ archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ fi -+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ fi -+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ else -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_CXX=no -+ ;; -+ esac -+ fi -+ ;; - - dgux*) - case $cc_basename in -- ec++) -+ ec++*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- ghcx) -+ ghcx*) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -13135,14 +14458,14 @@ - ;; - esac - ;; -- freebsd12*) -+ freebsd[12]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - ld_shlibs_CXX=no - ;; - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; -- freebsd* | kfreebsd*-gnu) -+ freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes -@@ -13159,12 +14482,12 @@ - # location of the library. - - case $cc_basename in -- CC) -+ CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- aCC) -- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ aCC*) -+ archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -@@ -13173,11 +14496,11 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then -- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -13187,33 +14510,20 @@ - ;; - 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_ld_CXX='+b $libdir' -- 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=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) ;; - *) -- 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*|ia64*) - hardcode_direct_CXX=no - hardcode_shlibpath_var_CXX=no -- hardcode_minus_L_CXX=yes # Not in the search PATH, -- # but as the default -- # location of the library. - ;; - *) - hardcode_direct_CXX=yes -@@ -13224,17 +14534,20 @@ - esac - - case $cc_basename in -- CC) -+ CC*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- 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*) -+ 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' -+ archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists -@@ -13250,12 +14563,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 -+ 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' -+ archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi -@@ -13266,11 +14582,25 @@ - ;; - esac - ;; -+ interix[3-9]*) -+ 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) -+ CC*) - # SGI C++ -- archive_cmds_CXX='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is -@@ -13281,9 +14611,9 @@ - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then -- archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else -- archive_cmds_CXX='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' -+ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - link_all_deplibs_CXX=yes -@@ -13292,16 +14622,16 @@ - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - ;; -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' -- archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -@@ -13319,20 +14649,44 @@ - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; -- icpc) -+ icpc*) - # Intel C++ - with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac - archive_cmds_need_lc_CXX=no -- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - ;; -- cxx) -+ pgCC*) -+ # Portland Group C++ compiler -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ -+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) - # Compaq C++ -- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' -@@ -13348,6 +14702,29 @@ - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ no_undefined_flag_CXX=' -zdefs' -+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ hardcode_libdir_flag_spec_CXX='-R$libdir' -+ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ -+ # Not sure whether something based on -+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 -+ # would be better. -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ esac -+ ;; - esac - ;; - lynxos*) -@@ -13360,7 +14737,7 @@ - ;; - mvs*) - case $cc_basename in -- cxx) -+ cxx*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -@@ -13370,7 +14747,7 @@ - ;; - esac - ;; -- netbsd*) -+ 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= -@@ -13381,15 +14758,35 @@ - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ ld_shlibs_CXX=no -+ ;; -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_CXX=yes -+ hardcode_shlibpath_var_CXX=no -+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ export_dynamic_flag_spec_CXX='${wl}-E' -+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd='echo' -+ else -+ ld_shlibs_CXX=no -+ fi -+ ;; - osf3*) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: -@@ -13399,14 +14796,14 @@ - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- cxx) -+ cxx*) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: -@@ -13424,7 +14821,7 @@ - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: -@@ -13443,13 +14840,13 @@ - ;; - osf4* | osf5*) - case $cc_basename in -- KCC) -+ KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' -+ archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: -@@ -13458,17 +14855,17 @@ - # the KAI C++ compiler. - old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- cxx) -+ cxx*) - allow_undefined_flag_CXX=' -expect_unresolved \*' -- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ - $rm $lib.exp' - - hardcode_libdir_flag_spec_CXX='-rpath $libdir' -@@ -13487,7 +14884,7 @@ - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' -+ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: -@@ -13508,27 +14905,14 @@ - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- sco*) -- archive_cmds_need_lc_CXX=no -- case $cc_basename in -- CC) -- # 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) -+ CC*) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -- lcc) -+ lcc*) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -13541,36 +14925,28 @@ - ;; - solaris*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.2, 5.x and Centerline C++ -+ archive_cmds_need_lc_CXX=yes - no_undefined_flag_CXX=' -zdefs' -- archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' -+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in -- solaris2.0-5 | solaris2.0-5.*) ;; -+ solaris2.[0-5] | solaris2.[0-5].*) ;; - *) -- # The C++ compiler is used as linker so we must use $wl -- # flag to pass the commands to the underlying system -- # linker. -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. - # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' - ;; - esac - link_all_deplibs_CXX=yes - -- # Commands to make compiler produce verbose output that lists -- # what "hidden" libraries, object files and flags are used when -- # linking a shared library. -- # -- # There doesn't appear to be a way to prevent this compiler from -- # explicitly linking system object files so we need to strip them -- # from the output so that they don't get included in the library -- # dependencies. -- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ output_verbose_link_cmd='echo' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is -@@ -13578,9 +14954,9 @@ - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; -- gcx) -+ gcx*) - # Green Hills C++ Compiler -- archive_cmds_CXX='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' -+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -@@ -13590,9 +14966,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 -- archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' -+ archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -13601,9 +14977,9 @@ - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. -- archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' -+ archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' -+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when -@@ -13612,16 +14988,73 @@ - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' -+ case $host_os in -+ solaris2.[0-5] | solaris2.[0-5].*) ;; -+ *) -+ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac - fi - ;; - 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) -+ NCC*) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no -@@ -13641,8 +15074,8 @@ - ld_shlibs_CXX=no - ;; - esac --echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 --echo "${ECHO_T}$ld_shlibs_CXX" >&6 -+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+echo "${ECHO_T}$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - - GCC_CXX="$GXX" -@@ -13678,7 +15111,7 @@ - # The `*' in the case matches for architectures that use `case' in - # $output_verbose_cmd can trigger glob expansion during the loop - # eval without this substitution. -- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" -+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"` - - for p in `eval $output_verbose_link_cmd`; do - case $p in -@@ -13718,7 +15151,7 @@ - fi - ;; - -- *.$objext|*.$libext) -+ *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then -@@ -13754,6 +15187,62 @@ - - $rm -f confest.$objext - -+# PORTME: override above test on systems where it is broken -+case $host_os in -+interix[3-9]*) -+ # 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= -+ ;; -+ -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ # -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+ -+solaris*) -+ case $cc_basename in -+ CC*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ -+ # Adding this requires a known-good setup of shared libraries for -+ # Sun compiler versions before 5.6, else PIC objects from an old -+ # archive will be linked into the output, leading to subtle bugs. -+ if test "$solaris_use_stlport4" != yes; then -+ postdeps_CXX='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+esac -+ -+ - case " $postdeps_CXX " in - *" -lc "*) archive_cmds_need_lc_CXX=no ;; - esac -@@ -13762,8 +15251,8 @@ - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX= - --echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -13784,12 +15273,14 @@ - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; -- mingw* | os2* | pw32*) -+ mingw* | cygwin* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) -@@ -13801,6 +15292,10 @@ - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; -+ interix[3-9]*) -+ # 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 -@@ -13809,7 +15304,7 @@ - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - ;; - *) -@@ -13834,18 +15329,28 @@ - ;; - chorus*) - case $cc_basename in -- cxch68) -+ cxch68*) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_CXX='-qnocommon' -+ lt_prog_compiler_wl_CXX='-Wl,' -+ ;; -+ esac -+ ;; - dgux*) - case $cc_basename in -- ec++) -+ ec++*) - lt_prog_compiler_pic_CXX='-KPIC' - ;; -- ghcx) -+ ghcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; -@@ -13853,22 +15358,22 @@ - ;; - esac - ;; -- freebsd* | kfreebsd*-gnu) -+ freebsd* | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in -- CC) -+ CC*) - lt_prog_compiler_wl_CXX='-Wl,' -- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" -+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; -- aCC) -+ aCC*) - lt_prog_compiler_wl_CXX='-Wl,' -- lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" -- case "$host_cpu" in -+ lt_prog_compiler_static_CXX='${wl}-a ${wl}archive' -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -13881,9 +15386,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) -+ CC*) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. -@@ -13892,20 +15401,26 @@ - ;; - esac - ;; -- linux*) -+ linux* | k*bsd*-gnu) - case $cc_basename in -- KCC) -+ KCC*) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; -- icpc) -+ icpc* | ecpc*) - # Intel C++ - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; -- cxx) -+ pgCC*) -+ # Portland Group C++ compiler. -+ lt_prog_compiler_wl_CXX='-Wl,' -+ lt_prog_compiler_pic_CXX='-fpic' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ ;; -+ cxx*) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. -@@ -13913,6 +15428,14 @@ - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ lt_prog_compiler_pic_CXX='-KPIC' -+ lt_prog_compiler_static_CXX='-Bstatic' -+ lt_prog_compiler_wl_CXX='-Qoption ld ' -+ ;; -+ esac - ;; - esac - ;; -@@ -13922,25 +15445,25 @@ - ;; - mvs*) - case $cc_basename in -- cxx) -+ cxx*) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -- KCC) -+ KCC*) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; -- RCC) -+ RCC*) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; -- cxx) -+ cxx*) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha -@@ -13954,24 +15477,15 @@ - ;; - psos*) - ;; -- sco*) -- case $cc_basename in -- CC) -- lt_prog_compiler_pic_CXX='-fPIC' -- ;; -- *) -- ;; -- esac -- ;; - solaris*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; -- gcx) -+ gcx*) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; -@@ -13981,12 +15495,12 @@ - ;; - sunos4*) - case $cc_basename in -- CC) -+ CC*) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; -- lcc) -+ lcc*) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; -@@ -13996,7 +15510,7 @@ - ;; - tandem*) - case $cc_basename in -- NCC) -+ NCC*) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; -@@ -14004,7 +15518,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*) - ;; -@@ -14014,22 +15535,22 @@ - esac - fi - --echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic_CXX"; then - --echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 --echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } - if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -14037,26 +15558,28 @@ - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14043: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15564: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14047: \$? = $ac_status" >&5 -+ echo "$as_me:15568: \$? = $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 -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 - $rm conftest* - - fi --echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; } - - if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in -@@ -14069,7 +15592,7 @@ - fi - - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= -@@ -14079,72 +15602,112 @@ - ;; - 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 -- # to fail, enabling locking or at least warning the user not to do parallel -- # builds. -- chmod -w . -- -- lt_compiler_flag="-o out/conftest2.$ac_objext" -- # Insert the option either (1) after the last *FLAGS variable, or -- # (2) before a word containing "conftest.", or (3) at the end. -- # Note that $ac_compile itself does not contain backslashes and begins -- # with a dollar sign (not a hyphen), so the echo should work correctly. -- lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -- -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14110: $lt_compile\"" >&5) -+ lt_prog_compiler_static_works_CXX=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag" -+ echo "$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 -+ echo "$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 -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -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:15668: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:14114: \$? = $ac_status" >&5 -+ echo "$as_me:15672: \$? = $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 -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 -- chmod u+w . -- $rm conftest* out/* -- rmdir out -+ chmod u+w . 2>&5 -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* - - fi --echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } - - - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 --echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- echo "$as_me:$LINENO: result: $hard_links" >&5 --echo "${ECHO_T}$hard_links" >&6 -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 - echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -@@ -14154,8 +15717,8 @@ - need_locks=no - fi - --echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -@@ -14172,22 +15735,20 @@ - 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* | k*bsd*-gnu) -+ link_all_deplibs_CXX=no - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - --echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 --echo "${ECHO_T}$ld_shlibs_CXX" >&6 -+{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -+echo "${ECHO_T}$ld_shlibs_CXX" >&6; } - test "$ld_shlibs_CXX" = no && can_build_shared=no - --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --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? - # -@@ -14205,10 +15766,10 @@ - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. -- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -14220,6 +15781,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= -@@ -14242,20 +15804,20 @@ - cat conftest.err 1>&5 - fi - $rm conftest* -- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 --echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } - ;; - esac - fi - ;; - esac - --echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } - library_names_spec= - libname_spec='lib$name' - soname_spec= --shrext=".so" -+shrext_cmds=".so" - postinstall_cmds= - postuninstall_cmds= - finish_cmds= -@@ -14265,7 +15827,7 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+ - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -14330,7 +15892,7 @@ - amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - - beos*) -@@ -14339,7 +15901,7 @@ - shlibpath_var=LIBRARY_PATH - ;; - --bsdi4*) -+bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -14355,7 +15917,7 @@ - - cygwin* | mingw* | pw32*) - version_type=windows -- shrext=".dll" -+ shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - -@@ -14367,7 +15929,8 @@ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname' -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -@@ -14397,7 +15960,7 @@ - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; -@@ -14420,13 +15983,8 @@ - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH -- shrext='$(test .$module = .yes && echo .so || echo .dylib)' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -14443,20 +16001,17 @@ - dynamic_linker=no - ;; - --kfreebsd*-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' -- ;; -- --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -14474,14 +16029,19 @@ - freebsd2*) - shlibpath_overrides_runpath=yes - ;; -- freebsd3.01* | freebsdelf3.01*) -+ freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -- *) # 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 - ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - esac - ;; - -@@ -14501,9 +16061,9 @@ - version_type=sunos - need_lib_prefix=no - need_version=no -- case "$host_cpu" in -+ case $host_cpu in - ia64*) -- shrext='.so' -+ shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH -@@ -14518,7 +16078,7 @@ - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) -- shrext='.sl' -+ shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -@@ -14529,7 +16089,7 @@ - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) -- shrext='.sl' -+ shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -@@ -14541,6 +16101,18 @@ - postinstall_cmds='chmod 555 $lib' - ;; - -+interix[3-9]*) -+ 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 ;; -@@ -14584,29 +16156,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' -- libsuff= -- if test "x$LINUX_64_MODE" = x64; then -- # Some platforms are per default 64-bit, so there's no /lib64 -- if test -d /lib64; then -- libsuff=64 -- fi -- fi - 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 - -+ # 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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;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, -@@ -14616,6 +16185,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -14625,7 +16206,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 -@@ -14653,8 +16234,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. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -@@ -14674,7 +16260,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' -@@ -14692,11 +16278,8 @@ - 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 -+rdos*) -+ dynamic_linker=no - ;; - - solaris*) -@@ -14724,7 +16307,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' -@@ -14757,6 +16340,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}' -@@ -14768,16 +16374,21 @@ - dynamic_linker=no - ;; - esac --echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --echo "${ECHO_T}$dynamic_linker" >&6 -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - --echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } - hardcode_action_CXX= - if test -n "$hardcode_libdir_flag_spec_CXX" || \ -- test -n "$runpath_var CXX" || \ -- test "X$hardcode_automatic_CXX"="Xyes" ; then -+ test -n "$runpath_var_CXX" || \ -+ test "X$hardcode_automatic_CXX" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != no && -@@ -14797,8 +16408,8 @@ - # directories. - hardcode_action_CXX=unsupported - fi --echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 --echo "${ECHO_T}$hardcode_action_CXX" >&6 -+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -+echo "${ECHO_T}$hardcode_action_CXX" >&6; } - - if test "$hardcode_action_CXX" = relink; then - # Fast installation is not supported -@@ -14809,1155 +16420,331 @@ - 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 -+ -+# 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 \ -+ fix_srcfile_path_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 --fi - --if test "x$enable_dlopen" != xyes; then -- enable_dlopen=unknown -- enable_dlopen_self=unknown -- enable_dlopen_self_static=unknown --else -- lt_cv_dlopen=no -- lt_cv_dlopen_libs= -+cfgfile="$ofile" - -- case $host_os in -- beos*) -- lt_cv_dlopen="load_add_on" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -- ;; -+ cat <<__EOF__ >> "$cfgfile" -+# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -- mingw* | pw32*) -- lt_cv_dlopen="LoadLibrary" -- lt_cv_dlopen_libs= -- ;; -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -- cygwin*) -- lt_cv_dlopen="dlopen" -- lt_cv_dlopen_libs= -- ;; -+# Shell to use when invoking shell scripts. -+SHELL=$lt_SHELL - -- 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. */ -+# Whether or not to build shared libraries. -+build_libtool_libs=$enable_shared - --/* 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' -- { (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 -+# Whether or not to build static libraries. -+build_old_libs=$enable_static - --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 add -lc for building shared libraries. -+build_libtool_need_lc=$archive_cmds_need_lc_CXX - -- lt_cv_dlopen="dyld" -- lt_cv_dlopen_libs= -- lt_cv_dlopen_self=yes -+# Whether or not to disallow shared libs when runtime libs are static -+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - --fi -+# Whether or not to optimize for fast installation. -+fast_install=$enable_fast_install - -- ;; -+# The host system. -+host_alias=$host_alias -+host=$host -+host_os=$host_os - -- *) -- 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 declares shl_load. -- For example, HP-UX 11i declares gettimeofday. */ --#define shl_load innocuous_shl_load -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char shl_load (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -+# An echo program that does not interpret backslashes. -+echo=$lt_echo - --#ifdef __STDC__ --# include --#else --# include --#endif -+# The archiver. -+AR=$lt_AR -+AR_FLAGS=$lt_AR_FLAGS - --#undef shl_load -+# A C compiler. -+LTCC=$lt_LTCC - --/* 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 -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS - --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' -- { (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 language-specific compiler. -+CC=$lt_compiler_CXX - --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. */ -+# Is the compiler the GNU C compiler? -+with_gcc=$GCC_CXX - --/* 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' -- { (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 -+# An ERE matcher. -+EGREP=$lt_EGREP - --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 declares dlopen. -- For example, HP-UX 11i declares gettimeofday. */ --#define dlopen innocuous_dlopen -+# The linker used to build libraries. -+LD=$lt_LD_CXX - --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char dlopen (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -+# Whether we need hard or soft links. -+LN_S=$lt_LN_S - --#ifdef __STDC__ --# include --#else --# include --#endif -+# A BSD-compatible nm program. -+NM=$lt_NM - --#undef dlopen -+# A symbol stripping program -+STRIP=$lt_STRIP - --/* 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 -+# Used to examine libraries when file_magic_cmd begins "file" -+MAGIC_CMD=$MAGIC_CMD - --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' -- { (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 -+# Used on cygwin: DLL creation program. -+DLLTOOL="$DLLTOOL" - --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 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' -- { (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: assembler. -+AS="$AS" - --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. */ -+# 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 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' -- { (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 -+# How to create reloadable object files. -+reload_flag=$lt_reload_flag -+reload_cmds=$lt_reload_cmds - --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. */ -+# How to pass a linker flag through the compiler. -+wl=$lt_lt_prog_compiler_wl_CXX - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --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' -- { (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 -+# Object file suffix (normally "o"). -+objext="$ac_objext" - --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 -+# 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 - -+# Whether dlopen is supported. -+dlopen_support=$enable_dlopen - --fi -+# Whether dlopen of programs is supported. -+dlopen_self=$enable_dlopen_self - -- ;; -- esac -+# Whether dlopen of statically linked programs is supported. -+dlopen_self_static=$enable_dlopen_self_static - -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -- else -- enable_dlopen=no -- fi -+# Compiler flag to prevent dynamic linking. -+link_static_flag=$lt_lt_prog_compiler_static_CXX - -- case $lt_cv_dlopen in -- dlopen) -- save_CPPFLAGS="$CPPFLAGS" -- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+# Compiler flag to turn off builtin functions. -+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -- save_LDFLAGS="$LDFLAGS" -- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+# Compiler flag to allow reflexive dlopens. -+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -- save_LIBS="$LIBS" -- LIBS="$lt_cv_dlopen_libs $LIBS" -+# Compiler flag to generate shared objects directly from archives. -+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -- echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 --echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 --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 < --#endif -+# Library versioning type. -+version_type=$version_type - --#include -+# Format of library name prefix. -+libname_spec=$lt_libname_spec - --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#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 - --/* 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 -+# The coded name of the library, if different from the real name. -+soname_spec=$lt_soname_spec - --#ifdef __cplusplus --extern "C" void exit (int); --#endif -+# Commands used to build and install an old-style archive. -+RANLIB=$lt_RANLIB -+old_archive_cmds=$lt_old_archive_cmds_CXX -+old_postinstall_cmds=$lt_old_postinstall_cmds -+old_postuninstall_cmds=$lt_old_postuninstall_cmds - --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -+# Create an old-style archive from a shared archive. -+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -+# Create a temporary old-style archive to link instead of a shared archive. -+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -- exit (status); --} --EOF -- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) 2>/dev/null -- lt_status=$? -- case x$lt_status in -- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; -- x$lt_unknown|x*) lt_cv_dlopen_self=no ;; -- esac -- else : -- # compilation failed -- lt_cv_dlopen_self=no -- fi --fi --rm -fr conftest* -+# Commands used to build and install a shared archive. -+archive_cmds=$lt_archive_cmds_CXX -+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -+postinstall_cmds=$lt_postinstall_cmds -+postuninstall_cmds=$lt_postuninstall_cmds - -+# Commands used to build a loadable module (assumed same as above if empty) -+module_cmds=$lt_module_cmds_CXX -+module_expsym_cmds=$lt_module_expsym_cmds_CXX - --fi --echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 --echo "${ECHO_T}$lt_cv_dlopen_self" >&6 -+# Commands to strip libraries. -+old_striplib=$lt_old_striplib -+striplib=$lt_striplib - -- if test "x$lt_cv_dlopen_self" = xyes; then -- LDFLAGS="$LDFLAGS $link_static_flag" -- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 --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 < --#endif -+# Dependencies to place after the objects being linked to create a -+# shared library. -+postdep_objects=$lt_postdep_objects_CXX - --#include -+# Dependencies to place before the objects being linked to create a -+# shared library. -+predeps=$lt_predeps_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. -+postdeps=$lt_postdeps_CXX - --/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#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 -+# The library search path used internally by the compiler when linking -+# a shared library. -+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX - --#ifdef __cplusplus --extern "C" void exit (int); --#endif -+# Method to check whether dependent libraries are shared objects. -+deplibs_check_method=$lt_deplibs_check_method - --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -+# Command to use when deplibs_check_method == file_magic. -+file_magic_cmd=$lt_file_magic_cmd - -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -+# Flag that allows shared libraries with undefined symbols to be built. -+allow_undefined_flag=$lt_allow_undefined_flag_CXX - -- exit (status); --} --EOF -- 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* -+# Flag that forces no undefined symbols. -+no_undefined_flag=$lt_no_undefined_flag_CXX - -+# Commands used to finish a libtool library installation in a directory. -+finish_cmds=$lt_finish_cmds - --fi --echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 --echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 -- fi -+# Same as above, but a single script fragment to be evaled but not shown. -+finish_eval=$lt_finish_eval - -- CPPFLAGS="$save_CPPFLAGS" -- LDFLAGS="$save_LDFLAGS" -- LIBS="$save_LIBS" -- ;; -- esac -+# Take the output of nm and produce a listing of raw symbols and C names. -+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -- case $lt_cv_dlopen_self in -- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -- *) enable_dlopen_self=unknown ;; -- esac -+# Transform the output of nm in a proper C declaration -+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -- case $lt_cv_dlopen_self_static in -- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -- *) enable_dlopen_self_static=unknown ;; -- esac --fi -+# Transform the output of nm in a C name address pair -+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -+# This is the shared library runtime path variable. -+runpath_var=$runpath_var - --# The else clause should only fire when bootstrapping the --# libtool distribution, otherwise you forgot to ship ltmain.sh --# with your package, and you will get complaints that there are --# 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 ? --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 -- --# The library search path used internally by the compiler when linking --# a shared library. --compiler_lib_search_path=$lt_compiler_lib_search_path_CXX -- --# Method to check whether dependent libraries are shared objects. --deplibs_check_method=$lt_deplibs_check_method -- --# Command to use when deplibs_check_method == file_magic. --file_magic_cmd=$lt_file_magic_cmd -- --# Flag that allows shared libraries with undefined symbols to be built. --allow_undefined_flag=$lt_allow_undefined_flag_CXX -- --# Flag that forces no undefined symbols. --no_undefined_flag=$lt_no_undefined_flag_CXX -- --# Commands used to finish a libtool library installation in a directory. --finish_cmds=$lt_finish_cmds -- --# Same as above, but a single script fragment to be evaled but not shown. --finish_eval=$lt_finish_eval -- --# Take the output of nm and produce a listing of raw symbols and C names. --global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -- --# Transform the output of nm in a proper C declaration --global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -- --# Transform the output of nm in a C name address pair --global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address -- --# This is the shared library runtime path variable. --runpath_var=$runpath_var -- --# This is the shared library path variable. --shlibpath_var=$shlibpath_var -+# This is the shared library path variable. -+shlibpath_var=$shlibpath_var - - # Is shlibpath searched before the hard-coded library search path? - shlibpath_overrides_runpath=$shlibpath_overrides_runpath -@@ -16010,7 +16797,7 @@ - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path_CXX" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_CXX -@@ -16036,7 +16823,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. -- test -f Makefile && make "$ltmain" -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi - - -@@ -16098,39 +16888,72 @@ - objext_F77=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code=" subroutine t\n return\n end\n" -+lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" - - # Code to be used in simple link tests --lt_simple_link_test_code=" program t\n end\n" -+lt_simple_link_test_code="\ -+ program t -+ end -+" - - # 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 -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+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 -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - CC=${F77-"f77"} - compiler=$CC - compiler_F77=$CC --cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ - --echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 --echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $can_build_shared" >&5 --echo "${ECHO_T}$can_build_shared" >&6 -+{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -+echo "${ECHO_T}$can_build_shared" >&6; } - --echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 --echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. --case "$host_os" in -+case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then -@@ -16138,21 +16961,21 @@ - postinstall_cmds='$RANLIB $lib' - fi - ;; --aix4*) -- test "$enable_shared" = yes && enable_static=no -+aix4* | aix5*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi - ;; - esac --echo "$as_me:$LINENO: result: $enable_shared" >&5 --echo "${ECHO_T}$enable_shared" >&6 -+{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -+echo "${ECHO_T}$enable_shared" >&6; } - --echo "$as_me:$LINENO: checking whether to build static libraries" >&5 --echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes --echo "$as_me:$LINENO: result: $enable_static" >&5 --echo "${ECHO_T}$enable_static" >&6 -- --test "$ld_shlibs_F77" = no && can_build_shared=no -+{ echo "$as_me:$LINENO: result: $enable_static" >&5 -+echo "${ECHO_T}$enable_static" >&6; } - - GCC_F77="$G77" - LD_F77="$LD" -@@ -16161,8 +16984,8 @@ - lt_prog_compiler_pic_F77= - lt_prog_compiler_static_F77= - --echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl_F77='-Wl,' -@@ -16184,13 +17007,15 @@ - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; - -@@ -16200,6 +17025,11 @@ - lt_prog_compiler_pic_F77='-fno-common' - ;; - -+ interix[3-9]*) -+ # 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. -@@ -16216,7 +17046,7 @@ - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -16242,8 +17072,18 @@ - lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_F77='-qnocommon' -+ lt_prog_compiler_wl_F77='-Wl,' -+ ;; -+ esac -+ ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_F77='-DDLL_EXPORT' -@@ -16253,7 +17093,7 @@ - lt_prog_compiler_wl_F77='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -16276,18 +17116,41 @@ - lt_prog_compiler_static_F77='-Bstatic' - ;; - -- linux*) -- case $CC in -+ linux* | k*bsd*-gnu) -+ case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-static' - ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl_F77='-Wl,' -+ lt_prog_compiler_pic_F77='-fpic' -+ lt_prog_compiler_static_F77='-Bstatic' -+ ;; - ccc*) - lt_prog_compiler_wl_F77='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ lt_prog_compiler_wl_F77='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic_F77='-KPIC' -+ lt_prog_compiler_static_F77='-Bstatic' -+ lt_prog_compiler_wl_F77='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -16297,15 +17160,19 @@ - lt_prog_compiler_static_F77='-non_shared' - ;; - -- sco3.2v5*) -- lt_prog_compiler_pic_F77='-Kpic' -- lt_prog_compiler_static_F77='-dn' -+ rdos*) -+ lt_prog_compiler_static_F77='-non_shared' - ;; - - solaris*) -- lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl_F77='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl_F77='-Wl,';; -+ esac - ;; - - sunos4*) -@@ -16314,7 +17181,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' -@@ -16327,6 +17194,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 -+ ;; -+ - uts4*) - lt_prog_compiler_pic_F77='-pic' - lt_prog_compiler_static_F77='-Bstatic' -@@ -16338,22 +17216,22 @@ - esac - fi - --echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic_F77"; then - --echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 --echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } - if test "${lt_prog_compiler_pic_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_F77" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -16361,26 +17239,28 @@ - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16367: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17245: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:16371: \$? = $ac_status" >&5 -+ echo "$as_me:17249: \$? = $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 -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 - $rm conftest* - - fi --echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; } - - if test x"$lt_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in -@@ -16393,7 +17273,7 @@ - fi - - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_F77= -@@ -16403,8 +17283,50 @@ - ;; - esac - --echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+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" -+ echo "$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 - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -16413,14 +17335,7 @@ - mkdir conftest - cd conftest - mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -- -- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers -- # that will create temporary files in the current directory regardless of -- # the output directory. Thus, making CWD read-only will cause this test -- # to fail, enabling locking or at least warning the user not to do parallel -- # builds. -- chmod -w . -+ echo "$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 -@@ -16428,47 +17343,52 @@ - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16434: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:17349: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:16438: \$? = $ac_status" >&5 -+ echo "$as_me:17353: \$? = $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 -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 -- chmod u+w . -- $rm conftest* out/* -- rmdir out -+ chmod u+w . 2>&5 -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* - - fi --echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } - - - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 --echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- echo "$as_me:$LINENO: result: $hard_links" >&5 --echo "${ECHO_T}$hard_links" >&6 -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 - echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -@@ -16478,8 +17398,8 @@ - need_locks=no - fi - --echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - runpath_var= - allow_undefined_flag_F77= -@@ -16517,6 +17437,16 @@ - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -16527,6 +17457,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 - ;; -@@ -16537,6 +17471,27 @@ - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_F77='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_F77= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) -@@ -16574,7 +17529,7 @@ - allow_undefined_flag_F77=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME -- archive_cmds_F77='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' -+ archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_F77=no - fi -@@ -16584,13 +17539,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' -- allow_undefined_flag_F77=no -+ allow_undefined_flag_F77=unsupported - always_export_symbols_F77=no - enable_shared_with_static_runtimes_F77=yes -- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -- archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ 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 -@@ -16599,23 +17554,79 @@ - 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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else -- ld_shlibs=no -+ ld_shlibs_F77=no -+ fi -+ ;; -+ -+ interix[3-9]*) -+ 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' -+ ;; -+ -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ link_all_deplibs_F77=no -+ else -+ ld_shlibs_F77=no - fi - ;; - -- netbsd*) -+ 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= - else -- archive_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -- solaris* | sysv5*) -+ solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs_F77=no - cat <&2 -@@ -16629,13 +17640,40 @@ - - EOF - elif $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' -- archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - -+ 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= -@@ -16645,24 +17683,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' -- archive_expsym_cmds_F77='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac - -- if test "$ld_shlibs_F77" = yes; then -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec_F77='${wl}--export-dynamic' -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec_F77= -- fi -+ if test "$ld_shlibs_F77" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec_F77= -+ export_dynamic_flag_spec_F77= -+ whole_archive_flag_spec_F77= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) -@@ -16674,7 +17707,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 -@@ -16696,9 +17729,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 -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac - -- # KDE requires run time linking. Make it the default. -- aix_use_runtimelinking=yes - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi -@@ -16715,7 +17760,7 @@ - link_all_deplibs_F77=yes - - if test "$GCC" = yes; then -- case $host_os in aix4.012|aix4.012.*) -+ case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` -@@ -16723,7 +17768,7 @@ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- hardcode_direct_F77=yes -+ : - else - # We have old collect2 - hardcode_direct_F77=unsupported -@@ -16734,8 +17779,12 @@ - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_libdir_separator_F77= - fi -+ ;; - esac - shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -16743,71 +17792,76 @@ - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else -- 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 - -- # Let the compiler handle the export list. -- always_export_symbols_F77=no -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols_F77=yes - 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. - allow_undefined_flag_F77='-berok' - # Determine the default libpath from the value encoded in an empty executable. -- cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - program main - - end - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_f77_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 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - -- hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" -- 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 '"\${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 '"\${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 -@@ -16816,39 +17870,44 @@ - end - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_f77_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 -+ (exit $ac_status); } && { -+ test -z "$ac_f77_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - -@@ -16857,13 +17916,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='$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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; -@@ -16876,7 +17933,7 @@ - ld_shlibs_F77=no - ;; - -- bsdi4*) -+ bsdi[45]*) - export_dynamic_flag_spec_F77=-rdynamic - ;; - -@@ -16886,68 +17943,68 @@ - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_F77=' ' -- allow_undefined_flag_F77=no -+ allow_undefined_flag_F77=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. -- shrext=".dll" -+ shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. -- archive_cmds_F77='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_F77='true' - # FIXME: Should let the user specify the lib program. -- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -+ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ fix_srcfile_path_F77='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_F77=yes - ;; - - darwin* | rhapsody*) -- if test "$GXX" = yes ; then -- archive_cmds_need_lc_F77=no -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag_F77='-Wl,-undefined -Wl,suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.012) -- allow_undefined_flag_F77='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- ;; -- 10.*) -- allow_undefined_flag_F77='-Wl,-undefined -Wl,dynamic_lookup' -- ;; -- esac -- fi -- ;; -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; - esac -- lt_int_apple_cc_single_mod=no -- output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -- fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' -- else -- archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' -- fi -- module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds_need_lc_F77=no - hardcode_direct_F77=no - hardcode_automatic_F77=yes - hardcode_shlibpath_var_F77=unsupported -- whole_archive_flag_spec_F77='-all_load $convenience' -+ whole_archive_flag_spec_F77='' - link_all_deplibs_F77=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else -- ld_shlibs_F77=no -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_F77=no -+ ;; -+ esac - fi - ;; - -@@ -16981,8 +18038,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* | 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 -@@ -16990,7 +18047,7 @@ - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - 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 -@@ -17004,47 +18061,62 @@ - export_dynamic_flag_spec_F77='${wl}-E' - ;; - -- 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*) -+ 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' -+ archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - ;; - 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*) -+ 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' - ;; - *) -- 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*|ia64*) - hardcode_libdir_flag_spec_ld_F77='+b $libdir' -- 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' - -@@ -17058,7 +18130,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' -+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_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' -@@ -17068,7 +18140,7 @@ - link_all_deplibs_F77=yes - ;; - -- netbsd*) -+ 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 -@@ -17088,23 +18160,28 @@ - ;; - - openbsd*) -- hardcode_direct_F77=yes -- hardcode_shlibpath_var_F77=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' -- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -- export_dynamic_flag_spec_F77='${wl}-E' -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_F77=yes -+ hardcode_shlibpath_var_F77=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_F77='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_F77='-R$libdir' -+ ;; -+ *) -+ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi - else -- case $host_os in -- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec_F77='-R$libdir' -- ;; -- *) -- archive_cmds_F77='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' -- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' -- ;; -- esac -+ ld_shlibs_F77=no - fi - ;; - -@@ -17112,14 +18189,14 @@ - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - allow_undefined_flag_F77=unsupported -- archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' -+ archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_F77='$CC -shared${allow_undefined_flag} $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' -+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - 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' -@@ -17131,13 +18208,13 @@ - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_F77='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_F77='-rpath $libdir' -@@ -17145,21 +18222,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 -- archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' -+ wlarc='${wl}' -+ archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else -+ wlarc='' - archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -@@ -17168,8 +18239,17 @@ - hardcode_shlibpath_var_F77=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; -- *) # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - esac - link_all_deplibs_F77=yes - ;; -@@ -17178,7 +18258,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. -- archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' -+ archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -17226,36 +18306,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* | sco3.2v5.0.[024]*) -+ 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,$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,$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' -+ -+ 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*) -@@ -17270,15 +18359,10 @@ - esac - fi - --echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 --echo "${ECHO_T}$ld_shlibs_F77" >&6 -+{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -+echo "${ECHO_T}$ld_shlibs_F77" >&6; } - test "$ld_shlibs_F77" = no && can_build_shared=no - --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --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? - # -@@ -17296,10 +18380,10 @@ - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. -- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -17311,6 +18395,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= -@@ -17333,20 +18418,20 @@ - cat conftest.err 1>&5 - fi - $rm conftest* -- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 --echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } - ;; - esac - fi - ;; - esac - --echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } - library_names_spec= - libname_spec='lib$name' - soname_spec= --shrext=".so" -+shrext_cmds=".so" - postinstall_cmds= - postuninstall_cmds= - finish_cmds= -@@ -17356,7 +18441,7 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+ - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -17421,7 +18506,7 @@ - amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - - beos*) -@@ -17430,7 +18515,7 @@ - shlibpath_var=LIBRARY_PATH - ;; - --bsdi4*) -+bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -17446,7 +18531,7 @@ - - cygwin* | mingw* | pw32*) - version_type=windows -- shrext=".dll" -+ shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - -@@ -17458,7 +18543,8 @@ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname' -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -@@ -17488,7 +18574,7 @@ - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; -@@ -17511,13 +18597,8 @@ - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH -- shrext='$(test .$module = .yes && echo .so || echo .dylib)' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -17534,20 +18615,17 @@ - dynamic_linker=no - ;; - --kfreebsd*-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' -- ;; -- --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -17565,14 +18643,19 @@ - freebsd2*) - shlibpath_overrides_runpath=yes - ;; -- freebsd3.01* | freebsdelf3.01*) -+ freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -- *) # 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 - ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - esac - ;; - -@@ -17592,9 +18675,9 @@ - version_type=sunos - need_lib_prefix=no - need_version=no -- case "$host_cpu" in -+ case $host_cpu in - ia64*) -- shrext='.so' -+ shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH -@@ -17609,7 +18692,7 @@ - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) -- shrext='.sl' -+ shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -@@ -17620,7 +18703,7 @@ - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) -- shrext='.sl' -+ shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -@@ -17632,6 +18715,18 @@ - postinstall_cmds='chmod 555 $lib' - ;; - -+interix[3-9]*) -+ 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 ;; -@@ -17675,29 +18770,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' -- libsuff= -- if test "x$LINUX_64_MODE" = x64; then -- # Some platforms are per default 64-bit, so there's no /lib64 -- if test -d /lib64; then -- libsuff=64 -- fi -- fi - 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 - -+ # 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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;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, -@@ -17707,6 +18799,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -17716,7 +18820,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 -@@ -17744,8 +18848,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. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -@@ -17765,7 +18874,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' -@@ -17783,11 +18892,8 @@ - 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 -+rdos*) -+ dynamic_linker=no - ;; - - solaris*) -@@ -17815,7 +18921,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' -@@ -17848,6 +18954,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}' -@@ -17859,16 +18988,21 @@ - dynamic_linker=no - ;; - esac --echo "$as_me:$LINENO: result: $dynamic_linker" >&5 --echo "${ECHO_T}$dynamic_linker" >&6 -+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -+echo "${ECHO_T}$dynamic_linker" >&6; } - test "$dynamic_linker" = no && can_build_shared=no - --echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 --echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6 -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } - hardcode_action_F77= - if test -n "$hardcode_libdir_flag_spec_F77" || \ -- test -n "$runpath_var F77" || \ -- test "X$hardcode_automatic_F77"="Xyes" ; then -+ test -n "$runpath_var_F77" || \ -+ test "X$hardcode_automatic_F77" = "Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_F77" != no && -@@ -17888,8 +19022,8 @@ - # directories. - hardcode_action_F77=unsupported - fi --echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 --echo "${ECHO_T}$hardcode_action_F77" >&6 -+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -+echo "${ECHO_T}$hardcode_action_F77" >&6; } - - if test "$hardcode_action_F77" = relink; then - # Fast installation is not supported -@@ -17900,36 +19034,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 -@@ -17944,7 +19048,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 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 \ -@@ -17985,6 +19090,7 @@ - module_cmds_F77 \ - module_expsym_cmds_F77 \ - lt_cv_prog_compiler_c_o_F77 \ -+ fix_srcfile_path_F77 \ - exclude_expsyms_F77 \ - include_expsyms_F77; do - -@@ -18044,6 +19150,12 @@ - # The host system. - host_alias=$host_alias - host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - - # An echo program that does not interpret backslashes. - echo=$lt_echo -@@ -18055,6 +19167,9 @@ - # A C compiler. - LTCC=$lt_LTCC - -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ - # A language-specific compiler. - CC=$lt_compiler_F77 - -@@ -18074,7 +19189,7 @@ - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -18105,7 +19220,7 @@ - libext="$libext" - - # Shared library suffix (normally ".so"). --shrext='$shrext' -+shrext_cmds='$shrext_cmds' - - # Executable file suffix (normally ""). - exeext="$exeext" -@@ -18120,7 +19235,7 @@ - # Does compiler simultaneously support -c and -o options? - compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -18296,7 +19411,7 @@ - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path_F77" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_F77 -@@ -18322,7 +19437,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. -- test -f Makefile && make "$ltmain" -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi - - -@@ -18343,7 +19461,6 @@ - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - - -- - # Source file extension for Java test sources. - ac_ext=java - -@@ -18352,29 +19469,58 @@ - objext_GCJ=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code="class foo {}\n" -+lt_simple_compile_test_code="class foo {}" - - # Code to be used in simple link tests --lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n' -+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' - - # 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 -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+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 -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - CC=${GCJ-"gcj"} - compiler=$CC - compiler_GCJ=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ - - # GCJ did not exist at the time GCC didn't implicitly link libc in. - archive_cmds_need_lc_GCJ=no - -+old_archive_cmds_GCJ=$old_archive_cmds -+ - ## CAVEAT EMPTOR: - ## There is no encapsulation within the following macros, do not change - ## the running order or otherwise move them around unless you know exactly -@@ -18386,14 +19532,14 @@ - lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' - - --echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 --echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } - if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -18401,26 +19547,28 @@ - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18407: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:19553: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18411: \$? = $ac_status" >&5 -+ echo "$as_me:19557: \$? = $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 -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 - $rm conftest* - - fi --echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } - - if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" -@@ -18434,8 +19582,8 @@ - lt_prog_compiler_pic_GCJ= - lt_prog_compiler_static_GCJ= - --echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 --echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } - - if test "$GCC" = yes; then - lt_prog_compiler_wl_GCJ='-Wl,' -@@ -18457,13 +19605,15 @@ - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; - -- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' - ;; - -@@ -18473,6 +19623,11 @@ - lt_prog_compiler_pic_GCJ='-fno-common' - ;; - -+ interix[3-9]*) -+ # 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. -@@ -18489,7 +19644,7 @@ - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -18515,8 +19670,18 @@ - lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' - fi - ;; -+ darwin*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ case $cc_basename in -+ xlc*) -+ lt_prog_compiler_pic_GCJ='-qnocommon' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ ;; -+ esac -+ ;; - -- mingw* | pw32* | os2*) -+ mingw* | cygwin* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' -@@ -18526,7 +19691,7 @@ - lt_prog_compiler_wl_GCJ='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. -- case "$host_cpu" in -+ case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; -@@ -18549,18 +19714,41 @@ - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - -- linux*) -- case $CC in -+ linux* | k*bsd*-gnu) -+ case $cc_basename in - icc* | ecc*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-static' - ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ lt_prog_compiler_pic_GCJ='-fpic' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ ;; - ccc*) - lt_prog_compiler_wl_GCJ='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static_GCJ='-non_shared' - ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ lt_prog_compiler_wl_GCJ='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ lt_prog_compiler_pic_GCJ='-KPIC' -+ lt_prog_compiler_static_GCJ='-Bstatic' -+ lt_prog_compiler_wl_GCJ='' -+ ;; -+ esac -+ ;; - esac - ;; - -@@ -18570,15 +19758,19 @@ - lt_prog_compiler_static_GCJ='-non_shared' - ;; - -- sco3.2v5*) -- lt_prog_compiler_pic_GCJ='-Kpic' -- lt_prog_compiler_static_GCJ='-dn' -+ rdos*) -+ lt_prog_compiler_static_GCJ='-non_shared' - ;; - - solaris*) -- lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ lt_prog_compiler_wl_GCJ='-Qoption ld ';; -+ *) -+ lt_prog_compiler_wl_GCJ='-Wl,';; -+ esac - ;; - - sunos4*) -@@ -18587,7 +19779,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' -@@ -18600,6 +19792,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 -+ ;; -+ - uts4*) - lt_prog_compiler_pic_GCJ='-pic' - lt_prog_compiler_static_GCJ='-Bstatic' -@@ -18611,22 +19814,22 @@ - esac - fi - --echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } - - # - # Check to make sure the PIC flag actually works. - # - if test -n "$lt_prog_compiler_pic_GCJ"; then - --echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 --echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } - if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - lt_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_GCJ" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. -@@ -18634,26 +19837,28 @@ - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18640: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:19843: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:18644: \$? = $ac_status" >&5 -+ echo "$as_me:19847: \$? = $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 -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 - $rm conftest* - - fi --echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 --echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 -+{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -+echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; } - - if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then - case $lt_prog_compiler_pic_GCJ in -@@ -18666,7 +19871,7 @@ - fi - - fi --case "$host_os" in -+case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_GCJ= -@@ -18676,8 +19881,50 @@ - ;; - esac - --echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 --echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 -+# -+# Check to make sure the static flag actually works. -+# -+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -+{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } -+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" -+ echo "$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 - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -18686,14 +19933,7 @@ - mkdir conftest - cd conftest - mkdir out -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -- -- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers -- # that will create temporary files in the current directory regardless of -- # the output directory. Thus, making CWD read-only will cause this test -- # to fail, enabling locking or at least warning the user not to do parallel -- # builds. -- chmod -w . -+ echo "$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 -@@ -18701,47 +19941,52 @@ - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ -- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:18707: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:19947: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:18711: \$? = $ac_status" >&5 -+ echo "$as_me:19951: \$? = $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 -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 -- chmod u+w . -- $rm conftest* out/* -- rmdir out -+ chmod u+w . 2>&5 -+ $rm conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files -+ $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* - - fi --echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 --echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 -+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } - - - hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user -- echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 --echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no -- echo "$as_me:$LINENO: result: $hard_links" >&5 --echo "${ECHO_T}$hard_links" >&6 -+ { echo "$as_me:$LINENO: result: $hard_links" >&5 -+echo "${ECHO_T}$hard_links" >&6; } - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 - echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} -@@ -18751,8 +19996,8 @@ - need_locks=no - fi - --echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } - - runpath_var= - allow_undefined_flag_GCJ= -@@ -18790,6 +20035,16 @@ - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= -+ # Just being paranoid about ensuring that cc_basename is set. -+ for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` - - case $host_os in - cygwin* | mingw* | pw32*) -@@ -18800,6 +20055,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 - ;; -@@ -18810,6 +20069,27 @@ - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -+ whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ whole_archive_flag_spec_GCJ= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>/dev/null` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) -@@ -18847,7 +20127,7 @@ - allow_undefined_flag_GCJ=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME -- archive_cmds_GCJ='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' -+ archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_GCJ=no - fi -@@ -18857,13 +20137,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' -- allow_undefined_flag_GCJ=no -+ allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=no - enable_shared_with_static_runtimes_GCJ=yes -- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' -+ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -- archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' -+ 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 -@@ -18872,23 +20152,79 @@ - 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}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else -- ld_shlibs=no -+ ld_shlibs_GCJ=no -+ fi -+ ;; -+ -+ interix[3-9]*) -+ 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' -+ ;; -+ -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ tmp_addflag= -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ *) -+ tmp_sharedflag='-shared' ;; -+ esac -+ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test $supports_anon_versioning = yes; then -+ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ $echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ link_all_deplibs_GCJ=no -+ else -+ ld_shlibs_GCJ=no - fi - ;; - -- netbsd*) -+ 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= - else -- archive_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' -- archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - -- solaris* | sysv5*) -+ solaris*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs_GCJ=no - cat <&2 -@@ -18902,13 +20238,40 @@ - - EOF - elif $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' -- archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; - -+ 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= -@@ -18918,24 +20281,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' -- archive_expsym_cmds_GCJ='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; - esac - -- if test "$ld_shlibs_GCJ" = yes; then -- runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' -- export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' -- # ancient GNU ld didn't support --whole-archive et. al. -- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then -- whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -- else -- whole_archive_flag_spec_GCJ= -- fi -+ if test "$ld_shlibs_GCJ" = no; then -+ runpath_var= -+ hardcode_libdir_flag_spec_GCJ= -+ export_dynamic_flag_spec_GCJ= -+ whole_archive_flag_spec_GCJ= - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) -@@ -18947,7 +20305,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 -@@ -18969,9 +20327,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 -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix5*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac - -- # KDE requires run time linking. Make it the default. -- aix_use_runtimelinking=yes - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi -@@ -18988,7 +20358,7 @@ - link_all_deplibs_GCJ=yes - - if test "$GCC" = yes; then -- case $host_os in aix4.012|aix4.012.*) -+ case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` -@@ -18996,7 +20366,7 @@ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 -- hardcode_direct_GCJ=yes -+ : - else - # We have old collect2 - hardcode_direct_GCJ=unsupported -@@ -19007,8 +20377,12 @@ - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_libdir_separator_GCJ= - fi -+ ;; - esac - shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi - else - # not using gcc - if test "$host_cpu" = ia64; then -@@ -19016,22 +20390,23 @@ - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else -- 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 - -- # Let the compiler handle the export list. -- always_export_symbols_GCJ=no -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ always_export_symbols_GCJ=yes - 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. - allow_undefined_flag_GCJ='-berok' - # Determine the default libpath from the value encoded in an empty executable. -- cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -19047,50 +20422,54 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - -- hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" -- 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 '"\${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 '"\${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 -@@ -19109,39 +20488,44 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - --aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'` -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. --if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } --}'`; fi -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - -@@ -19150,13 +20534,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='$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 ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' - fi - fi - ;; -@@ -19169,7 +20551,7 @@ - ld_shlibs_GCJ=no - ;; - -- bsdi4*) -+ bsdi[45]*) - export_dynamic_flag_spec_GCJ=-rdynamic - ;; - -@@ -19179,68 +20561,68 @@ - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_GCJ=' ' -- allow_undefined_flag_GCJ=no -+ allow_undefined_flag_GCJ=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. -- shrext=".dll" -+ shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. -- archive_cmds_GCJ='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_GCJ='true' - # FIXME: Should let the user specify the lib program. -- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' -- fix_srcfile_path='`cygpath -w "$srcfile"`' -+ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes_GCJ=yes - ;; - - darwin* | rhapsody*) -- if test "$GXX" = yes ; then -- archive_cmds_need_lc_GCJ=no -- case "$host_os" in -- rhapsody* | darwin1.[012]) -- allow_undefined_flag_GCJ='-Wl,-undefined -Wl,suppress' -- ;; -- *) # Darwin 1.3 on -- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -- allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- else -- case ${MACOSX_DEPLOYMENT_TARGET} in -- 10.012) -- allow_undefined_flag_GCJ='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' -- ;; -- 10.*) -- allow_undefined_flag_GCJ='-Wl,-undefined -Wl,dynamic_lookup' -- ;; -- esac -- fi -- ;; -+ case $host_os in -+ rhapsody* | darwin1.[012]) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress' -+ ;; -+ *) # Darwin 1.3 on -+ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ else -+ case ${MACOSX_DEPLOYMENT_TARGET} in -+ 10.[012]) -+ allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' -+ ;; -+ 10.*) -+ allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup' -+ ;; -+ esac -+ fi -+ ;; - esac -- lt_int_apple_cc_single_mod=no -- output_verbose_link_cmd='echo' -- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then -- lt_int_apple_cc_single_mod=yes -- fi -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' -- else -- archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' -- fi -- module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' -- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- else -- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- fi -- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ archive_cmds_need_lc_GCJ=no - hardcode_direct_GCJ=no - hardcode_automatic_GCJ=yes - hardcode_shlibpath_var_GCJ=unsupported -- whole_archive_flag_spec_GCJ='-all_load $convenience' -+ whole_archive_flag_spec_GCJ='' - link_all_deplibs_GCJ=yes -+ if test "$GCC" = yes ; then -+ output_verbose_link_cmd='echo' -+ archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' -+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else -- ld_shlibs_GCJ=no -+ case $cc_basename in -+ xlc*) -+ output_verbose_link_cmd='echo' -+ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' -+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' -+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds -+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ ;; -+ *) -+ ld_shlibs_GCJ=no -+ ;; -+ esac - fi - ;; - -@@ -19274,8 +20656,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* | 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 -@@ -19283,7 +20665,7 @@ - - hpux9*) - if test "$GCC" = yes; then -- archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - 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 -@@ -19297,47 +20679,62 @@ - export_dynamic_flag_spec_GCJ='${wl}-E' - ;; - -- 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 $compiler_flags $libobjs $deplibs' -- ;; -- esac -+ archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' - else -- case "$host_cpu" in -- hppa*64*|ia64*) -- archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags' -- ;; -- *) -- archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -- ;; -- esac -+ archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' - 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_ld_GCJ='+b $libdir' -- hardcode_libdir_separator_GCJ=: -- hardcode_direct_GCJ=no -- hardcode_shlibpath_var_GCJ=no -+ 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*) -+ 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 $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) -- hardcode_libdir_flag_spec_GCJ='-L$libdir' -+ archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_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 -+ hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator_GCJ=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_libdir_flag_spec_ld_GCJ='+b $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' - -@@ -19351,7 +20748,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' -+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_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' -@@ -19361,7 +20758,7 @@ - link_all_deplibs_GCJ=yes - ;; - -- netbsd*) -+ 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 -@@ -19381,23 +20778,28 @@ - ;; - - openbsd*) -- hardcode_direct_GCJ=yes -- hardcode_shlibpath_var_GCJ=no -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' -- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -- export_dynamic_flag_spec_GCJ='${wl}-E' -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct_GCJ=yes -+ hardcode_shlibpath_var_GCJ=no -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ export_dynamic_flag_spec_GCJ='${wl}-E' -+ else -+ case $host_os in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ hardcode_libdir_flag_spec_GCJ='-R$libdir' -+ ;; -+ *) -+ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi - else -- case $host_os in -- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- hardcode_libdir_flag_spec_GCJ='-R$libdir' -- ;; -- *) -- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' -- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' -- ;; -- esac -+ ld_shlibs_GCJ=no - fi - ;; - -@@ -19405,14 +20807,14 @@ - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - allow_undefined_flag_GCJ=unsupported -- archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' -+ archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $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' -+ archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - 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' -@@ -19424,13 +20826,13 @@ - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' -- archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag_GCJ=' -expect_unresolved \*' - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ -- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' -+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_GCJ='-rpath $libdir' -@@ -19438,21 +20840,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 -- archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' -+ wlarc='${wl}' -+ archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' -+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' - else -+ wlarc='' - archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -@@ -19461,8 +20857,17 @@ - hardcode_shlibpath_var_GCJ=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; -- *) # Supported since Solaris 2.6 (maybe 2.5.1?) -- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' -+ fi -+ ;; - esac - link_all_deplibs_GCJ=yes - ;; -@@ -19471,7 +20876,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. -- archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' -+ archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi -@@ -19519,36 +20924,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* | sco3.2v5.0.[024]*) -+ 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,$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,$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' -+ -+ 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*) -@@ -19563,15 +20977,10 @@ - esac - fi - --echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 --echo "${ECHO_T}$ld_shlibs_GCJ" >&6 -+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } - test "$ld_shlibs_GCJ" = no && can_build_shared=no - --variables_saved_for_relink="PATH $shlibpath_var $runpath_var" --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? - # -@@ -19589,10 +20998,10 @@ - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. -- echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 --echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -+echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } - $rm conftest* -- printf "$lt_simple_compile_test_code" > conftest.$ac_ext -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 -@@ -19604,6 +21013,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= -@@ -19626,20 +21036,20 @@ - cat conftest.err 1>&5 - fi - $rm conftest* -- echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 --echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 -+ { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -+echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } - ;; - esac - fi - ;; - esac - --echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 --echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -+echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } - library_names_spec= - libname_spec='lib$name' - soname_spec= --shrext=".so" -+shrext_cmds=".so" - postinstall_cmds= - postuninstall_cmds= - finish_cmds= -@@ -19649,7 +21059,7 @@ - version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" --sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+ - need_lib_prefix=unknown - hardcode_into_libs=no - -@@ -19714,7 +21124,7 @@ - amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. -- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done' -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - - beos*) -@@ -19723,7 +21133,7 @@ - shlibpath_var=LIBRARY_PATH - ;; - --bsdi4*) -+bsdi[45]*) - version_type=linux - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -@@ -19739,7 +21149,7 @@ - - cygwin* | mingw* | pw32*) - version_type=windows -- shrext=".dll" -+ shrext_cmds=".dll" - need_version=no - need_lib_prefix=no - -@@ -19751,7 +21161,8 @@ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ -- $install_prog $dir/$dlname \$dldir/$dlname' -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $rm \$dlpath' -@@ -19781,7 +21192,7 @@ - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - ;; -@@ -19804,13 +21215,8 @@ - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH -- shrext='$(test .$module = .yes && echo .so || echo .dylib)' -- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. -- if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` -- else -- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' -- fi -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+ - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' - ;; - -@@ -19827,20 +21233,17 @@ - dynamic_linker=no - ;; - --kfreebsd*-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' -- ;; -- --freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[123]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -@@ -19858,14 +21261,19 @@ - freebsd2*) - shlibpath_overrides_runpath=yes - ;; -- freebsd3.01* | freebsdelf3.01*) -+ freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; -- *) # 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 - ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; - esac - ;; - -@@ -19885,9 +21293,9 @@ - version_type=sunos - need_lib_prefix=no - need_version=no -- case "$host_cpu" in -+ case $host_cpu in - ia64*) -- shrext='.so' -+ shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH -@@ -19902,7 +21310,7 @@ - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) -- shrext='.sl' -+ shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -@@ -19913,7 +21321,7 @@ - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) -- shrext='.sl' -+ shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -@@ -19925,6 +21333,18 @@ - postinstall_cmds='chmod 555 $lib' - ;; - -+interix[3-9]*) -+ 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 ;; -@@ -19968,29 +21388,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' -- libsuff= -- if test "x$LINUX_64_MODE" = x64; then -- # Some platforms are per default 64-bit, so there's no /lib64 -- if test -d /lib64; then -- libsuff=64 -- fi -- fi - 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 - -+ # 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>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;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, -@@ -20000,6 +21417,18 @@ - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -20009,7 +21438,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 -@@ -20037,8 +21466,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. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -@@ -20058,7 +21492,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' -@@ -20076,11 +21510,8 @@ - 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 -+rdos*) -+ dynamic_linker=no - ;; - - solaris*) -@@ -20108,7 +21539,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' -@@ -20141,891 +21572,84 @@ - fi - ;; - --uts4*) -- version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH -- ;; -- --*) -- 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 -+ 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 -- # We can link without hardcoding, and we can hardcode nonexisting dirs. -- hardcode_action_GCJ=immediate -+ 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 --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 declares shl_load. -- For example, HP-UX 11i 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 to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#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 declares dlopen. -- For example, HP-UX 11i declares gettimeofday. */ --#define dlopen innocuous_dlopen -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char dlopen (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#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 -- -- --fi -- -- --fi -- -- --fi -- -- --fi -- -- ;; -- esac -- -- if test "x$lt_cv_dlopen" != xno; then -- enable_dlopen=yes -- else -- enable_dlopen=no -- 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 < --#endif -- --#include -- --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif -- --/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#ifndef LT_DLLAZY_OR_NOW --# ifdef RTLD_LAZY --# define LT_DLLAZY_OR_NOW RTLD_LAZY --# else --# ifdef DL_LAZY --# define LT_DLLAZY_OR_NOW DL_LAZY --# else --# ifdef RTLD_NOW --# define LT_DLLAZY_OR_NOW RTLD_NOW --# else --# ifdef DL_NOW --# define LT_DLLAZY_OR_NOW DL_NOW --# else --# define LT_DLLAZY_OR_NOW 0 --# endif --# endif --# endif --# endif --#endif -- --#ifdef __cplusplus --extern "C" void exit (int); --#endif -- --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -- -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -- -- exit (status); --} --EOF -- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) 2>/dev/null -- lt_status=$? -- case x$lt_status in -- x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; -- x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; -- x$lt_unknown|x*) lt_cv_dlopen_self=no ;; -- esac -- else : -- # compilation failed -- lt_cv_dlopen_self=no -- fi --fi --rm -fr conftest* -- -- --fi --echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 --echo "${ECHO_T}$lt_cv_dlopen_self" >&6 -- -- if test "x$lt_cv_dlopen_self" = xyes; then -- LDFLAGS="$LDFLAGS $link_static_flag" -- echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 --echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6 --if test "${lt_cv_dlopen_self_static+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test "$cross_compiling" = yes; then : -- lt_cv_dlopen_self_static=cross --else -- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -- lt_status=$lt_dlunknown -- cat > conftest.$ac_ext < --#endif -- --#include -- --#ifdef RTLD_GLOBAL --# define LT_DLGLOBAL RTLD_GLOBAL --#else --# ifdef DL_GLOBAL --# define LT_DLGLOBAL DL_GLOBAL --# else --# define LT_DLGLOBAL 0 --# endif --#endif -- --/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -- find out it does not work in some platform. */ --#ifndef LT_DLLAZY_OR_NOW --# ifdef RTLD_LAZY --# define LT_DLLAZY_OR_NOW RTLD_LAZY --# else --# ifdef DL_LAZY --# define LT_DLLAZY_OR_NOW DL_LAZY --# else --# ifdef RTLD_NOW --# define LT_DLLAZY_OR_NOW RTLD_NOW --# else --# ifdef DL_NOW --# define LT_DLLAZY_OR_NOW DL_NOW --# else --# define LT_DLLAZY_OR_NOW 0 --# endif --# endif --# endif --# endif --#endif -- --#ifdef __cplusplus --extern "C" void exit (int); --#endif -- --void fnord() { int i=42;} --int main () --{ -- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -- int status = $lt_dlunknown; -- -- if (self) -- { -- if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -- /* dlclose (self); */ -- } -- -- exit (status); --} --EOF -- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then -- (./conftest; exit; ) 2>/dev/null -- lt_status=$? -- case x$lt_status in -- x$lt_dlno_uscore) lt_cv_dlopen_self_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* -+ 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}' -+ 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 - -+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: 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 -+{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } -+hardcode_action_GCJ= -+if test -n "$hardcode_libdir_flag_spec_GCJ" || \ -+ test -n "$runpath_var_GCJ" || \ -+ test "X$hardcode_automatic_GCJ" = "Xyes" ; then - -- case $lt_cv_dlopen_self in -- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -- *) enable_dlopen_self=unknown ;; -- esac -+ # We can hardcode non-existant directories. -+ if test "$hardcode_direct_GCJ" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # 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; } - -- 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 - - -@@ -21042,7 +21666,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 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 \ -@@ -21083,6 +21708,7 @@ - module_cmds_GCJ \ - module_expsym_cmds_GCJ \ - lt_cv_prog_compiler_c_o_GCJ \ -+ fix_srcfile_path_GCJ \ - exclude_expsyms_GCJ \ - include_expsyms_GCJ; do - -@@ -21142,6 +21768,12 @@ - # The host system. - host_alias=$host_alias - host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - - # An echo program that does not interpret backslashes. - echo=$lt_echo -@@ -21153,6 +21785,9 @@ - # A C compiler. - LTCC=$lt_LTCC - -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ - # A language-specific compiler. - CC=$lt_compiler_GCJ - -@@ -21172,7 +21807,7 @@ - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -21203,7 +21838,7 @@ - libext="$libext" - - # Shared library suffix (normally ".so"). --shrext='$shrext' -+shrext_cmds='$shrext_cmds' - - # Executable file suffix (normally ""). - exeext="$exeext" -@@ -21218,7 +21853,7 @@ - # Does compiler simultaneously support -c and -o options? - compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -21394,7 +22029,7 @@ - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path_GCJ" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_GCJ -@@ -21420,7 +22055,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. -- test -f Makefile && make "$ltmain" -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi - - -@@ -21440,7 +22078,6 @@ - RC) - - -- - # Source file extension for RC test sources. - ac_ext=rc - -@@ -21449,7 +22086,7 @@ - objext_RC=$objext - - # Code to be used in simple compile tests --lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' - - # Code to be used in simple link tests - lt_simple_link_test_code="$lt_simple_compile_test_code" -@@ -21459,15 +22096,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 -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+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 -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+ -+ - # Allow CC to be a program name with arguments. - lt_save_CC="$CC" - CC=${RC-"windres"} - compiler=$CC - compiler_RC=$CC -+for cc_temp in $compiler""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+ - lt_cv_prog_compiler_c_o_RC=yes - - # The else clause should only fire when bootstrapping the -@@ -21483,7 +22147,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 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 \ -@@ -21524,6 +22189,7 @@ - module_cmds_RC \ - module_expsym_cmds_RC \ - lt_cv_prog_compiler_c_o_RC \ -+ fix_srcfile_path_RC \ - exclude_expsyms_RC \ - include_expsyms_RC; do - -@@ -21583,6 +22249,12 @@ - # The host system. - host_alias=$host_alias - host=$host -+host_os=$host_os -+ -+# The build system. -+build_alias=$build_alias -+build=$build -+build_os=$build_os - - # An echo program that does not interpret backslashes. - echo=$lt_echo -@@ -21594,6 +22266,9 @@ - # A C compiler. - LTCC=$lt_LTCC - -+# LTCC compiler flags. -+LTCFLAGS=$lt_LTCFLAGS -+ - # A language-specific compiler. - CC=$lt_compiler_RC - -@@ -21613,7 +22288,7 @@ - NM=$lt_NM - - # A symbol stripping program --STRIP=$STRIP -+STRIP=$lt_STRIP - - # Used to examine libraries when file_magic_cmd begins "file" - MAGIC_CMD=$MAGIC_CMD -@@ -21644,7 +22319,7 @@ - libext="$libext" - - # Shared library suffix (normally ".so"). --shrext='$shrext' -+shrext_cmds='$shrext_cmds' - - # Executable file suffix (normally ""). - exeext="$exeext" -@@ -21659,7 +22334,7 @@ - # Does compiler simultaneously support -c and -o options? - compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC - --# Must we lock files when doing compilation ? -+# Must we lock files when doing compilation? - need_locks=$lt_need_locks - - # Do we need the lib prefix for modules? -@@ -21835,7 +22510,7 @@ - sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - - # Fix the shell variable \$srcfile for the compiler. --fix_srcfile_path="$fix_srcfile_path_RC" -+fix_srcfile_path=$lt_fix_srcfile_path - - # Set to yes if exported symbols are required. - always_export_symbols=$always_export_symbols_RC -@@ -21861,7 +22536,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. -- test -f Makefile && make "$ltmain" -+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` -+ if test -f "$ltmain_in"; then -+ test -f Makefile && make "$ltmain" -+ fi - fi - - -@@ -21908,7 +22586,7 @@ - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - # Prevent multiple expansion - -@@ -21963,8 +22641,8 @@ - - # Extract the first word of "msgfmt", so it can be a program name with args. - set dummy msgfmt; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_MSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -21990,17 +22668,17 @@ - fi - MSGFMT="$ac_cv_path_MSGFMT" - if test -n "$MSGFMT"; then -- echo "$as_me:$LINENO: result: $MSGFMT" >&5 --echo "${ECHO_T}$MSGFMT" >&6 -+ { echo "$as_me:$LINENO: result: $MSGFMT" >&5 -+echo "${ECHO_T}$MSGFMT" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - # Extract the first word of "gmsgfmt", so it can be a program name with args. - set dummy gmsgfmt; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_GMSGFMT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -22015,32 +22693,33 @@ - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done - done -+IFS=$as_save_IFS - - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; - esac - fi - GMSGFMT=$ac_cv_path_GMSGFMT -- - if test -n "$GMSGFMT"; then -- echo "$as_me:$LINENO: result: $GMSGFMT" >&5 --echo "${ECHO_T}$GMSGFMT" >&6 -+ { echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -+echo "${ECHO_T}$GMSGFMT" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -+ - if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then -- echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 --echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6 -+ { echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5 -+echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6; } - GMSGFMT=":" - fi - MSGFMT=$GMSGFMT -@@ -22049,8 +22728,8 @@ - - # Extract the first word of "xgettext", so it can be a program name with args. - set dummy xgettext; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } - if test "${ac_cv_path_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -22076,11 +22755,11 @@ - fi - XGETTEXT="$ac_cv_path_XGETTEXT" - if test -n "$XGETTEXT"; then -- echo "$as_me:$LINENO: result: $XGETTEXT" >&5 --echo "${ECHO_T}$XGETTEXT" >&6 -+ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -+echo "${ECHO_T}$XGETTEXT" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi - - -@@ -22088,8 +22767,8 @@ - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else -- echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5 --echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6 -+ { echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5 -+echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6; } - XGETTEXT=":" - fi - fi -@@ -22183,8 +22862,7 @@ - - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -22196,8 +22874,8 @@ - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`" - -- echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5 --echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5 -+echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6; } - if test "${kde_cv_stl_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -22225,41 +22903,37 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - kde_cv_stl_works=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --kde_cv_stl_works=no -+ kde_cv_stl_works=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - fi - - -- echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5 --echo "${ECHO_T}$kde_cv_stl_works" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5 -+echo "${ECHO_T}$kde_cv_stl_works" >&6; } - - if test "$kde_cv_stl_works" = "yes"; then - # back compatible -@@ -22288,15 +22962,14 @@ - - - --echo "$as_me:$LINENO: checking for strlcat" >&5 --echo $ECHO_N "checking for strlcat... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for strlcat" >&5 -+echo $ECHO_N "checking for strlcat... $ECHO_C" >&6; } - if test "${kde_cv_func_strlcat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -22308,9 +22981,6 @@ - save_CXXFLAGS="$CXXFLAGS" - kde_safe_LIBS="$LIBS" - LIBS="$LIBS $X_EXTRA_LIBS" --if test "$GXX" = "yes"; then --CXXFLAGS="$CXXFLAGS -pedantic-errors" --fi - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22336,35 +23006,31 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - kde_cv_func_strlcat=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --kde_cv_func_strlcat=no -+ kde_cv_func_strlcat=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - LIBS="$kde_safe_LIBS" - ac_ext=c -@@ -22377,11 +23043,11 @@ - fi - - --echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5 --echo "${ECHO_T}$kde_cv_func_strlcat" >&6 -+{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcat" >&5 -+echo "${ECHO_T}$kde_cv_func_strlcat" >&6; } - --echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5 --echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5 -+echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6; } - if test "${kde_cv_proto_strlcat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -22402,8 +23068,7 @@ - if test "x$kde_cv_proto_strlcat" = xunknown; then - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -22441,37 +23106,34 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - kde_cv_func_strlcat=yes - kde_cv_proto_strlcat=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --kde_cv_proto_strlcat="strlcat unavailable" -+ kde_cv_proto_strlcat="strlcat unavailable" - - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$kde_safe_libs - ac_ext=c -@@ -22484,8 +23146,8 @@ - - fi - --echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5 --echo "${ECHO_T}$kde_cv_proto_strlcat" >&6 -+{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5 -+echo "${ECHO_T}$kde_cv_proto_strlcat" >&6; } - - if test "x$kde_cv_func_strlcat" = xyes; then - -@@ -22509,15 +23171,14 @@ - - - --echo "$as_me:$LINENO: checking for strlcpy" >&5 --echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for strlcpy" >&5 -+echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6; } - if test "${kde_cv_func_strlcpy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -22529,9 +23190,6 @@ - save_CXXFLAGS="$CXXFLAGS" - kde_safe_LIBS="$LIBS" - LIBS="$LIBS $X_EXTRA_LIBS" --if test "$GXX" = "yes"; then --CXXFLAGS="$CXXFLAGS -pedantic-errors" --fi - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -22556,35 +23214,31 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - kde_cv_func_strlcpy=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --kde_cv_func_strlcpy=no -+ kde_cv_func_strlcpy=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - LIBS="$kde_safe_LIBS" - ac_ext=c -@@ -22597,11 +23251,11 @@ - fi - - --echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5 --echo "${ECHO_T}$kde_cv_func_strlcpy" >&6 -+{ echo "$as_me:$LINENO: result: $kde_cv_func_strlcpy" >&5 -+echo "${ECHO_T}$kde_cv_func_strlcpy" >&6; } - --echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5 --echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5 -+echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6; } - if test "${kde_cv_proto_strlcpy+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -22622,8 +23276,7 @@ - if test "x$kde_cv_proto_strlcpy" = xunknown; then - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -22660,37 +23313,34 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - kde_cv_func_strlcpy=yes - kde_cv_proto_strlcpy=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --kde_cv_proto_strlcpy="strlcpy unavailable" -+ kde_cv_proto_strlcpy="strlcpy unavailable" - - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$kde_safe_libs - ac_ext=c -@@ -22703,8 +23353,8 @@ - - fi - --echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5 --echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6 -+{ echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5 -+echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6; } - - if test "x$kde_cv_func_strlcpy" = xyes; then - -@@ -22727,8 +23377,8 @@ - - - -- echo "$as_me:$LINENO: checking for main in -lutil" >&5 --echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for main in -lutil" >&5 -+echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6; } - if test "${ac_cv_lib_util_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -22745,52 +23395,49 @@ - int - main () - { --main (); -+return main (); - ; - 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_util_main=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_util_main=no -+ ac_cv_lib_util_main=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5 --echo "${ECHO_T}$ac_cv_lib_util_main" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5 -+echo "${ECHO_T}$ac_cv_lib_util_main" >&6; } - if test $ac_cv_lib_util_main = yes; then - LIBUTIL="-lutil" - fi - -- echo "$as_me:$LINENO: checking for main in -lcompat" >&5 --echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for main in -lcompat" >&5 -+echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6; } - if test "${ac_cv_lib_compat_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -22807,53 +23454,50 @@ - int - main () - { --main (); -+return main (); - ; - 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 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_compat_main=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_compat_main=no -+ ac_cv_lib_compat_main=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5 --echo "${ECHO_T}$ac_cv_lib_compat_main" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5 -+echo "${ECHO_T}$ac_cv_lib_compat_main" >&6; } - if test $ac_cv_lib_compat_main = yes; then - LIBCOMPAT="-lcompat" - fi - - kde_have_crypt= -- echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 --echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 -+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; } - if test "${ac_cv_lib_crypt_crypt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -22866,61 +23510,58 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char crypt (); - int - main () - { --crypt (); -+return crypt (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_crypt_crypt=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_crypt_crypt=no -+ ac_cv_lib_crypt_crypt=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 --echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 -+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; } - if test $ac_cv_lib_crypt_crypt = yes; then - LIBCRYPT="-lcrypt"; kde_have_crypt=yes - else -- echo "$as_me:$LINENO: checking for crypt in -lc" >&5 --echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for crypt in -lc" >&5 -+echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6; } - if test "${ac_cv_lib_c_crypt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -22933,56 +23574,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char crypt (); - int - main () - { --crypt (); -+return crypt (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_c_crypt=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_c_crypt=no -+ ac_cv_lib_c_crypt=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5 --echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5 -+echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6; } - if test $ac_cv_lib_c_crypt = yes; then - kde_have_crypt=yes - else -@@ -23008,13 +23646,13 @@ - - fi - -- echo "$as_me:$LINENO: checking for socklen_t" >&5 --echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for socklen_t" >&5 -+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; } - if test "${kde_cv_socklen_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -23043,27 +23681,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - - kde_cv_socklen_t=yes - kde_cv_socklen_t_equiv=socklen_t -@@ -23072,8 +23705,10 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -23083,17 +23718,17 @@ - - fi - -- echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5 --echo "${ECHO_T}$kde_cv_socklen_t" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_socklen_t" >&5 -+echo "${ECHO_T}$kde_cv_socklen_t" >&6; } - if test $kde_cv_socklen_t = no; then -- echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5 --echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for socklen_t equivalent for socket functions" >&5 -+echo $ECHO_N "checking for socklen_t equivalent for socket functions... $ECHO_C" >&6; } - if test "${kde_cv_socklen_t_equiv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - kde_cv_socklen_t_equiv=int -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -23122,27 +23757,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - - kde_cv_socklen_t_equiv="$t" - break -@@ -23151,8 +23781,10 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -23163,8 +23795,8 @@ - - fi - -- echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5 --echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_socklen_t_equiv" >&5 -+echo "${ECHO_T}$kde_cv_socklen_t_equiv" >&6; } - fi - - cat >>confdefs.h <<_ACEOF -@@ -23177,8 +23809,8 @@ - _ACEOF - - -- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 --echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } - if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -23191,63 +23823,60 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char dnet_ntoa (); - int - main () - { --dnet_ntoa (); -+return dnet_ntoa (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_dnet_dnet_ntoa=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_dnet_dnet_ntoa=no -+ ac_cv_lib_dnet_dnet_ntoa=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 --echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } - if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" - fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then -- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 --echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } - if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -23260,63 +23889,60 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char dnet_ntoa (); - int - main () - { --dnet_ntoa (); -+return dnet_ntoa (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_dnet_stub_dnet_ntoa=no -+ ac_cv_lib_dnet_stub_dnet_ntoa=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 --echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } - if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" - fi - - fi -- echo "$as_me:$LINENO: checking for inet_ntoa" >&5 --echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for inet_ntoa" >&5 -+echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6; } - if test "${ac_cv_func_inet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -23343,72 +23969,63 @@ - - #undef inet_ntoa - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char inet_ntoa (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_inet_ntoa) || defined (__stub___inet_ntoa) -+#if defined __stub_inet_ntoa || defined __stub___inet_ntoa - choke me --#else --char (*f) () = inet_ntoa; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != inet_ntoa; -+return inet_ntoa (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_inet_ntoa=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_func_inet_ntoa=no -+ ac_cv_func_inet_ntoa=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5 --echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5 -+echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6; } - - if test $ac_cv_func_inet_ntoa = no; then -- echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5 --echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5 -+echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6; } - if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -23421,63 +24038,60 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char inet_ntoa (); - int - main () - { --inet_ntoa (); -+return inet_ntoa (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_nsl_inet_ntoa=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_nsl_inet_ntoa=no -+ ac_cv_lib_nsl_inet_ntoa=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5 --echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5 -+echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6; } - if test $ac_cv_lib_nsl_inet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" - fi - - fi -- echo "$as_me:$LINENO: checking for connect" >&5 --echo $ECHO_N "checking for connect... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for connect" >&5 -+echo $ECHO_N "checking for connect... $ECHO_C" >&6; } - if test "${ac_cv_func_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -23504,72 +24118,63 @@ - - #undef connect - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char connect (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_connect) || defined (__stub___connect) -+#if defined __stub_connect || defined __stub___connect - choke me --#else --char (*f) () = connect; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != connect; -+return connect (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_connect=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_func_connect=no -+ ac_cv_func_connect=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 --echo "${ECHO_T}$ac_cv_func_connect" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -+echo "${ECHO_T}$ac_cv_func_connect" >&6; } - - if test $ac_cv_func_connect = no; then -- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 --echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } - if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -23582,64 +24187,61 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char connect (); - int - main () - { --connect (); -+return connect (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_socket_connect=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_socket_connect=no -+ ac_cv_lib_socket_connect=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 --echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } - if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" - fi - - fi - -- echo "$as_me:$LINENO: checking for remove" >&5 --echo $ECHO_N "checking for remove... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for remove" >&5 -+echo $ECHO_N "checking for remove... $ECHO_C" >&6; } - if test "${ac_cv_func_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -23666,72 +24268,63 @@ - - #undef remove - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char remove (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_remove) || defined (__stub___remove) -+#if defined __stub_remove || defined __stub___remove - choke me --#else --char (*f) () = remove; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != remove; -+return remove (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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=$? -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_remove=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_func_remove=no -+ ac_cv_func_remove=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 --echo "${ECHO_T}$ac_cv_func_remove" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -+echo "${ECHO_T}$ac_cv_func_remove" >&6; } - - if test $ac_cv_func_remove = no; then -- echo "$as_me:$LINENO: checking for remove in -lposix" >&5 --echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } - if test "${ac_cv_lib_posix_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -23744,56 +24337,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char remove (); - int - main () - { --remove (); -+return remove (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_posix_remove=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_posix_remove=no -+ ac_cv_lib_posix_remove=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 --echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } - if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" - fi -@@ -23801,8 +24391,8 @@ - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. -- echo "$as_me:$LINENO: checking for shmat" >&5 --echo $ECHO_N "checking for shmat... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for shmat" >&5 -+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } - if test "${ac_cv_func_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -23829,73 +24419,64 @@ - - #undef shmat - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char shmat (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_shmat) || defined (__stub___shmat) -+#if defined __stub_shmat || defined __stub___shmat - choke me --#else --char (*f) () = shmat; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != shmat; -+return shmat (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func_shmat=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_func_shmat=no -+ ac_cv_func_shmat=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 --echo "${ECHO_T}$ac_cv_func_shmat" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -+echo "${ECHO_T}$ac_cv_func_shmat" >&6; } - if test $ac_cv_func_shmat = yes; then - : - else -- echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 --echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } - if test "${ac_cv_lib_ipc_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -23908,56 +24489,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char shmat (); - int - main () - { --shmat (); -+return shmat (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_ipc_shmat=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_ipc_shmat=no -+ ac_cv_lib_ipc_shmat=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 --echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } - if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" - fi -@@ -23971,18 +24549,19 @@ - for ac_header in sys/types.h stdint.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23993,41 +24572,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24036,24 +24611,22 @@ - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -24061,9 +24634,10 @@ - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -24087,25 +24661,19 @@ - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -24123,18 +24691,19 @@ - for ac_header in sys/bitypes.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24145,41 +24714,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24188,24 +24753,22 @@ - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -24213,9 +24776,10 @@ - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -24239,25 +24803,19 @@ - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -24271,8 +24829,8 @@ - - - # darwin requires a poll emulation library -- echo "$as_me:$LINENO: checking for poll in -lpoll" >&5 --echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for poll in -lpoll" >&5 -+echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6; } - if test "${ac_cv_lib_poll_poll+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -24285,56 +24843,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char poll (); - int - main () - { --poll (); -+return poll (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_poll_poll=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_poll_poll=no -+ ac_cv_lib_poll_poll=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5 --echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5 -+echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6; } - if test $ac_cv_lib_poll_poll = yes; then - LIB_POLL="-lpoll" - fi -@@ -24345,18 +24900,19 @@ - for ac_header in Carbon/Carbon.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24367,41 +24923,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24410,24 +24962,22 @@ - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -24435,9 +24985,10 @@ - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -24461,25 +25012,19 @@ - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -24494,17 +25039,17 @@ - - # CoreAudio framework - if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then -- echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5 --echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5 -+echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; } - if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5 --echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5 --echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5 -+echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24515,41 +25060,37 @@ - #include - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5 --echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5 -+echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24558,24 +25099,22 @@ - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -24583,9 +25122,10 @@ - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -24609,25 +25149,18 @@ - echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ - ;; - esac --echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5 --echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5 -+echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; } - if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc - fi --echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5 --echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5 -+echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; } - - fi - if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then -@@ -24644,8 +25177,8 @@ - - - -- echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5 --echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5 -+echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6; } - kde_libs_safe="$LIBS" - LIBS="$LIBS $X_EXTRA_LIBS -lresolv" - cat >conftest.$ac_ext <<_ACEOF -@@ -24671,31 +25204,27 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - - LIBRESOLV="-lresolv" -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - - cat >>confdefs.h <<\_ACEOF - #define HAVE_RES_INIT 1 -@@ -24706,25 +25235,25 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$kde_libs_safe - - - --echo "$as_me:$LINENO: checking for res_init" >&5 --echo $ECHO_N "checking for res_init... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for res_init" >&5 -+echo $ECHO_N "checking for res_init... $ECHO_C" >&6; } - if test "${kde_cv_func_res_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -24736,9 +25265,6 @@ - save_CXXFLAGS="$CXXFLAGS" - kde_safe_LIBS="$LIBS" - LIBS="$LIBS $X_EXTRA_LIBS" --if test "$GXX" = "yes"; then --CXXFLAGS="$CXXFLAGS -pedantic-errors" --fi - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24764,35 +25290,31 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - kde_cv_func_res_init=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --kde_cv_func_res_init=no -+ kde_cv_func_res_init=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - LIBS="$kde_safe_LIBS" - ac_ext=c -@@ -24805,11 +25327,11 @@ - fi - - --echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5 --echo "${ECHO_T}$kde_cv_func_res_init" >&6 -+{ echo "$as_me:$LINENO: result: $kde_cv_func_res_init" >&5 -+echo "${ECHO_T}$kde_cv_func_res_init" >&6; } - --echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5 --echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if res_init needs custom prototype" >&5 -+echo $ECHO_N "checking if res_init needs custom prototype... $ECHO_C" >&6; } - if test "${kde_cv_proto_res_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -24830,8 +25352,7 @@ - if test "x$kde_cv_proto_res_init" = xunknown; then - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -24869,37 +25390,34 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - kde_cv_func_res_init=yes - kde_cv_proto_res_init=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --kde_cv_proto_res_init="res_init unavailable" -+ kde_cv_proto_res_init="res_init unavailable" - - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$kde_safe_libs - ac_ext=c -@@ -24912,8 +25430,8 @@ - - fi - --echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5 --echo "${ECHO_T}$kde_cv_proto_res_init" >&6 -+{ echo "$as_me:$LINENO: result: $kde_cv_proto_res_init" >&5 -+echo "${ECHO_T}$kde_cv_proto_res_init" >&6; } - - if test "x$kde_cv_func_res_init" = xyes; then - -@@ -24940,8 +25458,8 @@ - LIBSOCKET="$X_EXTRA_LIBS" - - -- echo "$as_me:$LINENO: checking for killpg in -lucb" >&5 --echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for killpg in -lucb" >&5 -+echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6; } - if test "${ac_cv_lib_ucb_killpg+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -24954,69 +25472,66 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char killpg (); - int - main () - { --killpg (); -+return killpg (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_ucb_killpg=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_ucb_killpg=no -+ ac_cv_lib_ucb_killpg=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5 --echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5 -+echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6; } - if test $ac_cv_lib_ucb_killpg = yes; then - LIBUCB="-lucb" - fi - - - case $host in *-*-lynxos* ) -- echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5 --echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5 -+echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6; } - CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__" -- echo "$as_me:$LINENO: result: disabled" >&5 --echo "${ECHO_T}disabled" >&6 -- echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 --echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: result: disabled" >&5 -+echo "${ECHO_T}disabled" >&6; } -+ { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } - if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -25029,64 +25544,61 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char gethostbyname (); - int - main () - { --gethostbyname (); -+return gethostbyname (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_bsd_gethostbyname=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_bsd_gethostbyname=no -+ ac_cv_lib_bsd_gethostbyname=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } - if test $ac_cv_lib_bsd_gethostbyname = yes; then - LIBSOCKET="-lbsd" - fi - ;; - esac - -- echo "$as_me:$LINENO: checking for int" >&5 --echo $ECHO_N "checking for int... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for int" >&5 -+echo $ECHO_N "checking for int... $ECHO_C" >&6; } - if test "${ac_cv_type_int+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -25097,61 +25609,57 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+typedef int ac__type_new_; - int - main () - { --if ((int *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (int)) -+if (sizeof (ac__type_new_)) - return 0; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_int=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_int=no -+ ac_cv_type_int=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 --echo "${ECHO_T}$ac_cv_type_int" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 -+echo "${ECHO_T}$ac_cv_type_int" >&6; } - --echo "$as_me:$LINENO: checking size of int" >&5 --echo $ECHO_N "checking size of int... $ECHO_C" >&6 -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ echo "$as_me:$LINENO: checking size of int" >&5 -+echo $ECHO_N "checking size of int... $ECHO_C" >&6; } - if test "${ac_cv_sizeof_int+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test "$ac_cv_type_int" = yes; then -- # The cast to unsigned long works around a bug in the HP C Compiler -- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -- # This bug is HP SR number 8606223364. - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >conftest.$ac_ext <<_ACEOF -@@ -25161,10 +25669,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef int ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; - test_array [0] = 0 - - ; -@@ -25172,27 +25681,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -25202,10 +25706,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef int ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -25213,56 +25718,53 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo=`expr $ac_mid + 1` -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid + 1` -+ ac_lo=`expr $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef int ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; - test_array [0] = 0 - - ; -@@ -25270,27 +25772,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -25300,10 +25797,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef int ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -25311,50 +25809,48 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_hi=`expr '(' $ac_mid ')' - 1` -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid` -+ ac_hi=`expr '(' $ac_mid ')' - 1` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo= ac_hi= -+ ac_lo= ac_hi= - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - # Binary search between lo and hi bounds. - while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` -@@ -25365,10 +25861,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef int ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -25376,52 +25873,45 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo=`expr '(' $ac_mid ')' + 1` -+ ac_lo=`expr '(' $ac_mid ')' + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - case $ac_lo in - ?*) ac_cv_sizeof_int=$ac_lo;; --'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 -+'') if test "$ac_cv_type_int" = yes; then -+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (int), 77 -+echo "$as_me: error: cannot compute sizeof (int) - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } ;; -+ { (exit 77); exit 77; }; } -+ else -+ ac_cv_sizeof_int=0 -+ fi ;; - esac - else -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25429,8 +25919,9 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --long longval () { return (long) (sizeof (int)); } --unsigned long ulongval () { return (long) (sizeof (int)); } -+ typedef int ac__type_sizeof_; -+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } - #include - #include - int -@@ -25439,35 +25930,44 @@ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) -- exit (1); -- if (((long) (sizeof (int))) < 0) -+ return 1; -+ if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { -- long i = longval (); -- if (i != ((long) (sizeof (int)))) -- exit (1); -+ long int i = longval (); -+ if (i != ((long int) (sizeof (ac__type_sizeof_)))) -+ return 1; - fprintf (f, "%ld\n", i); - } - else - { -- unsigned long i = ulongval (); -- if (i != ((long) (sizeof (int)))) -- exit (1); -+ unsigned long int i = ulongval (); -+ if (i != ((long int) (sizeof (ac__type_sizeof_)))) -+ return 1; - fprintf (f, "%lu\n", i); - } -- exit (ferror (f) || fclose (f) != 0); -+ return ferror (f) || fclose (f) != 0; - - ; - return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -25478,28 +25978,31 @@ - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) --{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 -+if test "$ac_cv_type_int" = yes; then -+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (int) - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (int), 77 -+echo "$as_me: error: cannot compute sizeof (int) - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ { (exit 77); exit 77; }; } -+ else -+ ac_cv_sizeof_int=0 -+ fi - fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - rm -f conftest.val --else -- ac_cv_sizeof_int=0 --fi - fi --echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 --echo "${ECHO_T}$ac_cv_sizeof_int" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 -+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; } -+ -+ -+ - cat >>confdefs.h <<_ACEOF - #define SIZEOF_INT $ac_cv_sizeof_int - _ACEOF - -- echo "$as_me:$LINENO: checking for short" >&5 --echo $ECHO_N "checking for short... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for short" >&5 -+echo $ECHO_N "checking for short... $ECHO_C" >&6; } - if test "${ac_cv_type_short+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -25510,61 +26013,57 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+typedef short ac__type_new_; - int - main () - { --if ((short *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (short)) -+if (sizeof (ac__type_new_)) - return 0; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_short=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_short=no -+ ac_cv_type_short=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 --echo "${ECHO_T}$ac_cv_type_short" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 -+echo "${ECHO_T}$ac_cv_type_short" >&6; } - --echo "$as_me:$LINENO: checking size of short" >&5 --echo $ECHO_N "checking size of short... $ECHO_C" >&6 -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ echo "$as_me:$LINENO: checking size of short" >&5 -+echo $ECHO_N "checking size of short... $ECHO_C" >&6; } - if test "${ac_cv_sizeof_short+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test "$ac_cv_type_short" = yes; then -- # The cast to unsigned long works around a bug in the HP C Compiler -- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -- # This bug is HP SR number 8606223364. - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >conftest.$ac_ext <<_ACEOF -@@ -25574,10 +26073,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef short ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; - test_array [0] = 0 - - ; -@@ -25585,27 +26085,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -25615,10 +26110,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef short ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -25626,56 +26122,53 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo=`expr $ac_mid + 1` -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid + 1` -+ ac_lo=`expr $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef short ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; - test_array [0] = 0 - - ; -@@ -25683,27 +26176,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -25713,10 +26201,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef short ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -25724,50 +26213,48 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_hi=`expr '(' $ac_mid ')' - 1` -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid` -+ ac_hi=`expr '(' $ac_mid ')' - 1` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo= ac_hi= -+ ac_lo= ac_hi= - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - # Binary search between lo and hi bounds. - while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` -@@ -25778,10 +26265,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef short ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -25789,52 +26277,45 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo=`expr '(' $ac_mid ')' + 1` -+ ac_lo=`expr '(' $ac_mid ')' + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - case $ac_lo in - ?*) ac_cv_sizeof_short=$ac_lo;; --'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 -+'') if test "$ac_cv_type_short" = yes; then -+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (short), 77 -+echo "$as_me: error: cannot compute sizeof (short) - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } ;; -+ { (exit 77); exit 77; }; } -+ else -+ ac_cv_sizeof_short=0 -+ fi ;; - esac - else -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -25842,8 +26323,9 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --long longval () { return (long) (sizeof (short)); } --unsigned long ulongval () { return (long) (sizeof (short)); } -+ typedef short ac__type_sizeof_; -+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } - #include - #include - int -@@ -25852,35 +26334,44 @@ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) -- exit (1); -- if (((long) (sizeof (short))) < 0) -+ return 1; -+ if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { -- long i = longval (); -- if (i != ((long) (sizeof (short)))) -- exit (1); -+ long int i = longval (); -+ if (i != ((long int) (sizeof (ac__type_sizeof_)))) -+ return 1; - fprintf (f, "%ld\n", i); - } - else - { -- unsigned long i = ulongval (); -- if (i != ((long) (sizeof (short)))) -- exit (1); -+ unsigned long int i = ulongval (); -+ if (i != ((long int) (sizeof (ac__type_sizeof_)))) -+ return 1; - fprintf (f, "%lu\n", i); - } -- exit (ferror (f) || fclose (f) != 0); -+ return ferror (f) || fclose (f) != 0; - - ; - return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -25891,28 +26382,31 @@ - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) --{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77 -+if test "$ac_cv_type_short" = yes; then -+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (short) - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (short), 77 -+echo "$as_me: error: cannot compute sizeof (short) - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ { (exit 77); exit 77; }; } -+ else -+ ac_cv_sizeof_short=0 -+ fi - fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - rm -f conftest.val --else -- ac_cv_sizeof_short=0 --fi - fi --echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 --echo "${ECHO_T}$ac_cv_sizeof_short" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 -+echo "${ECHO_T}$ac_cv_sizeof_short" >&6; } -+ -+ -+ - cat >>confdefs.h <<_ACEOF - #define SIZEOF_SHORT $ac_cv_sizeof_short - _ACEOF - -- echo "$as_me:$LINENO: checking for long" >&5 --echo $ECHO_N "checking for long... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for long" >&5 -+echo $ECHO_N "checking for long... $ECHO_C" >&6; } - if test "${ac_cv_type_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -25923,61 +26417,57 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+typedef long ac__type_new_; - int - main () - { --if ((long *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (long)) -+if (sizeof (ac__type_new_)) - return 0; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_long=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_long=no -+ ac_cv_type_long=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 --echo "${ECHO_T}$ac_cv_type_long" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 -+echo "${ECHO_T}$ac_cv_type_long" >&6; } - --echo "$as_me:$LINENO: checking size of long" >&5 --echo $ECHO_N "checking size of long... $ECHO_C" >&6 -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ echo "$as_me:$LINENO: checking size of long" >&5 -+echo $ECHO_N "checking size of long... $ECHO_C" >&6; } - if test "${ac_cv_sizeof_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test "$ac_cv_type_long" = yes; then -- # The cast to unsigned long works around a bug in the HP C Compiler -- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -- # This bug is HP SR number 8606223364. - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >conftest.$ac_ext <<_ACEOF -@@ -25987,10 +26477,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef long ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; - test_array [0] = 0 - - ; -@@ -25998,27 +26489,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -26028,10 +26514,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef long ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -26039,56 +26526,53 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo=`expr $ac_mid + 1` -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid + 1` -+ ac_lo=`expr $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef long ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; - test_array [0] = 0 - - ; -@@ -26096,27 +26580,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -26126,10 +26605,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef long ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -26137,50 +26617,48 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_hi=`expr '(' $ac_mid ')' - 1` -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid` -+ ac_hi=`expr '(' $ac_mid ')' - 1` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo= ac_hi= -+ ac_lo= ac_hi= - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - # Binary search between lo and hi bounds. - while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` -@@ -26191,10 +26669,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef long ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -26202,52 +26681,45 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo=`expr '(' $ac_mid ')' + 1` -+ ac_lo=`expr '(' $ac_mid ')' + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - case $ac_lo in - ?*) ac_cv_sizeof_long=$ac_lo;; --'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 -+'') if test "$ac_cv_type_long" = yes; then -+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (long), 77 -+echo "$as_me: error: cannot compute sizeof (long) - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } ;; -+ { (exit 77); exit 77; }; } -+ else -+ ac_cv_sizeof_long=0 -+ fi ;; - esac - else -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26255,8 +26727,9 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --long longval () { return (long) (sizeof (long)); } --unsigned long ulongval () { return (long) (sizeof (long)); } -+ typedef long ac__type_sizeof_; -+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } - #include - #include - int -@@ -26265,35 +26738,44 @@ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) -- exit (1); -- if (((long) (sizeof (long))) < 0) -+ return 1; -+ if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { -- long i = longval (); -- if (i != ((long) (sizeof (long)))) -- exit (1); -+ long int i = longval (); -+ if (i != ((long int) (sizeof (ac__type_sizeof_)))) -+ return 1; - fprintf (f, "%ld\n", i); - } - else - { -- unsigned long i = ulongval (); -- if (i != ((long) (sizeof (long)))) -- exit (1); -+ unsigned long int i = ulongval (); -+ if (i != ((long int) (sizeof (ac__type_sizeof_)))) -+ return 1; - fprintf (f, "%lu\n", i); - } -- exit (ferror (f) || fclose (f) != 0); -+ return ferror (f) || fclose (f) != 0; - - ; - return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -26304,28 +26786,31 @@ - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) --{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 -+if test "$ac_cv_type_long" = yes; then -+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long) - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (long), 77 -+echo "$as_me: error: cannot compute sizeof (long) - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ { (exit 77); exit 77; }; } -+ else -+ ac_cv_sizeof_long=0 -+ fi - fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - rm -f conftest.val --else -- ac_cv_sizeof_long=0 --fi - fi --echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 --echo "${ECHO_T}$ac_cv_sizeof_long" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 -+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; } -+ -+ -+ - cat >>confdefs.h <<_ACEOF - #define SIZEOF_LONG $ac_cv_sizeof_long - _ACEOF - -- echo "$as_me:$LINENO: checking for char *" >&5 --echo $ECHO_N "checking for char *... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for char *" >&5 -+echo $ECHO_N "checking for char *... $ECHO_C" >&6; } - if test "${ac_cv_type_char_p+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -26336,61 +26821,57 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+typedef char * ac__type_new_; - int - main () - { --if ((char * *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (char *)) -+if (sizeof (ac__type_new_)) - return 0; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_char_p=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_char_p=no -+ ac_cv_type_char_p=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5 --echo "${ECHO_T}$ac_cv_type_char_p" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5 -+echo "${ECHO_T}$ac_cv_type_char_p" >&6; } - --echo "$as_me:$LINENO: checking size of char *" >&5 --echo $ECHO_N "checking size of char *... $ECHO_C" >&6 -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ echo "$as_me:$LINENO: checking size of char *" >&5 -+echo $ECHO_N "checking size of char *... $ECHO_C" >&6; } - if test "${ac_cv_sizeof_char_p+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test "$ac_cv_type_char_p" = yes; then -- # The cast to unsigned long works around a bug in the HP C Compiler -- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -- # This bug is HP SR number 8606223364. - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >conftest.$ac_ext <<_ACEOF -@@ -26400,10 +26881,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef char * ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= 0)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; - test_array [0] = 0 - - ; -@@ -26411,27 +26893,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -26441,10 +26918,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef char * ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -26452,56 +26930,53 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo=`expr $ac_mid + 1` -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid + 1` -+ ac_lo=`expr $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef char * ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (char *))) < 0)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; - test_array [0] = 0 - - ; -@@ -26509,27 +26984,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -26539,10 +27009,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef char * ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (char *))) >= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -26550,50 +27021,48 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_hi=`expr '(' $ac_mid ')' - 1` -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid` -+ ac_hi=`expr '(' $ac_mid ')' - 1` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo= ac_hi= -+ ac_lo= ac_hi= - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - # Binary search between lo and hi bounds. - while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` -@@ -26604,10 +27073,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef char * ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (char *))) <= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -26615,52 +27085,45 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo=`expr '(' $ac_mid ')' + 1` -+ ac_lo=`expr '(' $ac_mid ')' + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - case $ac_lo in - ?*) ac_cv_sizeof_char_p=$ac_lo;; --'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 -+'') if test "$ac_cv_type_char_p" = yes; then -+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *) - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (char *), 77 -+echo "$as_me: error: cannot compute sizeof (char *) - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } ;; -+ { (exit 77); exit 77; }; } -+ else -+ ac_cv_sizeof_char_p=0 -+ fi ;; - esac - else -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -26668,8 +27131,9 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --long longval () { return (long) (sizeof (char *)); } --unsigned long ulongval () { return (long) (sizeof (char *)); } -+ typedef char * ac__type_sizeof_; -+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } - #include - #include - int -@@ -26678,35 +27142,44 @@ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) -- exit (1); -- if (((long) (sizeof (char *))) < 0) -+ return 1; -+ if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { -- long i = longval (); -- if (i != ((long) (sizeof (char *)))) -- exit (1); -+ long int i = longval (); -+ if (i != ((long int) (sizeof (ac__type_sizeof_)))) -+ return 1; - fprintf (f, "%ld\n", i); - } - else - { -- unsigned long i = ulongval (); -- if (i != ((long) (sizeof (char *)))) -- exit (1); -+ unsigned long int i = ulongval (); -+ if (i != ((long int) (sizeof (ac__type_sizeof_)))) -+ return 1; - fprintf (f, "%lu\n", i); - } -- exit (ferror (f) || fclose (f) != 0); -+ return ferror (f) || fclose (f) != 0; - - ; - return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -26717,30 +27190,33 @@ - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) --{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77 -+if test "$ac_cv_type_char_p" = yes; then -+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *) - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (char *), 77 -+echo "$as_me: error: cannot compute sizeof (char *) - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ { (exit 77); exit 77; }; } -+ else -+ ac_cv_sizeof_char_p=0 -+ fi - fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - rm -f conftest.val --else -- ac_cv_sizeof_char_p=0 --fi - fi --echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5 --echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5 -+echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6; } -+ -+ -+ - cat >>confdefs.h <<_ACEOF - #define SIZEOF_CHAR_P $ac_cv_sizeof_char_p - _ACEOF - - - --echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 --echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } - if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -26753,56 +27229,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char dlopen (); - int - main () - { --dlopen (); -+return dlopen (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; 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 -+ ac_cv_lib_dl_dlopen=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } - if test $ac_cv_lib_dl_dlopen = yes; then - - LIBDL="-ldl" -@@ -26811,8 +27284,8 @@ - fi - - --echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5 --echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5 -+echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6; } - if test "${ac_cv_lib_dld_shl_unload+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -26825,56 +27298,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char shl_unload (); - int - main () - { --shl_unload (); -+return shl_unload (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_dld_shl_unload=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_dld_shl_unload=no -+ ac_cv_lib_dld_shl_unload=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5 --echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_unload" >&5 -+echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6; } - if test $ac_cv_lib_dld_shl_unload = yes; then - - LIBDL="-ldld" -@@ -26888,8 +27358,8 @@ - - - -- echo "$as_me:$LINENO: checking for size_t" >&5 --echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for size_t" >&5 -+echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } - if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -26900,61 +27370,57 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+typedef size_t ac__type_new_; - int - main () - { --if ((size_t *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (size_t)) -+if (sizeof (ac__type_new_)) - return 0; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_size_t=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_size_t=no -+ ac_cv_type_size_t=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 --echo "${ECHO_T}$ac_cv_type_size_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -+echo "${ECHO_T}$ac_cv_type_size_t" >&6; } - --echo "$as_me:$LINENO: checking size of size_t" >&5 --echo $ECHO_N "checking size of size_t... $ECHO_C" >&6 -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ echo "$as_me:$LINENO: checking size of size_t" >&5 -+echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; } - if test "${ac_cv_sizeof_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test "$ac_cv_type_size_t" = yes; then -- # The cast to unsigned long works around a bug in the HP C Compiler -- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -- # This bug is HP SR number 8606223364. - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >conftest.$ac_ext <<_ACEOF -@@ -26964,10 +27430,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef size_t ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; - test_array [0] = 0 - - ; -@@ -26975,27 +27442,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -27005,10 +27467,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef size_t ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -27016,56 +27479,53 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo=`expr $ac_mid + 1` -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid + 1` -+ ac_lo=`expr $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef size_t ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; - test_array [0] = 0 - - ; -@@ -27073,27 +27533,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -27103,10 +27558,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef size_t ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -27114,50 +27570,48 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_hi=`expr '(' $ac_mid ')' - 1` -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid` -+ ac_hi=`expr '(' $ac_mid ')' - 1` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo= ac_hi= -+ ac_lo= ac_hi= - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - # Binary search between lo and hi bounds. - while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` -@@ -27168,10 +27622,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef size_t ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -27179,52 +27634,45 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo=`expr '(' $ac_mid ')' + 1` -+ ac_lo=`expr '(' $ac_mid ')' + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - case $ac_lo in - ?*) ac_cv_sizeof_size_t=$ac_lo;; --'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 -+'') if test "$ac_cv_type_size_t" = yes; then -+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (size_t), 77 -+echo "$as_me: error: cannot compute sizeof (size_t) - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } ;; -+ { (exit 77); exit 77; }; } -+ else -+ ac_cv_sizeof_size_t=0 -+ fi ;; - esac - else -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27232,8 +27680,9 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --long longval () { return (long) (sizeof (size_t)); } --unsigned long ulongval () { return (long) (sizeof (size_t)); } -+ typedef size_t ac__type_sizeof_; -+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } - #include - #include - int -@@ -27242,35 +27691,44 @@ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) -- exit (1); -- if (((long) (sizeof (size_t))) < 0) -+ return 1; -+ if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { -- long i = longval (); -- if (i != ((long) (sizeof (size_t)))) -- exit (1); -+ long int i = longval (); -+ if (i != ((long int) (sizeof (ac__type_sizeof_)))) -+ return 1; - fprintf (f, "%ld\n", i); - } - else - { -- unsigned long i = ulongval (); -- if (i != ((long) (sizeof (size_t)))) -- exit (1); -+ unsigned long int i = ulongval (); -+ if (i != ((long int) (sizeof (ac__type_sizeof_)))) -+ return 1; - fprintf (f, "%lu\n", i); - } -- exit (ferror (f) || fclose (f) != 0); -+ return ferror (f) || fclose (f) != 0; - - ; - return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -27281,29 +27739,32 @@ - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) --{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77 -+if test "$ac_cv_type_size_t" = yes; then -+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t) - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (size_t), 77 -+echo "$as_me: error: cannot compute sizeof (size_t) - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ { (exit 77); exit 77; }; } -+ else -+ ac_cv_sizeof_size_t=0 -+ fi - fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - rm -f conftest.val --else -- ac_cv_sizeof_size_t=0 --fi - fi --echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 --echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5 -+echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; } -+ -+ -+ - cat >>confdefs.h <<_ACEOF - #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t - _ACEOF - - -- echo "$as_me:$LINENO: checking for unsigned long" >&5 --echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for unsigned long" >&5 -+echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; } - if test "${ac_cv_type_unsigned_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -27314,61 +27775,57 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+typedef unsigned long ac__type_new_; - int - main () - { --if ((unsigned long *) 0) -+if ((ac__type_new_ *) 0) - return 0; --if (sizeof (unsigned long)) -+if (sizeof (ac__type_new_)) - return 0; - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_cv_type_unsigned_long=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_type_unsigned_long=no -+ ac_cv_type_unsigned_long=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 --echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 -+echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; } - --echo "$as_me:$LINENO: checking size of unsigned long" >&5 --echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6 -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ echo "$as_me:$LINENO: checking size of unsigned long" >&5 -+echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; } - if test "${ac_cv_sizeof_unsigned_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- if test "$ac_cv_type_unsigned_long" = yes; then -- # The cast to unsigned long works around a bug in the HP C Compiler -- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -- # This bug is HP SR number 8606223364. - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. - cat >conftest.$ac_ext <<_ACEOF -@@ -27378,10 +27835,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef unsigned long ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= 0)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; - test_array [0] = 0 - - ; -@@ -27389,27 +27847,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -27419,10 +27872,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef unsigned long ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -27430,56 +27884,53 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo=`expr $ac_mid + 1` -- if test $ac_lo -le $ac_mid; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid + 1` -+ ac_lo=`expr $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --cat >conftest.$ac_ext <<_ACEOF -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef unsigned long ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) < 0)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; - test_array [0] = 0 - - ; -@@ -27487,27 +27938,22 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -@@ -27517,10 +27963,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef unsigned long ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) >= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -27528,50 +27975,48 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_lo=$ac_mid; break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_hi=`expr '(' $ac_mid ')' - 1` -- if test $ac_mid -le $ac_hi; then -- ac_lo= ac_hi= -- break -- fi -- ac_mid=`expr 2 '*' $ac_mid` -+ ac_hi=`expr '(' $ac_mid ')' - 1` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo= ac_hi= -+ ac_lo= ac_hi= - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - # Binary search between lo and hi bounds. - while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` -@@ -27582,10 +28027,11 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default -+ typedef unsigned long ac__type_sizeof_; - int - main () - { --static int test_array [1 - 2 * !(((long) (sizeof (unsigned long))) <= $ac_mid)]; -+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; - test_array [0] = 0 - - ; -@@ -27593,52 +28039,45 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_hi=$ac_mid - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_lo=`expr '(' $ac_mid ')' + 1` -+ ac_lo=`expr '(' $ac_mid ')' + 1` - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - case $ac_lo in - ?*) ac_cv_sizeof_unsigned_long=$ac_lo;; --'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 -+'') if test "$ac_cv_type_unsigned_long" = yes; then -+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (unsigned long), 77 -+echo "$as_me: error: cannot compute sizeof (unsigned long) - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } ;; -+ { (exit 77); exit 77; }; } -+ else -+ ac_cv_sizeof_unsigned_long=0 -+ fi ;; - esac - else -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27646,8 +28085,9 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - $ac_includes_default --long longval () { return (long) (sizeof (unsigned long)); } --unsigned long ulongval () { return (long) (sizeof (unsigned long)); } -+ typedef unsigned long ac__type_sizeof_; -+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } -+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } - #include - #include - int -@@ -27656,35 +28096,44 @@ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) -- exit (1); -- if (((long) (sizeof (unsigned long))) < 0) -+ return 1; -+ if (((long int) (sizeof (ac__type_sizeof_))) < 0) - { -- long i = longval (); -- if (i != ((long) (sizeof (unsigned long)))) -- exit (1); -+ long int i = longval (); -+ if (i != ((long int) (sizeof (ac__type_sizeof_)))) -+ return 1; - fprintf (f, "%ld\n", i); - } - else - { -- unsigned long i = ulongval (); -- if (i != ((long) (sizeof (unsigned long)))) -- exit (1); -+ unsigned long int i = ulongval (); -+ if (i != ((long int) (sizeof (ac__type_sizeof_)))) -+ return 1; - fprintf (f, "%lu\n", i); - } -- exit (ferror (f) || fclose (f) != 0); -+ return ferror (f) || fclose (f) != 0; - - ; - return 0; - } - _ACEOF - rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -+ { (case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -@@ -27695,30 +28144,33 @@ - sed 's/^/| /' conftest.$ac_ext >&5 - - ( exit $ac_status ) --{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77 -+if test "$ac_cv_type_unsigned_long" = yes; then -+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) - See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute sizeof (unsigned long), 77 -+echo "$as_me: error: cannot compute sizeof (unsigned long) - See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ { (exit 77); exit 77; }; } -+ else -+ ac_cv_sizeof_unsigned_long=0 -+ fi - fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext - fi - rm -f conftest.val --else -- ac_cv_sizeof_unsigned_long=0 --fi - fi --echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 --echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 -+echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; } -+ -+ -+ - cat >>confdefs.h <<_ACEOF - #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long - _ACEOF - - - -- echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5 --echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5 -+echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27739,36 +28191,31 @@ - } - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: - Apparently on your system our assumption sizeof size_t == sizeof unsigned long - does not apply. Please mail kde-devel@kde.org with a description of your system! -@@ -27780,18 +28227,18 @@ - { (exit 1); exit 1; }; } - - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -- echo "$as_me:$LINENO: checking for PIE support" >&5 --echo $ECHO_N "checking for PIE support... $ECHO_C" >&6 -+ -+ { echo "$as_me:$LINENO: checking for PIE support" >&5 -+echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; } - if test "${kde_cv_val_pie_support+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -27821,35 +28268,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - kde_cv_val_pie_support=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --kde_cv_val_pie_support=no -+ kde_cv_val_pie_support=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - - CXXFLAGS=$safe_CXXFLAGS -@@ -27862,26 +28306,26 @@ - - - fi --echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5 --echo "${ECHO_T}$kde_cv_val_pie_support" >&6 -+{ echo "$as_me:$LINENO: result: $kde_cv_val_pie_support" >&5 -+echo "${ECHO_T}$kde_cv_val_pie_support" >&6; } - -- echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5 --echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking if enabling -pie/fPIE support" >&5 -+echo $ECHO_N "checking if enabling -pie/fPIE support... $ECHO_C" >&6; } - -- # Check whether --enable-pie or --disable-pie was given. -+ # Check whether --enable-pie was given. - if test "${enable_pie+set}" = set; then -- enableval="$enable_pie" -- kde_has_pie_support=$enableval -+ enableval=$enable_pie; kde_has_pie_support=$enableval - else - kde_has_pie_support=detect --fi; -+fi -+ - - if test "$kde_has_pie_support" = "detect"; then - kde_has_pie_support=$kde_cv_val_pie_support - fi - -- echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5 --echo "${ECHO_T}$kde_has_pie_support" >&6 -+ { echo "$as_me:$LINENO: result: $kde_has_pie_support" >&5 -+echo "${ECHO_T}$kde_has_pie_support" >&6; } - - KDE_USE_FPIE="" - KDE_USE_PIE="" -@@ -27900,18 +28344,19 @@ - for ac_header in crt_externs.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27922,41 +28367,37 @@ - #include <$ac_header> - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -27965,24 +28406,22 @@ - /* end confdefs.h. */ - #include <$ac_header> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -27990,9 +28429,10 @@ - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -@@ -28016,25 +28456,19 @@ - echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ - ;; - esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - eval "$as_ac_Header=\$ac_header_preproc" - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Header'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - - fi - if test `eval echo '${'$as_ac_Header'}'` = yes; then -@@ -28046,8 +28480,8 @@ - - done - --echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5 --echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5 -+echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6; } - if test "${ac_cv_func__NSGetEnviron+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -28074,68 +28508,59 @@ - - #undef _NSGetEnviron - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char _NSGetEnviron (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub__NSGetEnviron) || defined (__stub____NSGetEnviron) -+#if defined __stub__NSGetEnviron || defined __stub____NSGetEnviron - choke me --#else --char (*f) () = _NSGetEnviron; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != _NSGetEnviron; -+return _NSGetEnviron (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_func__NSGetEnviron=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_func__NSGetEnviron=no -+ ac_cv_func__NSGetEnviron=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5 --echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5 -+echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6; } - if test $ac_cv_func__NSGetEnviron = yes; then - - cat >>confdefs.h <<\_ACEOF -@@ -28156,9 +28581,9 @@ - for ac_func in vsnprintf snprintf - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -28184,68 +28609,60 @@ - - #undef $ac_func - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" --{ - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char $ac_func (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+#if defined __stub_$ac_func || defined __stub___$ac_func - choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} - #endif - - int - main () - { --return f != $ac_func; -+return $ac_func (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_var=no" -+ eval "$as_ac_var=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -@@ -28262,32 +28679,32 @@ - - - --# Check whether --enable-embedded or --disable-embedded was given. -+# Check whether --enable-embedded was given. - if test "${enable_embedded+set}" = set; then -- enableval="$enable_embedded" -- kde_use_qt_emb=$enableval -+ enableval=$enable_embedded; kde_use_qt_emb=$enableval - else - kde_use_qt_emb=no - --fi; -+fi -+ - --# Check whether --enable-qtopia or --disable-qtopia was given. -+# Check whether --enable-qtopia was given. - if test "${enable_qtopia+set}" = set; then -- enableval="$enable_qtopia" -- kde_use_qt_emb_palm=$enableval -+ enableval=$enable_qtopia; kde_use_qt_emb_palm=$enableval - else - kde_use_qt_emb_palm=no - --fi; -+fi -+ - --# Check whether --enable-mac or --disable-mac was given. -+# Check whether --enable-mac was given. - if test "${enable_mac+set}" = set; then -- enableval="$enable_mac" -- kde_use_qt_mac=$enableval -+ enableval=$enable_mac; kde_use_qt_mac=$enableval - else - kde_use_qt_mac=no - --fi; -+fi -+ - - # used to disable x11-specific stuff on special platforms - -@@ -28303,8 +28720,8 @@ - - if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then - --echo "$as_me:$LINENO: checking for X" >&5 --echo $ECHO_N "checking for X... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for X" >&5 -+echo $ECHO_N "checking for X... $ECHO_C" >&6; } - - if test "${kde_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -28341,24 +28758,22 @@ - /* end confdefs.h. */ - #include <$x_direct_test_include> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then - # We can compile using X headers with no special include directory. - ac_x_includes= - else -@@ -28409,6 +28824,7 @@ - fi - done - fi -+ - rm -f conftest.err conftest.$ac_ext - fi # $ac_x_includes = NO - -@@ -28438,27 +28854,23 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - LIBS="$ac_save_LIBS" - # We can link X programs with no special library path. - ac_x_libraries= -@@ -28466,7 +28878,7 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --LIBS="$ac_save_LIBS" -+ LIBS="$ac_save_LIBS" - # First see if replacing the include by lib works. - # Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ -@@ -28514,7 +28926,8 @@ - done - done - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - fi # $ac_x_libraries = NO - -@@ -28524,21 +28937,26 @@ - *-*-solaris*) - ;; - *) -- rm -fr conftest.dir -+ rm -f -r conftest.dir - if mkdir conftest.dir; then - cd conftest.dir -- # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'_ACEOF' --acfindx: -- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -+incroot: -+ @echo incroot='${INCROOT}' -+usrlibdir: -+ @echo usrlibdir='${USRLIBDIR}' -+libdir: -+ @echo libdir='${LIBDIR}' - _ACEOF -- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then -+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` -+ for ac_var in incroot usrlibdir libdir; do -+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" -+ done - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do -- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && -- test -f $ac_im_libdir/libX11.$ac_extension; then -+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && -+ test -f "$ac_im_libdir/libX11.$ac_extension"; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done -@@ -28546,7 +28964,7 @@ - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in -- /usr/include) ;; -+ /usr/include) ac_x_includes= ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in -@@ -28555,7 +28973,7 @@ - esac - fi - cd .. -- rm -fr conftest.dir -+ rm -f -r conftest.dir - fi - - if test -z "$ac_x_includes"; then -@@ -28599,12 +29017,12 @@ - eval "$kde_cv_have_x" - - if test "$have_x" != yes; then -- echo "$as_me:$LINENO: result: $have_x" >&5 --echo "${ECHO_T}$have_x" >&6 -+ { echo "$as_me:$LINENO: result: $have_x" >&5 -+echo "${ECHO_T}$have_x" >&6; } - no_x=yes - else -- echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5 --echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6 -+ { echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5 -+echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6; } - fi - - if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then -@@ -28632,8 +29050,8 @@ - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. --echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 --echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } - if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -28646,56 +29064,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char IceConnectionNumber (); - int - main () - { --IceConnectionNumber (); -+return IceConnectionNumber (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_ICE_IceConnectionNumber=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_ICE_IceConnectionNumber=no -+ ac_cv_lib_ICE_IceConnectionNumber=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 --echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } - if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - LIBSM="-lSM -lICE" - fi -@@ -28704,8 +29119,8 @@ - - LIB_X11='-lX11 $(LIBSOCKET)' - --echo "$as_me:$LINENO: checking for libXext" >&5 --echo $ECHO_N "checking for libXext... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for libXext" >&5 -+echo $ECHO_N "checking for libXext... $ECHO_C" >&6; } - if test "${kde_cv_have_libXext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -28739,36 +29154,33 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - kde_cv_have_libXext=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --kde_cv_have_libXext=no -+ kde_cv_have_libXext=no - - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - - LDFLAGS=$kde_ldflags_safe -@@ -28777,8 +29189,8 @@ - fi - - --echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5 --echo "${ECHO_T}$kde_cv_have_libXext" >&6 -+{ echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5 -+echo "${ECHO_T}$kde_cv_have_libXext" >&6; } - - if test "$kde_cv_have_libXext" = "no"; then - { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure -@@ -28840,8 +29252,8 @@ - else - PTHREAD_LIBS_save="$PTHREAD_LIBS" - PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'` -- echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5 --echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5 -+echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; } - - kde_save_LDFLAGS="$LDFLAGS" - kde_save_LIBS="$LIBS" -@@ -28852,9 +29264,9 @@ - ;; - esac - as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh` --echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5 --echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Lib+set}\" = set"; then -+{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5 -+echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; } -+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -28866,56 +29278,54 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char pthread_create (); - int - main () - { --pthread_create (); -+return pthread_create (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "$as_ac_Lib=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "$as_ac_Lib=no" -+ eval "$as_ac_Lib=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 -+ac_res=`eval echo '${'$as_ac_Lib'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } - if test `eval echo '${'$as_ac_Lib'}'` = yes; then - LIBPTHREAD="$PTHREAD_LIBS_save" - fi -@@ -28928,8 +29338,8 @@ - fi - - if test -z "$LIBPTHREAD"; then -- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 --echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } - if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -28942,56 +29352,53 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char pthread_create (); - int - main () - { --pthread_create (); -+return pthread_create (); - ; - return 0; - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - ac_cv_lib_pthread_pthread_create=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_pthread_pthread_create=no -+ ac_cv_lib_pthread_pthread_create=no - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 --echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 -+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; } - if test $ac_cv_lib_pthread_pthread_create = yes; then - LIBPTHREAD="-lpthread" - fi -@@ -28999,8 +29406,8 @@ - fi - - if test -z "$LIBPTHREAD" ; then -- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 --echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 -+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } - kde_safe_libs=$LIBS - LIBS="$LIBS -lpthread" - cat >conftest.$ac_ext <<_ACEOF -@@ -29019,40 +29426,37 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - LIBPTHREAD="-lpthread" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$kde_safe_libs - fi -@@ -29067,16 +29471,15 @@ - USE_THREADS="" - if test -z "$LIBPTHREAD"; then - --echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5 --echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5 -+echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6; } - kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -29103,34 +29506,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -29143,13 +29544,13 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - USE_THREADS="-D_THREAD_SAFE -pthread" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi -@@ -29161,16 +29562,15 @@ - case $host_os in - solaris*) - --echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5 --echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5 -+echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6; } - kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'` --if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then -+if { as_var=kde_cv_prog_cxx_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -29197,34 +29597,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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=$? -+ rm -f conftest.er1 -+ cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_prog_cxx_$kde_cache=yes" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -+ - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - CXXFLAGS="$save_CXXFLAGS" - ac_ext=c -@@ -29237,13 +29635,13 @@ - fi - - if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - USE_THREADS="-mt" - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - - fi -@@ -29270,17 +29668,17 @@ - - - --echo "$as_me:$LINENO: checking for extra includes" >&5 --echo $ECHO_N "checking for extra includes... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for extra includes" >&5 -+echo $ECHO_N "checking for extra includes... $ECHO_C" >&6; } - --# Check whether --with-extra-includes or --without-extra-includes was given. -+# Check whether --with-extra-includes was given. - if test "${with_extra_includes+set}" = set; then -- withval="$with_extra_includes" -- kde_use_extra_includes="$withval" -+ withval=$with_extra_includes; kde_use_extra_includes="$withval" - else - kde_use_extra_includes=NONE - --fi; -+fi -+ - kde_extra_includes= - if test -n "$kde_use_extra_includes" && \ - test "$kde_use_extra_includes" != "NONE"; then -@@ -29298,21 +29696,21 @@ - fi - - --echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5 --echo "${ECHO_T}$kde_use_extra_includes" >&6 -+{ echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5 -+echo "${ECHO_T}$kde_use_extra_includes" >&6; } - - kde_extra_libs= --echo "$as_me:$LINENO: checking for extra libs" >&5 --echo $ECHO_N "checking for extra libs... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for extra libs" >&5 -+echo $ECHO_N "checking for extra libs... $ECHO_C" >&6; } - --# Check whether --with-extra-libs or --without-extra-libs was given. -+# Check whether --with-extra-libs was given. - if test "${with_extra_libs+set}" = set; then -- withval="$with_extra_libs" -- kde_use_extra_libs=$withval -+ withval=$with_extra_libs; kde_use_extra_libs=$withval - else - kde_use_extra_libs=NONE - --fi; -+fi -+ - if test -n "$kde_use_extra_libs" && \ - test "$kde_use_extra_libs" != "NONE"; then - -@@ -29331,14 +29729,14 @@ - - - --echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5 --echo "${ECHO_T}$kde_use_extra_libs" >&6 -+{ echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5 -+echo "${ECHO_T}$kde_use_extra_libs" >&6; } - - - - --echo "$as_me:$LINENO: checking for libz" >&5 --echo $ECHO_N "checking for libz... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for libz" >&5 -+echo $ECHO_N "checking for libz... $ECHO_C" >&6; } - if test "${ac_cv_lib_z+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -29372,35 +29770,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "ac_cv_lib_z='-lz'" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "ac_cv_lib_z=no" -+ eval "ac_cv_lib_z=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$kde_save_LIBS" - CFLAGS="$kde_save_CFLAGS" -@@ -29413,8 +29808,8 @@ - _ACEOF - - LIBZ="$ac_cv_lib_z" -- echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5 --echo "${ECHO_T}$ac_cv_lib_z" >&6 -+ { echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5 -+echo "${ECHO_T}$ac_cv_lib_z" >&6; } - else - { { echo "$as_me:$LINENO: error: not found. - Possibly configure picks up an outdated version -@@ -29434,8 +29829,8 @@ - - - --echo "$as_me:$LINENO: checking for libpng" >&5 --echo $ECHO_N "checking for libpng... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for libpng" >&5 -+echo $ECHO_N "checking for libpng... $ECHO_C" >&6; } - if test "${ac_cv_lib_png+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -29471,36 +29866,33 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "ac_cv_lib_png='-lpng $LIBZ -lm'" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "ac_cv_lib_png=no" -+ eval "ac_cv_lib_png=no" - - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$kde_save_LIBS" - CFLAGS="$kde_save_CFLAGS" -@@ -29514,19 +29906,19 @@ - - LIBPNG="$ac_cv_lib_png" - -- echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5 --echo "${ECHO_T}$ac_cv_lib_png" >&6 -+ { echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5 -+echo "${ECHO_T}$ac_cv_lib_png" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - LIBPNG="" - - fi - - - --echo "$as_me:$LINENO: checking for libjpeg6b" >&5 --echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for libjpeg6b" >&5 -+echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6; } - if test "${ac_cv_lib_jpeg_6b+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -29559,35 +29951,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "ac_cv_lib_jpeg_6b=-ljpeg6b" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "ac_cv_lib_jpeg_6b=no" -+ eval "ac_cv_lib_jpeg_6b=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_save_LIBS" - CFLAGS="$ac_save_CFLAGS" -@@ -29597,14 +29986,14 @@ - - if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then - LIBJPEG="$ac_cv_lib_jpeg_6b" -- echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5 --echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6 -+ { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5 -+echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - --echo "$as_me:$LINENO: checking for libjpeg" >&5 --echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for libjpeg" >&5 -+echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6; } - if test "${ac_cv_lib_jpeg_normal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -29637,35 +30026,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "ac_cv_lib_jpeg_normal=-ljpeg" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "ac_cv_lib_jpeg_normal=no" -+ eval "ac_cv_lib_jpeg_normal=no" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_save_LIBS" - CFLAGS="$ac_save_CFLAGS" -@@ -29675,11 +30061,11 @@ - - if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then - LIBJPEG="$ac_cv_lib_jpeg_normal" -- echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5 --echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6 -+ { echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5 -+echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - - LIBJPEG= - -@@ -29699,7 +30085,7 @@ - do - for j in jpeglib.h; - do -- echo "configure: 29702: $i/$j" >&5 -+ echo "configure: 30088: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - jpeg_incdir=$i -@@ -29746,14 +30132,14 @@ - - - -- echo "$as_me:$LINENO: checking for perl" >&5 --echo $ECHO_N "checking for perl... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for perl" >&5 -+echo $ECHO_N "checking for perl... $ECHO_C" >&6; } - if test -n "$PERL"; then - kde_cv_path="$PERL"; - else - kde_cache=`echo perl | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -29796,8 +30182,8 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - { { echo "$as_me:$LINENO: error: No Perl found in your $PATH. - We need perl to generate some code." >&5 -@@ -29806,8 +30192,8 @@ - { (exit 1); exit 1; }; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - PERL=$kde_cv_path - - fi -@@ -29821,10 +30207,9 @@ - - - --# Check whether --enable-mt or --disable-mt was given. -+# Check whether --enable-mt was given. - if test "${enable_mt+set}" = set; then -- enableval="$enable_mt" -- kde_use_qt_mt=$enableval -+ enableval=$enable_mt; kde_use_qt_mt=$enableval - else - - if test $kde_qtver = 3; then -@@ -29834,7 +30219,8 @@ - fi - - --fi; -+fi -+ - - USING_QT_MT="" - -@@ -29854,13 +30240,13 @@ - else - kde_check_threading_default=yes - fi -- # Check whether --enable-threading or --disable-threading was given. -+ # Check whether --enable-threading was given. - if test "${enable_threading+set}" = set; then -- enableval="$enable_threading" -- kde_use_threading=$enableval -+ enableval=$enable_threading; kde_use_threading=$enableval - else - kde_use_threading=$kde_check_threading_default --fi; -+fi -+ - if test "x$kde_use_threading" = "xyes"; then - - cat >>confdefs.h <<\_ACEOF -@@ -29932,8 +30318,8 @@ - LIBQT="$LIBQT $LIBDL" - fi - --echo "$as_me:$LINENO: checking for Qt" >&5 --echo $ECHO_N "checking for Qt... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for Qt" >&5 -+echo $ECHO_N "checking for Qt... $ECHO_C" >&6; } - - if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then - LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET" -@@ -29942,34 +30328,34 @@ - qt_libraries="" - qt_includes="" - --# Check whether --with-qt-dir or --without-qt-dir was given. -+# Check whether --with-qt-dir was given. - if test "${with_qt_dir+set}" = set; then -- withval="$with_qt_dir" -- ac_qt_includes="$withval"/include -+ withval=$with_qt_dir; ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} - ac_qt_bindir="$withval"/bin - --fi; -+fi -+ - - --# Check whether --with-qt-includes or --without-qt-includes was given. -+# Check whether --with-qt-includes was given. - if test "${with_qt_includes+set}" = set; then -- withval="$with_qt_includes" -- -+ withval=$with_qt_includes; - ac_qt_includes="$withval" - --fi; -+fi -+ - - kde_qt_libs_given=no - - --# Check whether --with-qt-libraries or --without-qt-libraries was given. -+# Check whether --with-qt-libraries was given. - if test "${with_qt_libraries+set}" = set; then -- withval="$with_qt_libraries" -- ac_qt_libraries="$withval" -+ withval=$with_qt_libraries; ac_qt_libraries="$withval" - kde_qt_libs_given=yes - --fi; -+fi -+ - - if test "${ac_cv_have_qt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -@@ -29997,7 +30383,7 @@ - do - for j in $kde_qt_header; - do -- echo "configure: 30000: $i/$j" >&5 -+ echo "configure: 30386: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - qt_incdir=$i -@@ -30034,8 +30420,7 @@ - ac_qt_libraries="$qt_libdir" - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -30172,13 +30557,13 @@ - eval "$ac_cv_have_qt" - - if test "$have_qt" != yes; then -- echo "$as_me:$LINENO: result: $have_qt" >&5 --echo "${ECHO_T}$have_qt" >&6; -+ { echo "$as_me:$LINENO: result: $have_qt" >&5 -+echo "${ECHO_T}$have_qt" >&6; }; - else - ac_cv_have_qt="have_qt=yes \ - ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries" -- echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5 --echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6 -+ { echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5 -+echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6; } - - qt_libraries="$ac_qt_libraries" - qt_includes="$ac_qt_includes" -@@ -30187,15 +30572,14 @@ - if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then - - --echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5 --echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5 -+echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6; } - if test "${kde_cv_qt_direct+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -30316,12 +30700,12 @@ - - - if test "$kde_cv_qt_direct" = "yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - qt_libraries= - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - - fi - -@@ -30359,14 +30743,14 @@ - fi - - -- echo "$as_me:$LINENO: checking for moc" >&5 --echo $ECHO_N "checking for moc... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for moc" >&5 -+echo $ECHO_N "checking for moc... $ECHO_C" >&6; } - if test -n "$MOC"; then - kde_cv_path="$MOC"; - else - kde_cache=`echo moc | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -30409,8 +30793,8 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found! - Please check whether you installed Qt correctly. -@@ -30431,22 +30815,22 @@ - { (exit 1); exit 1; }; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - MOC=$kde_cv_path - - fi - - if test -z "$UIC_NOT_NEEDED"; then - -- echo "$as_me:$LINENO: checking for uic" >&5 --echo $ECHO_N "checking for uic... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for uic" >&5 -+echo $ECHO_N "checking for uic... $ECHO_C" >&6; } - if test -n "$UIC_PATH"; then - kde_cv_path="$UIC_PATH"; - else - kde_cache=`echo uic | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -30489,12 +30873,12 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - UIC_PATH="" - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - UIC_PATH=$kde_cv_path - - fi -@@ -30524,10 +30908,10 @@ - - if test $kde_qtver = 3; then - -- echo "$as_me:$LINENO: checking whether uic supports -L " >&5 --echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether uic supports -L " >&5 -+echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6; } - kde_cache=`echo L | sed 'y% .=/+-%____p_%'` -- if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -30550,22 +30934,22 @@ - - - if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - ac_uic_supports_libpath=yes - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - ac_uic_supports_libpath=no - fi - - -- echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5 --echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5 -+echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6; } - kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'` -- if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_prog_uic_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -30588,13 +30972,13 @@ - - - if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - : - ac_uic_supports_nounload=yes - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - : - ac_uic_supports_nounload=no - fi -@@ -30625,15 +31009,14 @@ - - - if test -n "$LIBJPEG"; then --echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5 --echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5 -+echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6; } - if test "${kde_cv_qt_jpeg+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -30666,35 +31049,32 @@ - } - _ACEOF - rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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' -- { (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 -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then - eval "kde_cv_qt_jpeg=no" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --eval "kde_cv_qt_jpeg=yes" -+ eval "kde_cv_qt_jpeg=yes" - fi --rm -f conftest.err conftest.$ac_objext \ -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_save_LIBS" - CXXFLAGS="$ac_save_CXXFLAGS" -@@ -30710,12 +31090,12 @@ - - - if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - LIBJPEG_QT='$(LIBJPEG)' - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6; } - LIBJPEG_QT= - fi - -@@ -30746,15 +31126,15 @@ - - - --echo "$as_me:$LINENO: checking for rpath" >&5 --echo $ECHO_N "checking for rpath... $ECHO_C" >&6 --# Check whether --enable-rpath or --disable-rpath was given. -+{ echo "$as_me:$LINENO: checking for rpath" >&5 -+echo $ECHO_N "checking for rpath... $ECHO_C" >&6; } -+# Check whether --enable-rpath was given. - if test "${enable_rpath+set}" = set; then -- enableval="$enable_rpath" -- USE_RPATH=$enableval -+ enableval=$enable_rpath; USE_RPATH=$enableval - else - USE_RPATH=yes --fi; -+fi -+ - - if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then - -@@ -30778,11 +31158,11 @@ - - - --echo "$as_me:$LINENO: result: $USE_RPATH" >&5 --echo "${ECHO_T}$USE_RPATH" >&6 -+{ echo "$as_me:$LINENO: result: $USE_RPATH" >&5 -+echo "${ECHO_T}$USE_RPATH" >&6; } - --echo "$as_me:$LINENO: checking for KDE" >&5 --echo $ECHO_N "checking for KDE... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for KDE" >&5 -+echo $ECHO_N "checking for KDE... $ECHO_C" >&6; } - - if test "${prefix}" != NONE; then - kde_includes=${includedir} -@@ -30834,7 +31214,7 @@ - do - for j in $kde_check_header; - do -- echo "configure: 30837: $i/$j" >&5 -+ echo "configure: 31217: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - kde_incdir=$i -@@ -30864,7 +31244,7 @@ - do - for j in $kde_check_lib; - do -- echo "configure: 30867: $i/$j" >&5 -+ echo "configure: 31247: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - kde_libdir=$i -@@ -30882,7 +31262,7 @@ - do - for j in "kde3/plugins/designer/kdewidgets.la"; - do -- echo "configure: 30885: $i/$j" >&5 -+ echo "configure: 31265: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - kde_widgetdir=$i -@@ -30941,12 +31321,12 @@ - fi - if test "$exec_prefix" = NONE; then - ac_kde_exec_prefix="$ac_kde_prefix" -- echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5 --echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6 -+ { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5 -+echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6; } - else - ac_kde_exec_prefix="$exec_prefix" -- echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5 --echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6 -+ { echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5 -+echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6; } - fi - - kde_libraries="${libdir}" -@@ -30955,8 +31335,8 @@ - else - ac_cv_have_kde="have_kde=yes \ - ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" -- echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5 --echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6 -+ { echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5 -+echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6; } - - kde_libraries="$ac_kde_libraries" - kde_includes="$ac_kde_includes" -@@ -30994,8 +31374,8 @@ - - if test x$ac_uic_supports_libpath = xyes; then - --echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5 --echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5 -+echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6; } - if test "${kde_cv_uic_plugins+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -31038,8 +31418,8 @@ - fi - - --echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5 --echo "${ECHO_T}$kde_cv_uic_plugins" >&6 -+{ echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5 -+echo "${ECHO_T}$kde_cv_uic_plugins" >&6; } - if test "$kde_cv_uic_plugins" != yes; then - { { echo "$as_me:$LINENO: error: - you need to install kdelibs first. -@@ -31071,10 +31451,9 @@ - - - -- # Check whether --enable-path-check or --disable-path-check was given. -+ # Check whether --enable-path-check was given. - if test "${enable_path_check+set}" = set; then -- enableval="$enable_path_check" -- -+ enableval=$enable_path_check; - if test "$enableval" = "no"; - then ac_use_path_checking="default" - else ac_use_path_checking="" -@@ -31088,13 +31467,14 @@ - fi - - --fi; -+fi -+ - - - - --echo "$as_me:$LINENO: checking for KDE paths" >&5 --echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for KDE paths" >&5 -+echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6; } - kde_result="" - kde_cached_paths=yes - if test "${kde_cv_all_paths+set}" = set; then -@@ -31205,15 +31585,14 @@ - else - - if test $kde_qtver = 1; then -- echo "$as_me:$LINENO: result: compiling" >&5 --echo "${ECHO_T}compiling" >&6 -+ { echo "$as_me:$LINENO: result: compiling" >&5 -+echo "${ECHO_T}compiling" >&6; } - - -- echo "$as_me:$LINENO: checking for KDE headers installed" >&5 --echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5 -+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; } - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -31265,8 +31644,8 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else - { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application! - Check, if you installed the KDE header files correctly. -@@ -31305,8 +31684,8 @@ - KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" - fi - --echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 --echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 -+echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } - ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' - - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -@@ -31314,8 +31693,8 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else - { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! - Check, if your compiler is installed correctly and if you have used the -@@ -31508,15 +31887,14 @@ - else - - if test $kde_qtver = 1; then -- echo "$as_me:$LINENO: result: compiling" >&5 --echo "${ECHO_T}compiling" >&6 -- -+ { echo "$as_me:$LINENO: result: compiling" >&5 -+echo "${ECHO_T}compiling" >&6; } - -- echo "$as_me:$LINENO: checking for KDE headers installed" >&5 --echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6 - -+ { echo "$as_me:$LINENO: checking for KDE headers installed" >&5 -+echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; } - -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -31568,8 +31946,8 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else - { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application! - Check, if you installed the KDE header files correctly. -@@ -31608,8 +31986,8 @@ - KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH" - fi - --echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 --echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for KDE libraries installed" >&5 -+echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6; } - ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' - - if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -@@ -31617,8 +31995,8 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s conftest; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } - else - { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application! - Check, if your compiler is installed correctly and if you have used the -@@ -31710,22 +32088,22 @@ - { (exit 1); exit 1; }; } - else - rm -f conftest* -- echo "$as_me:$LINENO: result: $kde_result" >&5 --echo "${ECHO_T}$kde_result" >&6 -+ { echo "$as_me:$LINENO: result: $kde_result" >&5 -+echo "${ECHO_T}$kde_result" >&6; } - fi - - bindir=$kde_bindir - - - --# Check whether --with-arts or --without-arts was given. -+# Check whether --with-arts was given. - if test "${with_arts+set}" = set; then -- withval="$with_arts" -- build_arts=$withval -+ withval=$with_arts; build_arts=$withval - else - build_arts=yes - --fi; -+fi -+ - - - if test "$build_arts" '!=' "no"; then -@@ -31758,14 +32136,14 @@ - - kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs" - -- echo "$as_me:$LINENO: checking for dcopidl" >&5 --echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for dcopidl" >&5 -+echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6; } - if test -n "$DCOPIDL"; then - kde_cv_path="$DCOPIDL"; - else - kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -31808,8 +32186,8 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - { { echo "$as_me:$LINENO: error: The important program dcopidl was not found! - Please check whether you installed KDE correctly. -@@ -31820,21 +32198,21 @@ - { (exit 1); exit 1; }; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - DCOPIDL=$kde_cv_path - - fi - - -- echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5 --echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5 -+echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6; } - if test -n "$DCOPIDL2CPP"; then - kde_cv_path="$DCOPIDL2CPP"; - else - kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -31877,8 +32255,8 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found! - Please check whether you installed KDE correctly. -@@ -31889,22 +32267,22 @@ - { (exit 1); exit 1; }; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - DCOPIDL2CPP=$kde_cv_path - - fi - - if test "$build_arts" '!=' "no"; then - -- echo "$as_me:$LINENO: checking for mcopidl" >&5 --echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for mcopidl" >&5 -+echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6; } - if test -n "$MCOPIDL"; then - kde_cv_path="$MCOPIDL"; - else - kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -31947,8 +32325,8 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - { { echo "$as_me:$LINENO: error: The important program mcopidl was not found! - Please check whether you installed aRts correctly or use -@@ -31961,21 +32339,21 @@ - { (exit 1); exit 1; }; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - MCOPIDL=$kde_cv_path - - fi - - -- echo "$as_me:$LINENO: checking for artsc-config" >&5 --echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for artsc-config" >&5 -+echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6; } - if test -n "$ARTSCCONFIG"; then - kde_cv_path="$ARTSCCONFIG"; - else - kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -32018,8 +32396,8 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - { { echo "$as_me:$LINENO: error: The important program artsc-config was not found! - Please check whether you installed aRts correctly or use -@@ -32032,22 +32410,22 @@ - { (exit 1); exit 1; }; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - ARTSCCONFIG=$kde_cv_path - - fi - - fi - -- echo "$as_me:$LINENO: checking for meinproc" >&5 --echo $ECHO_N "checking for meinproc... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for meinproc" >&5 -+echo $ECHO_N "checking for meinproc... $ECHO_C" >&6; } - if test -n "$MEINPROC"; then - kde_cv_path="$MEINPROC"; - else - kde_cache=`echo meinproc | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -32090,12 +32468,12 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - MEINPROC=$kde_cv_path - - fi -@@ -32124,14 +32502,14 @@ - - if test -n "$kde32ornewer"; then - -- echo "$as_me:$LINENO: checking for kconfig_compiler" >&5 --echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for kconfig_compiler" >&5 -+echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6; } - if test -n "$KCONFIG_COMPILER"; then - kde_cv_path="$KCONFIG_COMPILER"; - else - kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -32174,8 +32552,8 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found! - Please check whether you installed KDE correctly. -@@ -32186,21 +32564,21 @@ - { (exit 1); exit 1; }; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - KCONFIG_COMPILER=$kde_cv_path - - fi - - -- echo "$as_me:$LINENO: checking for dcopidlng" >&5 --echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for dcopidlng" >&5 -+echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6; } - if test -n "$DCOPIDLNG"; then - kde_cv_path="$DCOPIDLNG"; - else - kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -32243,8 +32621,8 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found! - Please check whether you installed KDE correctly. -@@ -32255,8 +32633,8 @@ - { (exit 1); exit 1; }; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - DCOPIDLNG=$kde_cv_path - - fi -@@ -32264,14 +32642,14 @@ - fi - if test -n "$kde33ornewer"; then - -- echo "$as_me:$LINENO: checking for makekdewidgets" >&5 --echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for makekdewidgets" >&5 -+echo $ECHO_N "checking for makekdewidgets... $ECHO_C" >&6; } - if test -n "$MAKEKDEWIDGETS"; then - kde_cv_path="$MAKEKDEWIDGETS"; - else - kde_cache=`echo makekdewidgets | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -32314,8 +32692,8 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found! - Please check whether you installed KDE correctly. -@@ -32326,8 +32704,8 @@ - { (exit 1); exit 1; }; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - MAKEKDEWIDGETS=$kde_cv_path - - fi -@@ -32335,14 +32713,14 @@ - - fi - -- echo "$as_me:$LINENO: checking for xmllint" >&5 --echo $ECHO_N "checking for xmllint... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for xmllint" >&5 -+echo $ECHO_N "checking for xmllint... $ECHO_C" >&6; } - if test -n "$XMLLINT"; then - kde_cv_path="$XMLLINT"; - else - kde_cache=`echo xmllint | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -32385,12 +32763,12 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - XMLLINT="" - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - XMLLINT=$kde_cv_path - - fi -@@ -32405,7 +32783,7 @@ - do - for j in apps/ksgmltools2/customization/kde-chunk.xsl; - do -- echo "configure: 32408: $i/$j" >&5 -+ echo "configure: 32786: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - KDE_XSL_STYLESHEET=$i -@@ -32575,8 +32953,8 @@ - fi - - --echo "$as_me:$LINENO: checking for Qt docs" >&5 --echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for Qt docs" >&5 -+echo $ECHO_N "checking for Qt docs... $ECHO_C" >&6; } - kde_qtdir= - if test "${with_qt_dir+set}" = set; then - kde_qtdir="$with_qt_dir" -@@ -32588,7 +32966,7 @@ - do - for j in qsql.html; - do -- echo "configure: 32591: $i/$j" >&5 -+ echo "configure: 32969: $i/$j" >&5 - if test -r "$i/$j"; then - echo "taking that" >&5 - QTDOCDIR=$i -@@ -32597,20 +32975,20 @@ - done - done - --echo "$as_me:$LINENO: result: $QTDOCDIR" >&5 --echo "${ECHO_T}$QTDOCDIR" >&6 -+{ echo "$as_me:$LINENO: result: $QTDOCDIR" >&5 -+echo "${ECHO_T}$QTDOCDIR" >&6; } - - - - -- echo "$as_me:$LINENO: checking for dot" >&5 --echo $ECHO_N "checking for dot... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for dot" >&5 -+echo $ECHO_N "checking for dot... $ECHO_C" >&6; } - if test -n "$DOT"; then - kde_cv_path="$DOT"; - else - kde_cache=`echo dot | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -32653,12 +33031,12 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - DOT=$kde_cv_path - - fi -@@ -32670,14 +33048,14 @@ - fi - - -- echo "$as_me:$LINENO: checking for doxygen" >&5 --echo $ECHO_N "checking for doxygen... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for doxygen" >&5 -+echo $ECHO_N "checking for doxygen... $ECHO_C" >&6; } - if test -n "$DOXYGEN"; then - kde_cv_path="$DOXYGEN"; - else - kde_cache=`echo doxygen | sed 'y%./+-%__p_%'` - -- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then -+ if { as_var=kde_cv_path_$kde_cache; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -@@ -32720,12 +33098,12 @@ - fi - - if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then -- echo "$as_me:$LINENO: result: not found" >&5 --echo "${ECHO_T}not found" >&6 -+ { echo "$as_me:$LINENO: result: not found" >&5 -+echo "${ECHO_T}not found" >&6; } - - else -- echo "$as_me:$LINENO: result: $kde_cv_path" >&5 --echo "${ECHO_T}$kde_cv_path" >&6 -+ { echo "$as_me:$LINENO: result: $kde_cv_path" >&5 -+echo "${ECHO_T}$kde_cv_path" >&6; } - DOXYGEN=$kde_cv_path - - fi -@@ -32751,8 +33129,7 @@ - kde_safe_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $all_includes" - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -32762,17 +33139,17 @@ - - - if test "${ac_cv_header_knotifyclient_h+set}" = set; then -- echo "$as_me:$LINENO: checking for knotifyclient.h" >&5 --echo $ECHO_N "checking for knotifyclient.h... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for knotifyclient.h" >&5 -+echo $ECHO_N "checking for knotifyclient.h... $ECHO_C" >&6; } - if test "${ac_cv_header_knotifyclient_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: $ac_cv_header_knotifyclient_h" >&5 --echo "${ECHO_T}$ac_cv_header_knotifyclient_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_knotifyclient_h" >&5 -+echo "${ECHO_T}$ac_cv_header_knotifyclient_h" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking knotifyclient.h usability" >&5 --echo $ECHO_N "checking knotifyclient.h usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking knotifyclient.h usability" >&5 -+echo $ECHO_N "checking knotifyclient.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -32783,41 +33160,37 @@ - #include - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking knotifyclient.h presence" >&5 --echo $ECHO_N "checking knotifyclient.h presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking knotifyclient.h presence" >&5 -+echo $ECHO_N "checking knotifyclient.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -32826,24 +33199,22 @@ - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -32851,9 +33222,10 @@ - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -@@ -32877,25 +33249,18 @@ - echo "$as_me: WARNING: knotifyclient.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: knotifyclient.h: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: knotifyclient.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ - ;; - esac --echo "$as_me:$LINENO: checking for knotifyclient.h" >&5 --echo $ECHO_N "checking for knotifyclient.h... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for knotifyclient.h" >&5 -+echo $ECHO_N "checking for knotifyclient.h... $ECHO_C" >&6; } - if test "${ac_cv_header_knotifyclient_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_knotifyclient_h=$ac_header_preproc - fi --echo "$as_me:$LINENO: result: $ac_cv_header_knotifyclient_h" >&5 --echo "${ECHO_T}$ac_cv_header_knotifyclient_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_knotifyclient_h" >&5 -+echo "${ECHO_T}$ac_cv_header_knotifyclient_h" >&6; } - - fi - if test $ac_cv_header_knotifyclient_h = yes; then -@@ -32923,8 +33288,7 @@ - kde_safe_cppflags=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $all_includes" - -- -- ac_ext=cc -+ ac_ext=cpp - ac_cpp='$CXXCPP $CPPFLAGS' - ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -@@ -32934,17 +33298,17 @@ - - - if test "${ac_cv_header_kimiface_h+set}" = set; then -- echo "$as_me:$LINENO: checking for kimiface.h" >&5 --echo $ECHO_N "checking for kimiface.h... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking for kimiface.h" >&5 -+echo $ECHO_N "checking for kimiface.h... $ECHO_C" >&6; } - if test "${ac_cv_header_kimiface_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - fi --echo "$as_me:$LINENO: result: $ac_cv_header_kimiface_h" >&5 --echo "${ECHO_T}$ac_cv_header_kimiface_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_kimiface_h" >&5 -+echo "${ECHO_T}$ac_cv_header_kimiface_h" >&6; } - else - # Is the header compilable? --echo "$as_me:$LINENO: checking kimiface.h usability" >&5 --echo $ECHO_N "checking kimiface.h usability... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking kimiface.h usability" >&5 -+echo $ECHO_N "checking kimiface.h usability... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -32955,41 +33319,37 @@ - #include - _ACEOF - rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_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_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+ (exit $ac_status); } && { -+ test -z "$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then - ac_header_compiler=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no -+ ac_header_compiler=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6; } - - # Is the header present? --echo "$as_me:$LINENO: checking kimiface.h presence" >&5 --echo $ECHO_N "checking kimiface.h presence... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking kimiface.h presence" >&5 -+echo $ECHO_N "checking kimiface.h presence... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -32998,24 +33358,22 @@ - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || -+ test ! -s conftest.err -+ }; then - ac_header_preproc=yes - else - echo "$as_me: failed program was:" >&5 -@@ -33023,9 +33381,10 @@ - - ac_header_preproc=no - fi -+ - rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6; } - - # So? What about this header? - case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -@@ -33049,25 +33408,18 @@ - echo "$as_me: WARNING: kimiface.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: kimiface.h: in the future, the compiler will take precedence" >&5 - echo "$as_me: WARNING: kimiface.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -+ - ;; - esac --echo "$as_me:$LINENO: checking for kimiface.h" >&5 --echo $ECHO_N "checking for kimiface.h... $ECHO_C" >&6 -+{ echo "$as_me:$LINENO: checking for kimiface.h" >&5 -+echo $ECHO_N "checking for kimiface.h... $ECHO_C" >&6; } - if test "${ac_cv_header_kimiface_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_header_kimiface_h=$ac_header_preproc - fi --echo "$as_me:$LINENO: result: $ac_cv_header_kimiface_h" >&5 --echo "${ECHO_T}$ac_cv_header_kimiface_h" >&6 -+{ echo "$as_me:$LINENO: result: $ac_cv_header_kimiface_h" >&5 -+echo "${ECHO_T}$ac_cv_header_kimiface_h" >&6; } - - fi - if test $ac_cv_header_kimiface_h = yes; then -@@ -33112,8 +33464,8 @@ - fi - - for i in $ac_topsubdirs; do -- echo "$as_me:$LINENO: checking if $i should be compiled" >&5 --echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6 -+ { echo "$as_me:$LINENO: checking if $i should be compiled" >&5 -+echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6; } - if test -d $srcdir/$i; then - install_it="yes" - for j in $DO_NOT_COMPILE; do -@@ -33124,8 +33476,8 @@ - else - install_it="no" - fi -- echo "$as_me:$LINENO: result: $install_it" >&5 --echo "${ECHO_T}$install_it" >&6 -+ { echo "$as_me:$LINENO: result: $install_it" >&5 -+echo "${ECHO_T}$install_it" >&6; } - vari=`echo $i | sed -e 's,[-+.@],_,g'` - if test $install_it = "yes"; then - TOPSUBDIRS="$TOPSUBDIRS $i" -@@ -33167,121 +33519,121 @@ - po_SUBDIR_included_FALSE= - fi - -- ac_config_files="$ac_config_files Makefile" -+ac_config_files="$ac_config_files Makefile" - -- ac_config_files="$ac_config_files doc/Makefile" -+ac_config_files="$ac_config_files doc/Makefile" - -- ac_config_files="$ac_config_files doc/da/Makefile" -+ac_config_files="$ac_config_files doc/da/Makefile" - -- ac_config_files="$ac_config_files doc/es/Makefile" -+ac_config_files="$ac_config_files doc/es/Makefile" - -- ac_config_files="$ac_config_files doc/et/Makefile" -+ac_config_files="$ac_config_files doc/et/Makefile" - -- ac_config_files="$ac_config_files doc/it/Makefile" -+ac_config_files="$ac_config_files doc/it/Makefile" - -- ac_config_files="$ac_config_files doc/konversation/Makefile" -+ac_config_files="$ac_config_files doc/konversation/Makefile" - -- ac_config_files="$ac_config_files doc/nl/Makefile" -+ac_config_files="$ac_config_files doc/nl/Makefile" - -- ac_config_files="$ac_config_files doc/pt/Makefile" -+ac_config_files="$ac_config_files doc/pt/Makefile" - -- ac_config_files="$ac_config_files doc/ru/Makefile" -+ac_config_files="$ac_config_files doc/ru/Makefile" - -- ac_config_files="$ac_config_files doc/sv/Makefile" -+ac_config_files="$ac_config_files doc/sv/Makefile" - -- ac_config_files="$ac_config_files konversation/Makefile" -+ac_config_files="$ac_config_files konversation/Makefile" - -- ac_config_files="$ac_config_files konversation/images/Makefile" -+ac_config_files="$ac_config_files konversation/images/Makefile" - -- ac_config_files="$ac_config_files konversation/images/icons/Makefile" -+ac_config_files="$ac_config_files konversation/images/icons/Makefile" - -- ac_config_files="$ac_config_files konversation/images/nickicons/Makefile" -+ac_config_files="$ac_config_files konversation/images/nickicons/Makefile" - -- ac_config_files="$ac_config_files konversation/images/nickicons/alternative/Makefile" -+ac_config_files="$ac_config_files konversation/images/nickicons/alternative/Makefile" - -- ac_config_files="$ac_config_files konversation/images/nickicons/christmas/Makefile" -+ac_config_files="$ac_config_files konversation/images/nickicons/christmas/Makefile" - -- ac_config_files="$ac_config_files konversation/images/nickicons/classic/Makefile" -+ac_config_files="$ac_config_files konversation/images/nickicons/classic/Makefile" - -- ac_config_files="$ac_config_files konversation/images/nickicons/default/Makefile" -+ac_config_files="$ac_config_files konversation/images/nickicons/default/Makefile" - -- ac_config_files="$ac_config_files konversation/images/nickicons/smiling/Makefile" -+ac_config_files="$ac_config_files konversation/images/nickicons/smiling/Makefile" - -- ac_config_files="$ac_config_files konversation/images/nickicons/square/Makefile" -+ac_config_files="$ac_config_files konversation/images/nickicons/square/Makefile" - -- ac_config_files="$ac_config_files konversation/scripts/Makefile" -+ac_config_files="$ac_config_files konversation/scripts/Makefile" - -- ac_config_files="$ac_config_files konversation/src/Makefile" -+ac_config_files="$ac_config_files konversation/src/Makefile" - -- ac_config_files="$ac_config_files konversation/src/blowfish/Makefile" -+ac_config_files="$ac_config_files konversation/src/blowfish/Makefile" - -- ac_config_files="$ac_config_files konversation/src/config/Makefile" -+ac_config_files="$ac_config_files konversation/src/config/Makefile" - -- ac_config_files="$ac_config_files konversation/src/linkaddressbook/Makefile" -+ac_config_files="$ac_config_files konversation/src/linkaddressbook/Makefile" - -- ac_config_files="$ac_config_files po/Makefile" -+ac_config_files="$ac_config_files po/Makefile" - -- ac_config_files="$ac_config_files po/ar/Makefile" -+ac_config_files="$ac_config_files po/ar/Makefile" - -- ac_config_files="$ac_config_files po/bg/Makefile" -+ac_config_files="$ac_config_files po/bg/Makefile" - -- ac_config_files="$ac_config_files po/ca/Makefile" -+ac_config_files="$ac_config_files po/ca/Makefile" - -- ac_config_files="$ac_config_files po/cs/Makefile" -+ac_config_files="$ac_config_files po/cs/Makefile" - -- ac_config_files="$ac_config_files po/da/Makefile" -+ac_config_files="$ac_config_files po/da/Makefile" - -- ac_config_files="$ac_config_files po/de/Makefile" -+ac_config_files="$ac_config_files po/de/Makefile" - -- ac_config_files="$ac_config_files po/el/Makefile" -+ac_config_files="$ac_config_files po/el/Makefile" - -- ac_config_files="$ac_config_files po/en_GB/Makefile" -+ac_config_files="$ac_config_files po/en_GB/Makefile" - -- ac_config_files="$ac_config_files po/es/Makefile" -+ac_config_files="$ac_config_files po/es/Makefile" - -- ac_config_files="$ac_config_files po/et/Makefile" -+ac_config_files="$ac_config_files po/et/Makefile" - -- ac_config_files="$ac_config_files po/fi/Makefile" -+ac_config_files="$ac_config_files po/fi/Makefile" - -- ac_config_files="$ac_config_files po/fr/Makefile" -+ac_config_files="$ac_config_files po/fr/Makefile" - -- ac_config_files="$ac_config_files po/gl/Makefile" -+ac_config_files="$ac_config_files po/gl/Makefile" - -- ac_config_files="$ac_config_files po/he/Makefile" -+ac_config_files="$ac_config_files po/he/Makefile" - -- ac_config_files="$ac_config_files po/hu/Makefile" -+ac_config_files="$ac_config_files po/hu/Makefile" - -- ac_config_files="$ac_config_files po/it/Makefile" -+ac_config_files="$ac_config_files po/it/Makefile" - -- ac_config_files="$ac_config_files po/ja/Makefile" -+ac_config_files="$ac_config_files po/ja/Makefile" - -- ac_config_files="$ac_config_files po/ka/Makefile" -+ac_config_files="$ac_config_files po/ka/Makefile" - -- ac_config_files="$ac_config_files po/ko/Makefile" -+ac_config_files="$ac_config_files po/ko/Makefile" - -- ac_config_files="$ac_config_files po/lt/Makefile" -+ac_config_files="$ac_config_files po/lt/Makefile" - -- ac_config_files="$ac_config_files po/nl/Makefile" -+ac_config_files="$ac_config_files po/nl/Makefile" - -- ac_config_files="$ac_config_files po/pa/Makefile" -+ac_config_files="$ac_config_files po/pa/Makefile" - -- ac_config_files="$ac_config_files po/pt/Makefile" -+ac_config_files="$ac_config_files po/pt/Makefile" - -- ac_config_files="$ac_config_files po/pt_BR/Makefile" -+ac_config_files="$ac_config_files po/pt_BR/Makefile" - -- ac_config_files="$ac_config_files po/ru/Makefile" -+ac_config_files="$ac_config_files po/ru/Makefile" - -- ac_config_files="$ac_config_files po/sr/Makefile" -+ac_config_files="$ac_config_files po/sr/Makefile" - -- ac_config_files="$ac_config_files po/sr@Latn/Makefile" -+ac_config_files="$ac_config_files po/sr@Latn/Makefile" - -- ac_config_files="$ac_config_files po/sv/Makefile" -+ac_config_files="$ac_config_files po/sv/Makefile" - -- ac_config_files="$ac_config_files po/ta/Makefile" -+ac_config_files="$ac_config_files po/ta/Makefile" - -- ac_config_files="$ac_config_files po/tr/Makefile" -+ac_config_files="$ac_config_files po/tr/Makefile" - -- ac_config_files="$ac_config_files po/zh_TW/Makefile" -+ac_config_files="$ac_config_files po/zh_TW/Makefile" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -33301,39 +33653,58 @@ - - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -+ ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : clear -+ :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ test "x$cache_file" != "x/dev/null" && -+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -+echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- echo "not updating unwritable cache $cache_file" -+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -33342,38 +33713,31 @@ - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' --fi -- - DEFS=-DHAVE_CONFIG_H - - ac_libobjs= - ac_ltlibobjs= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - - LTLIBOBJS=$ac_ltlibobjs - - -+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then -+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&5 -+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -+Usually this means the macro was only invoked conditionally." >&2;} -+ { (exit 1); exit 1; }; } -+fi - 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 -@@ -33461,17 +33825,45 @@ - ## M4sh Initialization. ## - ## --------------------- ## - --# Be Bourne compatible -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+ -+ -+# PATH needs CR -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh - fi --DUALCASE=1; export DUALCASE # for MKS sh - - # Support unset when possible. - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -@@ -33481,8 +33873,43 @@ - fi - - -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+as_nl=' -+' -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ - # Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+done - PS1='$ ' - PS2='> ' - PS4='+ ' -@@ -33496,18 +33923,19 @@ - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else -- $as_unset $as_var -+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi - done - - # Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false -@@ -33515,159 +33943,120 @@ - - - # Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || - echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -- --# PATH needs CR, and LINENO needs CR and PATH. --# Avoid depending upon Character Ranges. --as_cr_letters='abcdefghijklmnopqrstuvwxyz' --as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' --as_cr_Letters=$as_cr_letters$as_cr_LETTERS --as_cr_digits='0123456789' --as_cr_alnum=$as_cr_Letters$as_cr_digits -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -+# CDPATH. -+$as_unset CDPATH - - -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done - -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -+ # line-number line after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, and appends -+ # trailing '-' during substitution so that $LINENO is not a special -+ # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -+ chmod +x "$as_me.lineno" || -+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - - --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - - rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir -+fi - echo >conf$$.file - if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -+ as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -- else -- as_ln_s='ln -s' -- fi - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -@@ -33676,7 +34065,28 @@ - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -33685,31 +34095,14 @@ - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- - exec 6>&1 - --# Open the log real soon, to keep \$[0] and so on meaningful, and to -+# Save the log message, to keep $[0] and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- -+# values after options handling. -+ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -33717,30 +34110,20 @@ - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ - _ACEOF - -+cat >>$CONFIG_STATUS <<_ACEOF - # Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi -- --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+config_commands="$ac_config_commands" - --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -+_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -- - ac_cs_usage="\ - \`$as_me' instantiates files from templates according to the - current configuration. -@@ -33748,7 +34131,7 @@ - Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit -- -V, --version print version number, then exit -+ -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -@@ -33767,19 +34150,21 @@ - $config_commands - - Report bugs to ." --_ACEOF - -+_ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.59, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.61, -+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2006 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir --INSTALL="$INSTALL" -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+INSTALL='$INSTALL' - _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF -@@ -33790,39 +34175,24 @@ - do - case $1 in - --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -- -*) -+ *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ echo "$ac_cs_version"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -@@ -33832,18 +34202,24 @@ - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; -+ --he | --h) -+ # Conflict between --help and --header -+ { echo "$as_me: error: ambiguous option: $1 -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; };; -+ --help | --hel | -h ) -+ echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -+ -*) { echo "$as_me: error: unrecognized option: $1 -+Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - -- *) ac_config_targets="$ac_config_targets $1" ;; -+ *) ac_config_targets="$ac_config_targets $1" -+ ac_need_defaults=false ;; - - esac - shift -@@ -33859,94 +34235,106 @@ - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -+ CONFIG_SHELL=$SHELL -+ export CONFIG_SHELL -+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - fi - - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ echo "$ac_log" -+} >&5 - -+_ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - # --# INIT-COMMANDS section. -+# INIT-COMMANDS - # -- - AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" - - _ACEOF - -- -- - cat >>$CONFIG_STATUS <<\_ACEOF -+ -+# Handling of arguments. - for ac_config_target in $ac_config_targets - do -- case "$ac_config_target" in -- # Handling of arguments. -- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; -- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; -- "doc/da/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/da/Makefile" ;; -- "doc/es/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/es/Makefile" ;; -- "doc/et/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/et/Makefile" ;; -- "doc/it/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/it/Makefile" ;; -- "doc/konversation/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/konversation/Makefile" ;; -- "doc/nl/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/nl/Makefile" ;; -- "doc/pt/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/pt/Makefile" ;; -- "doc/ru/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ru/Makefile" ;; -- "doc/sv/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/sv/Makefile" ;; -- "konversation/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/Makefile" ;; -- "konversation/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/Makefile" ;; -- "konversation/images/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/icons/Makefile" ;; -- "konversation/images/nickicons/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/Makefile" ;; -- "konversation/images/nickicons/alternative/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/alternative/Makefile" ;; -- "konversation/images/nickicons/christmas/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/christmas/Makefile" ;; -- "konversation/images/nickicons/classic/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/classic/Makefile" ;; -- "konversation/images/nickicons/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/default/Makefile" ;; -- "konversation/images/nickicons/smiling/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/smiling/Makefile" ;; -- "konversation/images/nickicons/square/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/square/Makefile" ;; -- "konversation/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/scripts/Makefile" ;; -- "konversation/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/src/Makefile" ;; -- "konversation/src/blowfish/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/src/blowfish/Makefile" ;; -- "konversation/src/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/src/config/Makefile" ;; -- "konversation/src/linkaddressbook/Makefile" ) CONFIG_FILES="$CONFIG_FILES konversation/src/linkaddressbook/Makefile" ;; -- "po/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; -- "po/ar/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ar/Makefile" ;; -- "po/bg/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/bg/Makefile" ;; -- "po/ca/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ca/Makefile" ;; -- "po/cs/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/cs/Makefile" ;; -- "po/da/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/da/Makefile" ;; -- "po/de/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/de/Makefile" ;; -- "po/el/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/el/Makefile" ;; -- "po/en_GB/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/en_GB/Makefile" ;; -- "po/es/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/es/Makefile" ;; -- "po/et/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/et/Makefile" ;; -- "po/fi/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/fi/Makefile" ;; -- "po/fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/fr/Makefile" ;; -- "po/gl/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/gl/Makefile" ;; -- "po/he/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/he/Makefile" ;; -- "po/hu/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/hu/Makefile" ;; -- "po/it/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/it/Makefile" ;; -- "po/ja/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ja/Makefile" ;; -- "po/ka/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ka/Makefile" ;; -- "po/ko/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ko/Makefile" ;; -- "po/lt/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/lt/Makefile" ;; -- "po/nl/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/nl/Makefile" ;; -- "po/pa/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pa/Makefile" ;; -- "po/pt/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pt/Makefile" ;; -- "po/pt_BR/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/pt_BR/Makefile" ;; -- "po/ru/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ru/Makefile" ;; -- "po/sr/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sr/Makefile" ;; -- "po/sr@Latn/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sr@Latn/Makefile" ;; -- "po/sv/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/sv/Makefile" ;; -- "po/ta/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/ta/Makefile" ;; -- "po/tr/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/tr/Makefile" ;; -- "po/zh_TW/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/zh_TW/Makefile" ;; -- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; -+ case $ac_config_target in -+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; -+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; -+ "doc/da/Makefile") CONFIG_FILES="$CONFIG_FILES doc/da/Makefile" ;; -+ "doc/es/Makefile") CONFIG_FILES="$CONFIG_FILES doc/es/Makefile" ;; -+ "doc/et/Makefile") CONFIG_FILES="$CONFIG_FILES doc/et/Makefile" ;; -+ "doc/it/Makefile") CONFIG_FILES="$CONFIG_FILES doc/it/Makefile" ;; -+ "doc/konversation/Makefile") CONFIG_FILES="$CONFIG_FILES doc/konversation/Makefile" ;; -+ "doc/nl/Makefile") CONFIG_FILES="$CONFIG_FILES doc/nl/Makefile" ;; -+ "doc/pt/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pt/Makefile" ;; -+ "doc/ru/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ru/Makefile" ;; -+ "doc/sv/Makefile") CONFIG_FILES="$CONFIG_FILES doc/sv/Makefile" ;; -+ "konversation/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/Makefile" ;; -+ "konversation/images/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/Makefile" ;; -+ "konversation/images/icons/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/icons/Makefile" ;; -+ "konversation/images/nickicons/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/Makefile" ;; -+ "konversation/images/nickicons/alternative/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/alternative/Makefile" ;; -+ "konversation/images/nickicons/christmas/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/christmas/Makefile" ;; -+ "konversation/images/nickicons/classic/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/classic/Makefile" ;; -+ "konversation/images/nickicons/default/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/default/Makefile" ;; -+ "konversation/images/nickicons/smiling/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/smiling/Makefile" ;; -+ "konversation/images/nickicons/square/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/images/nickicons/square/Makefile" ;; -+ "konversation/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/scripts/Makefile" ;; -+ "konversation/src/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/src/Makefile" ;; -+ "konversation/src/blowfish/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/src/blowfish/Makefile" ;; -+ "konversation/src/config/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/src/config/Makefile" ;; -+ "konversation/src/linkaddressbook/Makefile") CONFIG_FILES="$CONFIG_FILES konversation/src/linkaddressbook/Makefile" ;; -+ "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; -+ "po/ar/Makefile") CONFIG_FILES="$CONFIG_FILES po/ar/Makefile" ;; -+ "po/bg/Makefile") CONFIG_FILES="$CONFIG_FILES po/bg/Makefile" ;; -+ "po/ca/Makefile") CONFIG_FILES="$CONFIG_FILES po/ca/Makefile" ;; -+ "po/cs/Makefile") CONFIG_FILES="$CONFIG_FILES po/cs/Makefile" ;; -+ "po/da/Makefile") CONFIG_FILES="$CONFIG_FILES po/da/Makefile" ;; -+ "po/de/Makefile") CONFIG_FILES="$CONFIG_FILES po/de/Makefile" ;; -+ "po/el/Makefile") CONFIG_FILES="$CONFIG_FILES po/el/Makefile" ;; -+ "po/en_GB/Makefile") CONFIG_FILES="$CONFIG_FILES po/en_GB/Makefile" ;; -+ "po/es/Makefile") CONFIG_FILES="$CONFIG_FILES po/es/Makefile" ;; -+ "po/et/Makefile") CONFIG_FILES="$CONFIG_FILES po/et/Makefile" ;; -+ "po/fi/Makefile") CONFIG_FILES="$CONFIG_FILES po/fi/Makefile" ;; -+ "po/fr/Makefile") CONFIG_FILES="$CONFIG_FILES po/fr/Makefile" ;; -+ "po/gl/Makefile") CONFIG_FILES="$CONFIG_FILES po/gl/Makefile" ;; -+ "po/he/Makefile") CONFIG_FILES="$CONFIG_FILES po/he/Makefile" ;; -+ "po/hu/Makefile") CONFIG_FILES="$CONFIG_FILES po/hu/Makefile" ;; -+ "po/it/Makefile") CONFIG_FILES="$CONFIG_FILES po/it/Makefile" ;; -+ "po/ja/Makefile") CONFIG_FILES="$CONFIG_FILES po/ja/Makefile" ;; -+ "po/ka/Makefile") CONFIG_FILES="$CONFIG_FILES po/ka/Makefile" ;; -+ "po/ko/Makefile") CONFIG_FILES="$CONFIG_FILES po/ko/Makefile" ;; -+ "po/lt/Makefile") CONFIG_FILES="$CONFIG_FILES po/lt/Makefile" ;; -+ "po/nl/Makefile") CONFIG_FILES="$CONFIG_FILES po/nl/Makefile" ;; -+ "po/pa/Makefile") CONFIG_FILES="$CONFIG_FILES po/pa/Makefile" ;; -+ "po/pt/Makefile") CONFIG_FILES="$CONFIG_FILES po/pt/Makefile" ;; -+ "po/pt_BR/Makefile") CONFIG_FILES="$CONFIG_FILES po/pt_BR/Makefile" ;; -+ "po/ru/Makefile") CONFIG_FILES="$CONFIG_FILES po/ru/Makefile" ;; -+ "po/sr/Makefile") CONFIG_FILES="$CONFIG_FILES po/sr/Makefile" ;; -+ "po/sr@Latn/Makefile") CONFIG_FILES="$CONFIG_FILES po/sr@Latn/Makefile" ;; -+ "po/sv/Makefile") CONFIG_FILES="$CONFIG_FILES po/sv/Makefile" ;; -+ "po/ta/Makefile") CONFIG_FILES="$CONFIG_FILES po/ta/Makefile" ;; -+ "po/tr/Makefile") CONFIG_FILES="$CONFIG_FILES po/tr/Makefile" ;; -+ "po/zh_TW/Makefile") CONFIG_FILES="$CONFIG_FILES po/zh_TW/Makefile" ;; -+ - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac - done - -+ - # If the user did not use the arguments to specify the items to instantiate, - # then the envvar interface is used. Set only those that are not. - # We use the long form for the default assignment because of an extremely -@@ -33958,507 +34346,659 @@ - fi - - # Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, -+# simply because there is no reason against having it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -+ tmp= -+ trap 'exit_status=$? -+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -+' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 - } -- - # Create a (secure) tmp directory for tmp files. - - { -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") - } || - { - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } - } - --_ACEOF -- --cat >>$CONFIG_STATUS <<_ACEOF -- - # --# CONFIG_FILES section. -+# Set up the sed scripts for CONFIG_FILES section. - # - - # No need to generate the scripts if there are no CONFIG_FILES. - # This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@target@,$target,;t t --s,@target_cpu@,$target_cpu,;t t --s,@target_vendor@,$target_vendor,;t t --s,@target_os@,$target_os,;t t --s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t --s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t --s,@INSTALL_DATA@,$INSTALL_DATA,;t t --s,@CYGPATH_W@,$CYGPATH_W,;t t --s,@PACKAGE@,$PACKAGE,;t t --s,@VERSION@,$VERSION,;t t --s,@ACLOCAL@,$ACLOCAL,;t t --s,@AUTOCONF@,$AUTOCONF,;t t --s,@AUTOMAKE@,$AUTOMAKE,;t t --s,@AUTOHEADER@,$AUTOHEADER,;t t --s,@MAKEINFO@,$MAKEINFO,;t t --s,@install_sh@,$install_sh,;t t --s,@STRIP@,$STRIP,;t t --s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t --s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t --s,@mkdir_p@,$mkdir_p,;t t --s,@AWK@,$AWK,;t t --s,@SET_MAKE@,$SET_MAKE,;t t --s,@am__leading_dot@,$am__leading_dot,;t t --s,@AMTAR@,$AMTAR,;t t --s,@am__tar@,$am__tar,;t t --s,@am__untar@,$am__untar,;t t --s,@KDECONFIG@,$KDECONFIG,;t t --s,@kde_libs_prefix@,$kde_libs_prefix,;t t --s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t --s,@CONF_FILES@,$CONF_FILES,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@DEPDIR@,$DEPDIR,;t t --s,@am__include@,$am__include,;t t --s,@am__quote@,$am__quote,;t t --s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t --s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t --s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t --s,@CCDEPMODE@,$CCDEPMODE,;t t --s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t --s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t --s,@CPP@,$CPP,;t t --s,@CXX@,$CXX,;t t --s,@CXXFLAGS@,$CXXFLAGS,;t t --s,@ac_ct_CXX@,$ac_ct_CXX,;t t --s,@CXXDEPMODE@,$CXXDEPMODE,;t t --s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t --s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t --s,@WOVERLOADED_VIRTUAL@,$WOVERLOADED_VIRTUAL,;t t --s,@HAVE_GCC_VISIBILITY@,$HAVE_GCC_VISIBILITY,;t t --s,@unsermake_enable_pch_TRUE@,$unsermake_enable_pch_TRUE,;t t --s,@unsermake_enable_pch_FALSE@,$unsermake_enable_pch_FALSE,;t t --s,@USE_EXCEPTIONS@,$USE_EXCEPTIONS,;t t --s,@USE_RTTI@,$USE_RTTI,;t t --s,@CXXCPP@,$CXXCPP,;t t --s,@NOOPT_CXXFLAGS@,$NOOPT_CXXFLAGS,;t t --s,@NOOPT_CFLAGS@,$NOOPT_CFLAGS,;t t --s,@ENABLE_PERMISSIVE_FLAG@,$ENABLE_PERMISSIVE_FLAG,;t t --s,@LDFLAGS_AS_NEEDED@,$LDFLAGS_AS_NEEDED,;t t --s,@LDFLAGS_NEW_DTAGS@,$LDFLAGS_NEW_DTAGS,;t t --s,@KDE_USE_FINAL_TRUE@,$KDE_USE_FINAL_TRUE,;t t --s,@KDE_USE_FINAL_FALSE@,$KDE_USE_FINAL_FALSE,;t t --s,@KDE_USE_CLOSURE_TRUE@,$KDE_USE_CLOSURE_TRUE,;t t --s,@KDE_USE_CLOSURE_FALSE@,$KDE_USE_CLOSURE_FALSE,;t t --s,@KDE_NO_UNDEFINED@,$KDE_NO_UNDEFINED,;t t --s,@KDE_USE_NMCHECK_TRUE@,$KDE_USE_NMCHECK_TRUE,;t t --s,@KDE_USE_NMCHECK_FALSE@,$KDE_USE_NMCHECK_FALSE,;t t --s,@EGREP@,$EGREP,;t t --s,@LN_S@,$LN_S,;t t --s,@ECHO@,$ECHO,;t t --s,@AR@,$AR,;t t --s,@ac_ct_AR@,$ac_ct_AR,;t t --s,@RANLIB@,$RANLIB,;t t --s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@F77@,$F77,;t t --s,@FFLAGS@,$FFLAGS,;t t --s,@ac_ct_F77@,$ac_ct_F77,;t t --s,@LIBTOOL@,$LIBTOOL,;t t --s,@KDE_PLUGIN@,$KDE_PLUGIN,;t t --s,@KDE_CHECK_PLUGIN@,$KDE_CHECK_PLUGIN,;t t --s,@MSGFMT@,$MSGFMT,;t t --s,@GMSGFMT@,$GMSGFMT,;t t --s,@XGETTEXT@,$XGETTEXT,;t t --s,@LIBUTIL@,$LIBUTIL,;t t --s,@LIBCOMPAT@,$LIBCOMPAT,;t t --s,@LIBCRYPT@,$LIBCRYPT,;t t --s,@LIBRESOLV@,$LIBRESOLV,;t t --s,@LIB_POLL@,$LIB_POLL,;t t --s,@FRAMEWORK_COREAUDIO@,$FRAMEWORK_COREAUDIO,;t t --s,@LIBSOCKET@,$LIBSOCKET,;t t --s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t --s,@LIBUCB@,$LIBUCB,;t t --s,@LIBDL@,$LIBDL,;t t --s,@KDE_USE_FPIE@,$KDE_USE_FPIE,;t t --s,@KDE_USE_PIE@,$KDE_USE_PIE,;t t --s,@include_x11_TRUE@,$include_x11_TRUE,;t t --s,@include_x11_FALSE@,$include_x11_FALSE,;t t --s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t --s,@LIB_X11@,$LIB_X11,;t t --s,@LIB_XRENDER@,$LIB_XRENDER,;t t --s,@LIBSM@,$LIBSM,;t t --s,@X_INCLUDES@,$X_INCLUDES,;t t --s,@X_LDFLAGS@,$X_LDFLAGS,;t t --s,@x_includes@,$x_includes,;t t --s,@x_libraries@,$x_libraries,;t t --s,@QTE_NORTTI@,$QTE_NORTTI,;t t --s,@LIB_XEXT@,$LIB_XEXT,;t t --s,@LIBPTHREAD@,$LIBPTHREAD,;t t --s,@USE_THREADS@,$USE_THREADS,;t t --s,@KDE_MT_LDFLAGS@,$KDE_MT_LDFLAGS,;t t --s,@KDE_MT_LIBS@,$KDE_MT_LIBS,;t t --s,@USER_INCLUDES@,$USER_INCLUDES,;t t --s,@USER_LDFLAGS@,$USER_LDFLAGS,;t t --s,@LIBZ@,$LIBZ,;t t --s,@LIBPNG@,$LIBPNG,;t t --s,@LIBJPEG@,$LIBJPEG,;t t --s,@qt_libraries@,$qt_libraries,;t t --s,@qt_includes@,$qt_includes,;t t --s,@QT_INCLUDES@,$QT_INCLUDES,;t t --s,@QT_LDFLAGS@,$QT_LDFLAGS,;t t --s,@PERL@,$PERL,;t t --s,@MOC@,$MOC,;t t --s,@UIC@,$UIC,;t t --s,@UIC_TR@,$UIC_TR,;t t --s,@LIB_QT@,$LIB_QT,;t t --s,@LIB_QPE@,$LIB_QPE,;t t --s,@kde_qtver@,$kde_qtver,;t t --s,@KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t --s,@KDE_RPATH@,$KDE_RPATH,;t t --s,@X_RPATH@,$X_RPATH,;t t --s,@kde_libraries@,$kde_libraries,;t t --s,@kde_includes@,$kde_includes,;t t --s,@KDE_LDFLAGS@,$KDE_LDFLAGS,;t t --s,@KDE_INCLUDES@,$KDE_INCLUDES,;t t --s,@all_includes@,$all_includes,;t t --s,@all_libraries@,$all_libraries,;t t --s,@AUTODIRS@,$AUTODIRS,;t t --s,@include_ARTS_TRUE@,$include_ARTS_TRUE,;t t --s,@include_ARTS_FALSE@,$include_ARTS_FALSE,;t t --s,@MAKEKDEWIDGETS@,$MAKEKDEWIDGETS,;t t --s,@KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t --s,@KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t --s,@DCOPIDLNG@,$DCOPIDLNG,;t t --s,@DCOPIDL@,$DCOPIDL,;t t --s,@DCOPIDL2CPP@,$DCOPIDL2CPP,;t t --s,@DCOP_DEPENDENCIES@,$DCOP_DEPENDENCIES,;t t --s,@MCOPIDL@,$MCOPIDL,;t t --s,@ARTSCCONFIG@,$ARTSCCONFIG,;t t --s,@MEINPROC@,$MEINPROC,;t t --s,@KDE_XSL_STYLESHEET@,$KDE_XSL_STYLESHEET,;t t --s,@XMLLINT@,$XMLLINT,;t t --s,@kde_htmldir@,$kde_htmldir,;t t --s,@kde_appsdir@,$kde_appsdir,;t t --s,@kde_icondir@,$kde_icondir,;t t --s,@kde_sounddir@,$kde_sounddir,;t t --s,@kde_datadir@,$kde_datadir,;t t --s,@kde_locale@,$kde_locale,;t t --s,@kde_confdir@,$kde_confdir,;t t --s,@kde_kcfgdir@,$kde_kcfgdir,;t t --s,@kde_mimedir@,$kde_mimedir,;t t --s,@kde_wallpaperdir@,$kde_wallpaperdir,;t t --s,@kde_bindir@,$kde_bindir,;t t --s,@xdg_appsdir@,$xdg_appsdir,;t t --s,@xdg_menudir@,$xdg_menudir,;t t --s,@xdg_directorydir@,$xdg_directorydir,;t t --s,@kde_templatesdir@,$kde_templatesdir,;t t --s,@kde_servicesdir@,$kde_servicesdir,;t t --s,@kde_servicetypesdir@,$kde_servicetypesdir,;t t --s,@kde_moduledir@,$kde_moduledir,;t t --s,@kdeinitdir@,$kdeinitdir,;t t --s,@kde_styledir@,$kde_styledir,;t t --s,@kde_widgetdir@,$kde_widgetdir,;t t --s,@LIB_KDED@,$LIB_KDED,;t t --s,@LIB_KDECORE@,$LIB_KDECORE,;t t --s,@LIB_KDEUI@,$LIB_KDEUI,;t t --s,@LIB_KIO@,$LIB_KIO,;t t --s,@LIB_KJS@,$LIB_KJS,;t t --s,@LIB_SMB@,$LIB_SMB,;t t --s,@LIB_KAB@,$LIB_KAB,;t t --s,@LIB_KABC@,$LIB_KABC,;t t --s,@LIB_KHTML@,$LIB_KHTML,;t t --s,@LIB_KSPELL@,$LIB_KSPELL,;t t --s,@LIB_KPARTS@,$LIB_KPARTS,;t t --s,@LIB_KDEPRINT@,$LIB_KDEPRINT,;t t --s,@LIB_KUTILS@,$LIB_KUTILS,;t t --s,@LIB_KDEPIM@,$LIB_KDEPIM,;t t --s,@LIB_KIMPROXY@,$LIB_KIMPROXY,;t t --s,@LIB_KNEWSTUFF@,$LIB_KNEWSTUFF,;t t --s,@LIB_KDNSSD@,$LIB_KDNSSD,;t t --s,@LIB_KUNITTEST@,$LIB_KUNITTEST,;t t --s,@LIB_KSYCOCA@,$LIB_KSYCOCA,;t t --s,@LIB_KFILE@,$LIB_KFILE,;t t --s,@LIB_KFM@,$LIB_KFM,;t t --s,@LIB_ARTS@,$LIB_ARTS,;t t --s,@QTDOCDIR@,$QTDOCDIR,;t t --s,@KDE_HAVE_DOT@,$KDE_HAVE_DOT,;t t --s,@DOXYGEN@,$DOXYGEN,;t t --s,@DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t --s,@DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t --s,@KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t --s,@LIB_KIMIFACE@,$LIB_KIMIFACE,;t t --s,@TOPSUBDIRS@,$TOPSUBDIRS,;t t --s,@doc_SUBDIR_included_TRUE@,$doc_SUBDIR_included_TRUE,;t t --s,@doc_SUBDIR_included_FALSE@,$doc_SUBDIR_included_FALSE,;t t --s,@konversation_SUBDIR_included_TRUE@,$konversation_SUBDIR_included_TRUE,;t t --s,@konversation_SUBDIR_included_FALSE@,$konversation_SUBDIR_included_FALSE,;t t --s,@po_SUBDIR_included_TRUE@,$po_SUBDIR_included_TRUE,;t t --s,@po_SUBDIR_included_FALSE@,$po_SUBDIR_included_FALSE,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF -- --_ACEOF -- -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -- fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -+if test -n "$CONFIG_FILES"; then -+ -+_ACEOF -+ -+ -+ -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+SHELL!$SHELL$ac_delim -+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -+PACKAGE_NAME!$PACKAGE_NAME$ac_delim -+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -+PACKAGE_STRING!$PACKAGE_STRING$ac_delim -+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -+exec_prefix!$exec_prefix$ac_delim -+prefix!$prefix$ac_delim -+program_transform_name!$program_transform_name$ac_delim -+bindir!$bindir$ac_delim -+sbindir!$sbindir$ac_delim -+libexecdir!$libexecdir$ac_delim -+datarootdir!$datarootdir$ac_delim -+datadir!$datadir$ac_delim -+sysconfdir!$sysconfdir$ac_delim -+sharedstatedir!$sharedstatedir$ac_delim -+localstatedir!$localstatedir$ac_delim -+includedir!$includedir$ac_delim -+oldincludedir!$oldincludedir$ac_delim -+docdir!$docdir$ac_delim -+infodir!$infodir$ac_delim -+htmldir!$htmldir$ac_delim -+dvidir!$dvidir$ac_delim -+pdfdir!$pdfdir$ac_delim -+psdir!$psdir$ac_delim -+libdir!$libdir$ac_delim -+localedir!$localedir$ac_delim -+mandir!$mandir$ac_delim -+DEFS!$DEFS$ac_delim -+ECHO_C!$ECHO_C$ac_delim -+ECHO_N!$ECHO_N$ac_delim -+ECHO_T!$ECHO_T$ac_delim -+LIBS!$LIBS$ac_delim -+build_alias!$build_alias$ac_delim -+host_alias!$host_alias$ac_delim -+target_alias!$target_alias$ac_delim -+build!$build$ac_delim -+build_cpu!$build_cpu$ac_delim -+build_vendor!$build_vendor$ac_delim -+build_os!$build_os$ac_delim -+host!$host$ac_delim -+host_cpu!$host_cpu$ac_delim -+host_vendor!$host_vendor$ac_delim -+host_os!$host_os$ac_delim -+target!$target$ac_delim -+target_cpu!$target_cpu$ac_delim -+target_vendor!$target_vendor$ac_delim -+target_os!$target_os$ac_delim -+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -+INSTALL_DATA!$INSTALL_DATA$ac_delim -+CYGPATH_W!$CYGPATH_W$ac_delim -+PACKAGE!$PACKAGE$ac_delim -+VERSION!$VERSION$ac_delim -+ACLOCAL!$ACLOCAL$ac_delim -+AUTOCONF!$AUTOCONF$ac_delim -+AUTOMAKE!$AUTOMAKE$ac_delim -+AUTOHEADER!$AUTOHEADER$ac_delim -+MAKEINFO!$MAKEINFO$ac_delim -+install_sh!$install_sh$ac_delim -+STRIP!$STRIP$ac_delim -+INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -+mkdir_p!$mkdir_p$ac_delim -+AWK!$AWK$ac_delim -+SET_MAKE!$SET_MAKE$ac_delim -+am__leading_dot!$am__leading_dot$ac_delim -+AMTAR!$AMTAR$ac_delim -+am__tar!$am__tar$ac_delim -+am__untar!$am__untar$ac_delim -+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim -+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim -+MAINT!$MAINT$ac_delim -+KDECONFIG!$KDECONFIG$ac_delim -+kde_libs_prefix!$kde_libs_prefix$ac_delim -+kde_libs_htmldir!$kde_libs_htmldir$ac_delim -+CONF_FILES!$CONF_FILES$ac_delim -+CC!$CC$ac_delim -+CFLAGS!$CFLAGS$ac_delim -+LDFLAGS!$LDFLAGS$ac_delim -+CPPFLAGS!$CPPFLAGS$ac_delim -+ac_ct_CC!$ac_ct_CC$ac_delim -+EXEEXT!$EXEEXT$ac_delim -+OBJEXT!$OBJEXT$ac_delim -+DEPDIR!$DEPDIR$ac_delim -+am__include!$am__include$ac_delim -+am__quote!$am__quote$ac_delim -+AMDEP_TRUE!$AMDEP_TRUE$ac_delim -+AMDEP_FALSE!$AMDEP_FALSE$ac_delim -+AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -+CCDEPMODE!$CCDEPMODE$ac_delim -+am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -+am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -+CPP!$CPP$ac_delim -+CXX!$CXX$ac_delim -+CXXFLAGS!$CXXFLAGS$ac_delim -+ac_ct_CXX!$ac_ct_CXX$ac_delim -+_ACEOF -+ -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -+ break -+ elif $ac_last_try; then -+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi --fi # test -n "$CONFIG_FILES" -+done -+ -+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -+if test -n "$ac_eof"; then -+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -+ ac_eof=`expr $ac_eof + 1` -+fi -+ -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+_ACEOF -+sed ' -+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -+s/^/s,@/; s/!/@,|#_!!_#|/ -+:n -+t n -+s/'"$ac_delim"'$/,g/; t -+s/$/\\/; p -+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -+' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -+CEOF$ac_eof -+_ACEOF -+ - -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+CXXDEPMODE!$CXXDEPMODE$ac_delim -+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim -+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -+WOVERLOADED_VIRTUAL!$WOVERLOADED_VIRTUAL$ac_delim -+HAVE_GCC_VISIBILITY!$HAVE_GCC_VISIBILITY$ac_delim -+unsermake_enable_pch_TRUE!$unsermake_enable_pch_TRUE$ac_delim -+unsermake_enable_pch_FALSE!$unsermake_enable_pch_FALSE$ac_delim -+USE_EXCEPTIONS!$USE_EXCEPTIONS$ac_delim -+USE_RTTI!$USE_RTTI$ac_delim -+CXXCPP!$CXXCPP$ac_delim -+NOOPT_CXXFLAGS!$NOOPT_CXXFLAGS$ac_delim -+NOOPT_CFLAGS!$NOOPT_CFLAGS$ac_delim -+ENABLE_PERMISSIVE_FLAG!$ENABLE_PERMISSIVE_FLAG$ac_delim -+LDFLAGS_AS_NEEDED!$LDFLAGS_AS_NEEDED$ac_delim -+LDFLAGS_NEW_DTAGS!$LDFLAGS_NEW_DTAGS$ac_delim -+KDE_USE_FINAL_TRUE!$KDE_USE_FINAL_TRUE$ac_delim -+KDE_USE_FINAL_FALSE!$KDE_USE_FINAL_FALSE$ac_delim -+KDE_USE_CLOSURE_TRUE!$KDE_USE_CLOSURE_TRUE$ac_delim -+KDE_USE_CLOSURE_FALSE!$KDE_USE_CLOSURE_FALSE$ac_delim -+KDE_NO_UNDEFINED!$KDE_NO_UNDEFINED$ac_delim -+KDE_USE_NMCHECK_TRUE!$KDE_USE_NMCHECK_TRUE$ac_delim -+KDE_USE_NMCHECK_FALSE!$KDE_USE_NMCHECK_FALSE$ac_delim -+SED!$SED$ac_delim -+GREP!$GREP$ac_delim -+EGREP!$EGREP$ac_delim -+LN_S!$LN_S$ac_delim -+ECHO!$ECHO$ac_delim -+AR!$AR$ac_delim -+RANLIB!$RANLIB$ac_delim -+F77!$F77$ac_delim -+FFLAGS!$FFLAGS$ac_delim -+ac_ct_F77!$ac_ct_F77$ac_delim -+LIBTOOL!$LIBTOOL$ac_delim -+KDE_PLUGIN!$KDE_PLUGIN$ac_delim -+KDE_CHECK_PLUGIN!$KDE_CHECK_PLUGIN$ac_delim -+MSGFMT!$MSGFMT$ac_delim -+GMSGFMT!$GMSGFMT$ac_delim -+XGETTEXT!$XGETTEXT$ac_delim -+LIBUTIL!$LIBUTIL$ac_delim -+LIBCOMPAT!$LIBCOMPAT$ac_delim -+LIBCRYPT!$LIBCRYPT$ac_delim -+LIBRESOLV!$LIBRESOLV$ac_delim -+LIB_POLL!$LIB_POLL$ac_delim -+FRAMEWORK_COREAUDIO!$FRAMEWORK_COREAUDIO$ac_delim -+LIBSOCKET!$LIBSOCKET$ac_delim -+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim -+LIBUCB!$LIBUCB$ac_delim -+LIBDL!$LIBDL$ac_delim -+KDE_USE_FPIE!$KDE_USE_FPIE$ac_delim -+KDE_USE_PIE!$KDE_USE_PIE$ac_delim -+include_x11_TRUE!$include_x11_TRUE$ac_delim -+include_x11_FALSE!$include_x11_FALSE$ac_delim -+XMKMF!$XMKMF$ac_delim -+X_PRE_LIBS!$X_PRE_LIBS$ac_delim -+LIB_X11!$LIB_X11$ac_delim -+LIB_XRENDER!$LIB_XRENDER$ac_delim -+LIBSM!$LIBSM$ac_delim -+X_INCLUDES!$X_INCLUDES$ac_delim -+X_LDFLAGS!$X_LDFLAGS$ac_delim -+x_includes!$x_includes$ac_delim -+x_libraries!$x_libraries$ac_delim -+QTE_NORTTI!$QTE_NORTTI$ac_delim -+LIB_XEXT!$LIB_XEXT$ac_delim -+LIBPTHREAD!$LIBPTHREAD$ac_delim -+USE_THREADS!$USE_THREADS$ac_delim -+KDE_MT_LDFLAGS!$KDE_MT_LDFLAGS$ac_delim -+KDE_MT_LIBS!$KDE_MT_LIBS$ac_delim -+USER_INCLUDES!$USER_INCLUDES$ac_delim -+USER_LDFLAGS!$USER_LDFLAGS$ac_delim -+LIBZ!$LIBZ$ac_delim -+LIBPNG!$LIBPNG$ac_delim -+LIBJPEG!$LIBJPEG$ac_delim -+qt_libraries!$qt_libraries$ac_delim -+qt_includes!$qt_includes$ac_delim -+QT_INCLUDES!$QT_INCLUDES$ac_delim -+QT_LDFLAGS!$QT_LDFLAGS$ac_delim -+PERL!$PERL$ac_delim -+MOC!$MOC$ac_delim -+UIC!$UIC$ac_delim -+UIC_TR!$UIC_TR$ac_delim -+LIB_QT!$LIB_QT$ac_delim -+LIB_QPE!$LIB_QPE$ac_delim -+kde_qtver!$kde_qtver$ac_delim -+KDE_EXTRA_RPATH!$KDE_EXTRA_RPATH$ac_delim -+KDE_RPATH!$KDE_RPATH$ac_delim -+X_RPATH!$X_RPATH$ac_delim -+kde_libraries!$kde_libraries$ac_delim -+kde_includes!$kde_includes$ac_delim -+KDE_LDFLAGS!$KDE_LDFLAGS$ac_delim -+KDE_INCLUDES!$KDE_INCLUDES$ac_delim -+all_includes!$all_includes$ac_delim -+all_libraries!$all_libraries$ac_delim -+AUTODIRS!$AUTODIRS$ac_delim -+include_ARTS_TRUE!$include_ARTS_TRUE$ac_delim -+include_ARTS_FALSE!$include_ARTS_FALSE$ac_delim -+MAKEKDEWIDGETS!$MAKEKDEWIDGETS$ac_delim -+KCONFIG_COMPILER!$KCONFIG_COMPILER$ac_delim - _ACEOF -+ -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -+ break -+ elif $ac_last_try; then -+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+ -+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -+if test -n "$ac_eof"; then -+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -+ ac_eof=`expr $ac_eof + 1` -+fi -+ -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+_ACEOF -+sed ' -+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -+s/^/s,@/; s/!/@,|#_!!_#|/ -+:n -+t n -+s/'"$ac_delim"'$/,g/; t -+s/$/\\/; p -+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -+' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -+CEOF$ac_eof -+_ACEOF -+ -+ -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim -+DCOPIDLNG!$DCOPIDLNG$ac_delim -+DCOPIDL!$DCOPIDL$ac_delim -+DCOPIDL2CPP!$DCOPIDL2CPP$ac_delim -+DCOP_DEPENDENCIES!$DCOP_DEPENDENCIES$ac_delim -+MCOPIDL!$MCOPIDL$ac_delim -+ARTSCCONFIG!$ARTSCCONFIG$ac_delim -+MEINPROC!$MEINPROC$ac_delim -+KDE_XSL_STYLESHEET!$KDE_XSL_STYLESHEET$ac_delim -+XMLLINT!$XMLLINT$ac_delim -+kde_htmldir!$kde_htmldir$ac_delim -+kde_appsdir!$kde_appsdir$ac_delim -+kde_icondir!$kde_icondir$ac_delim -+kde_sounddir!$kde_sounddir$ac_delim -+kde_datadir!$kde_datadir$ac_delim -+kde_locale!$kde_locale$ac_delim -+kde_confdir!$kde_confdir$ac_delim -+kde_kcfgdir!$kde_kcfgdir$ac_delim -+kde_mimedir!$kde_mimedir$ac_delim -+kde_wallpaperdir!$kde_wallpaperdir$ac_delim -+kde_bindir!$kde_bindir$ac_delim -+xdg_appsdir!$xdg_appsdir$ac_delim -+xdg_menudir!$xdg_menudir$ac_delim -+xdg_directorydir!$xdg_directorydir$ac_delim -+kde_templatesdir!$kde_templatesdir$ac_delim -+kde_servicesdir!$kde_servicesdir$ac_delim -+kde_servicetypesdir!$kde_servicetypesdir$ac_delim -+kde_moduledir!$kde_moduledir$ac_delim -+kdeinitdir!$kdeinitdir$ac_delim -+kde_styledir!$kde_styledir$ac_delim -+kde_widgetdir!$kde_widgetdir$ac_delim -+LIB_KDED!$LIB_KDED$ac_delim -+LIB_KDECORE!$LIB_KDECORE$ac_delim -+LIB_KDEUI!$LIB_KDEUI$ac_delim -+LIB_KIO!$LIB_KIO$ac_delim -+LIB_KJS!$LIB_KJS$ac_delim -+LIB_SMB!$LIB_SMB$ac_delim -+LIB_KAB!$LIB_KAB$ac_delim -+LIB_KABC!$LIB_KABC$ac_delim -+LIB_KHTML!$LIB_KHTML$ac_delim -+LIB_KSPELL!$LIB_KSPELL$ac_delim -+LIB_KPARTS!$LIB_KPARTS$ac_delim -+LIB_KDEPRINT!$LIB_KDEPRINT$ac_delim -+LIB_KUTILS!$LIB_KUTILS$ac_delim -+LIB_KDEPIM!$LIB_KDEPIM$ac_delim -+LIB_KIMPROXY!$LIB_KIMPROXY$ac_delim -+LIB_KNEWSTUFF!$LIB_KNEWSTUFF$ac_delim -+LIB_KDNSSD!$LIB_KDNSSD$ac_delim -+LIB_KUNITTEST!$LIB_KUNITTEST$ac_delim -+LIB_KSYCOCA!$LIB_KSYCOCA$ac_delim -+LIB_KFILE!$LIB_KFILE$ac_delim -+LIB_KFM!$LIB_KFM$ac_delim -+LIB_ARTS!$LIB_ARTS$ac_delim -+QTDOCDIR!$QTDOCDIR$ac_delim -+KDE_HAVE_DOT!$KDE_HAVE_DOT$ac_delim -+DOXYGEN!$DOXYGEN$ac_delim -+DOXYGEN_PROJECT_NAME!$DOXYGEN_PROJECT_NAME$ac_delim -+DOXYGEN_PROJECT_NUMBER!$DOXYGEN_PROJECT_NUMBER$ac_delim -+KDE_HAS_DOXYGEN!$KDE_HAS_DOXYGEN$ac_delim -+LIB_KIMIFACE!$LIB_KIMIFACE$ac_delim -+TOPSUBDIRS!$TOPSUBDIRS$ac_delim -+doc_SUBDIR_included_TRUE!$doc_SUBDIR_included_TRUE$ac_delim -+doc_SUBDIR_included_FALSE!$doc_SUBDIR_included_FALSE$ac_delim -+konversation_SUBDIR_included_TRUE!$konversation_SUBDIR_included_TRUE$ac_delim -+konversation_SUBDIR_included_FALSE!$konversation_SUBDIR_included_FALSE$ac_delim -+po_SUBDIR_included_TRUE!$po_SUBDIR_included_TRUE$ac_delim -+po_SUBDIR_included_FALSE!$po_SUBDIR_included_FALSE$ac_delim -+LIBOBJS!$LIBOBJS$ac_delim -+LTLIBOBJS!$LTLIBOBJS$ac_delim -+_ACEOF -+ -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 69; then -+ break -+ elif $ac_last_try; then -+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+ -+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -+if test -n "$ac_eof"; then -+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -+ ac_eof=`expr $ac_eof + 1` -+fi -+ -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -+_ACEOF -+sed ' -+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -+s/^/s,@/; s/!/@,|#_!!_#|/ -+:n -+t n -+s/'"$ac_delim"'$/,g/; t -+s/$/\\/; p -+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -+' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -+:end -+s/|#_!!_#|//g -+CEOF$ac_eof -+_ACEOF -+ -+ -+# VPATH may cause trouble with some makes, so we remove $(srcdir), -+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=/{ -+s/:*\$(srcdir):*/:/ -+s/:*\${srcdir}:*/:/ -+s/:*@srcdir@:*/:/ -+s/^\([^=]*=[ ]*\):*/\1/ -+s/:*$// -+s/^[^=]*=[ ]*$// -+}' -+fi -+ - cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+fi # test -n "$CONFIG_FILES" -+ -+ -+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -+echo "$as_me: error: Invalid tag $ac_tag." >&2;} -+ { (exit 1); exit 1; }; };; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift -+ -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { (exit 1); exit 1; }; };; -+ esac -+ ac_file_inputs="$ac_file_inputs $ac_f" -+ done -+ -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input="Generated from "`IFS=: -+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ fi -+ -+ case $ac_tag in -+ *:-:* | *:-) cat >"$tmp/stdin";; -+ esac -+ ;; - esac - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || -+ ac_dir=`$as_dirname -- "$ac_file" || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || - echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ { as_dir="$ac_dir" -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || - $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || - echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break - done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } -- - ac_builddir=. - --if test "$ac_dir" != .; then -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac - -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -+_ACEOF - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -- else -- configure_input="$ac_file. " -- fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -- -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -+cat >>$CONFIG_STATUS <<\_ACEOF -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ -+case `sed -n '/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p -+' $ac_file_inputs` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac - _ACEOF -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? - cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub - $extrasub -@@ -34466,248 +35006,130 @@ - cat >>$CONFIG_STATUS <<\_ACEOF - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --s,@INSTALL@,$ac_INSTALL,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -- --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+s&@configure_input@&$configure_input&;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+s&@INSTALL@&$ac_INSTALL&;t t -+$ac_datarootdir_hack -+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out -+ -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&5 -+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&2;} - --# --# CONFIG_HEADER section. --# -- --# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where --# NAME is the cpp macro being defined and VALUE is the value it is being given. --# --# ac_d sets the value in "#define NAME VALUE" lines. --ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' --ac_dB='[ ].*$,\1#\2' --ac_dC=' ' --ac_dD=',;t' --# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". --ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' --ac_uB='$,\1#\2define\3' --ac_uC=' ' --ac_uD=',;t' -- --for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -+ rm -f "$tmp/stdin" - case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+ -) cat "$tmp/out"; rm -f "$tmp/out";; -+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac -- -- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- # Do quote $f, to prevent DOS paths from being IFS'd. -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -- # Remove the trailing spaces. -- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -- -+ ;; -+ :H) -+ # -+ # CONFIG_HEADER -+ # - _ACEOF - --# Transform confdefs.h into two sed scripts, `conftest.defines' and --# `conftest.undefs', that substitutes the proper values into --# config.h.in to produce config.h. The first handles `#define' --# templates, and the second `#undef' templates. --# And first: Protect against being on the right side of a sed subst in --# config.status. Protect against being in an unquoted here document --# in config.status. --rm -f conftest.defines conftest.undefs --# Using a here document instead of a string reduces the quoting nightmare. --# Putting comments in sed scripts is not portable. --# --# `end' is used to avoid that the second main sed command (meant for --# 0-ary CPP macros) applies to n-ary macro definitions. --# See the Autoconf documentation for `clear'. --cat >confdef2sed.sed <<\_ACEOF --s/[\\&,]/\\&/g --s,[\\$`],\\&,g --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp --t end --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp --: end --_ACEOF --# If some macros were called several times there might be several times --# the same #defines, which is useless. Nevertheless, we may not want to --# sort them, since we want the *last* AC-DEFINE to be honored. --uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines --sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs --rm -f confdef2sed.sed -+# Transform confdefs.h into a sed script `conftest.defines', that -+# substitutes the proper values into config.h.in to produce config.h. -+rm -f conftest.defines conftest.tail -+# First, append a space to every undef/define line, to ease matching. -+echo 's/$/ /' >conftest.defines -+# Then, protect against being on the right side of a sed subst, or in -+# an unquoted here document, in config.status. If some macros were -+# called several times there might be several #defines for the same -+# symbol, which is useless. But do not sort them, since the last -+# AC_DEFINE must be honored. -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -+# NAME is the cpp macro being defined, VALUE is the value it is being given. -+# PARAMS is the parameter list in the macro definition--in most cases, it's -+# just an empty string. -+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -+ac_dB='\\)[ (].*,\\1define\\2' -+ac_dC=' ' -+ac_dD=' ,' - --# This sed command replaces #undef with comments. This is necessary, for -+uniq confdefs.h | -+ sed -n ' -+ t rset -+ :rset -+ s/^[ ]*#[ ]*define[ ][ ]*// -+ t ok -+ d -+ :ok -+ s/[\\&,]/\\&/g -+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p -+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p -+ ' >>conftest.defines -+ -+# Remove the space that was appended to ease matching. -+# Then replace #undef with comments. This is necessary, for - # example, in the case of _POSIX_SOURCE, which is predefined and required - # on some systems where configure will not decide to define it. --cat >>conftest.undefs <<\_ACEOF --s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, --_ACEOF -+# (The regexp can be short, since the line contains either #define or #undef.) -+echo 's/ $// -+s,^[ #]*u.*,/* & */,' >>conftest.defines -+ -+# Break up conftest.defines: -+ac_max_sed_lines=50 -+ -+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -+# et cetera. -+ac_in='$ac_file_inputs' -+ac_out='"$tmp/out1"' -+ac_nxt='"$tmp/out2"' - --# Break up conftest.defines because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS --echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS --echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS --echo ' :' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.defines >/dev/null -+while : - do -- # Write a limited-size here document to $tmp/defines.sed. -- echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS -- # Speed up: don't consider the non `#define' lines. -- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS -+ # Write a here document: -+ cat >>$CONFIG_STATUS <<_ACEOF -+ # First, check the format of the line: -+ cat >"\$tmp/defines.sed" <<\\CEOF -+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -+b -+:def -+_ACEOF -+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF -- sed -f $tmp/defines.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail -+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS -+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in -+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail -+ grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines - done --rm -f conftest.defines --echo ' fi # grep' >>$CONFIG_STATUS --echo >>$CONFIG_STATUS -- --# Break up conftest.undefs because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #undef templates' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.undefs >/dev/null --do -- # Write a limited-size here document to $tmp/undefs.sed. -- echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS -- # Speed up: don't consider the non `#undef' -- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS -- echo 'CEOF -- sed -f $tmp/undefs.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail -- rm -f conftest.undefs -- mv conftest.tail conftest.undefs --done --rm -f conftest.undefs -+rm -f conftest.defines conftest.tail - -+echo "ac_result=$ac_in" >>$CONFIG_STATUS - cat >>$CONFIG_STATUS <<\_ACEOF -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- echo "/* Generated by configure. */" >$tmp/config.h -- else -- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h -- fi -- cat $tmp/in >>$tmp/config.h -- rm -f $tmp/in - if test x"$ac_file" != x-; then -- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then -+ echo "/* $configure_input */" >"$tmp/config.h" -+ cat "$ac_result" >>"$tmp/config.h" -+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 - echo "$as_me: $ac_file is unchanged" >&6;} - else -- ac_dir=`(dirname "$ac_file") 2>/dev/null || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -- - rm -f $ac_file -- mv $tmp/config.h $ac_file -+ mv "$tmp/config.h" $ac_file - fi - else -- cat $tmp/config.h -- rm -f $tmp/config.h -+ echo "/* $configure_input */" -+ cat "$ac_result" - fi -+ rm -f "$tmp/out12" - # Compute $ac_file's index in $config_headers. - _am_stamp_count=1 - for _am_header in $config_headers :; do -@@ -34718,135 +35140,39 @@ - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || -+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || - $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ -- X$ac_file : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X$ac_file : 'X\(/\)' \| . 2>/dev/null || - echo X$ac_file | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'`/stamp-h$_am_stamp_count --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- --# --# CONFIG_COMMANDS section. --# --for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue -- ac_dest=`echo "$ac_file" | sed 's,:.*,,'` -- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_dir=`(dirname "$ac_dest") 2>/dev/null || --$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_dest" : 'X\(//\)[^/]' \| \ -- X"$ac_dest" : 'X\(//\)$' \| \ -- X"$ac_dest" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_dest" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -- -- ac_builddir=. -- --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -- --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'`/stamp-h$_am_stamp_count -+ ;; - --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac -+ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -+echo "$as_me: executing $ac_file commands" >&6;} -+ ;; -+ esac - - -- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 --echo "$as_me: executing $ac_dest commands" >&6;} -- case $ac_dest in -- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do -+ case $ac_file$ac_mode in -+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. -@@ -34856,18 +35182,29 @@ - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then -- dirpart=`(dirname "$mf") 2>/dev/null || -+ dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ -- X"$mf" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$mf" : 'X\(/\)' \| . 2>/dev/null || - echo X"$mf" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - else - continue - fi -@@ -34889,53 +35226,79 @@ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue -- fdir=`(dirname "$file") 2>/dev/null || -+ fdir=`$as_dirname -- "$file" || - $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ -- X"$file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$file" : 'X\(/\)' \| . 2>/dev/null || - echo X"$file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p $dirpart/$fdir -- else -- as_dir=$dirpart/$fdir -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ { as_dir=$dirpart/$fdir -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || - $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || - echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break - done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 --echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } -- - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done - ;; -+ - esac --done --_ACEOF -+done # for ac_tag - --cat >>$CONFIG_STATUS <<\_ACEOF - - { (exit 0); exit 0; } - _ACEOF -diff -uNr -x debian -x .pc konversation-1.0.1/configure.in konversation-1.0.1.n/configure.in ---- konversation-1.0.1/configure.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/configure.in 2007-07-17 02:59:47.000000000 +0300 -@@ -40,7 +40,9 @@ - AC_ARG_PROGRAM - - dnl Automake doc recommends to do this only here. (Janos) --AM_INIT_AUTOMAKE(konversation, 1.0.1) dnl searches for some needed programs -+AM_INIT_AUTOMAKE(konversation-1.0.1.n, "3.5.5") dnl searches for some needed programs -+ -+AM_MAINTAINER_MODE - - KDE_SET_PREFIX - -diff -uNr -x debian -x .pc konversation-1.0.1/doc/da/Makefile.in konversation-1.0.1.n/doc/da/Makefile.in ---- konversation-1.0.1/doc/da/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/doc/da/Makefile.in 2007-07-17 03:00:10.000000000 +0300 -@@ -94,6 +94,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -171,6 +172,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -193,6 +197,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -207,18 +212,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -237,14 +240,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -279,14 +286,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -311,7 +321,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -349,9 +359,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/doc/es/Makefile.in konversation-1.0.1.n/doc/es/Makefile.in ---- konversation-1.0.1/doc/es/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/doc/es/Makefile.in 2007-07-17 03:00:10.000000000 +0300 -@@ -94,6 +94,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -171,6 +172,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -193,6 +197,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -207,18 +212,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -237,14 +240,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -279,14 +286,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -311,7 +321,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -349,9 +359,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/doc/et/Makefile.in konversation-1.0.1.n/doc/et/Makefile.in ---- konversation-1.0.1/doc/et/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/doc/et/Makefile.in 2007-07-17 03:00:10.000000000 +0300 -@@ -94,6 +94,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -171,6 +172,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -193,6 +197,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -207,18 +212,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -237,14 +240,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -279,14 +286,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -311,7 +321,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -349,9 +359,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/doc/it/Makefile.in konversation-1.0.1.n/doc/it/Makefile.in ---- konversation-1.0.1/doc/it/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/doc/it/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -94,6 +94,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -171,6 +172,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -193,6 +197,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -207,18 +212,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -237,14 +240,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -279,14 +286,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -311,7 +321,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -349,9 +359,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/doc/konversation/Makefile.in konversation-1.0.1.n/doc/konversation/Makefile.in ---- konversation-1.0.1/doc/konversation/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/doc/konversation/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -332,7 +342,7 @@ - all: docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -370,9 +380,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/doc/Makefile.in konversation-1.0.1.n/doc/Makefile.in ---- konversation-1.0.1/doc/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/doc/Makefile.in 2007-07-17 03:00:10.000000000 +0300 -@@ -110,6 +110,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -187,6 +188,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -209,6 +213,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -223,18 +228,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -253,14 +256,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -295,14 +302,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -330,7 +340,7 @@ - all: docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -368,9 +378,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/doc/nl/Makefile.in konversation-1.0.1.n/doc/nl/Makefile.in ---- konversation-1.0.1/doc/nl/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/doc/nl/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -94,6 +94,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -171,6 +172,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -193,6 +197,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -207,18 +212,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -237,14 +240,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -279,14 +286,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -311,7 +321,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -349,9 +359,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/doc/pt/Makefile.in konversation-1.0.1.n/doc/pt/Makefile.in ---- konversation-1.0.1/doc/pt/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/doc/pt/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -94,6 +94,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -171,6 +172,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -193,6 +197,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -207,18 +212,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -237,14 +240,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -279,14 +286,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -311,7 +321,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -349,9 +359,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/doc/ru/Makefile.in konversation-1.0.1.n/doc/ru/Makefile.in ---- konversation-1.0.1/doc/ru/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/doc/ru/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -94,6 +94,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -171,6 +172,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -193,6 +197,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -207,18 +212,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -237,14 +240,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -279,14 +286,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -311,7 +321,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -349,9 +359,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/doc/sv/Makefile.in konversation-1.0.1.n/doc/sv/Makefile.in ---- konversation-1.0.1/doc/sv/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/doc/sv/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -94,6 +94,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -171,6 +172,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -193,6 +197,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -207,18 +212,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -237,14 +240,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -279,14 +286,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -311,7 +321,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -349,9 +359,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/images/icons/Makefile.in konversation-1.0.1.n/konversation/images/icons/Makefile.in ---- konversation-1.0.1/konversation/images/icons/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/konversation/images/icons/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -94,6 +94,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -171,6 +172,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -193,6 +197,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -207,18 +212,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -237,14 +240,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -279,14 +286,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -310,7 +320,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -348,9 +358,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/images/Makefile.in konversation-1.0.1.n/konversation/images/Makefile.in ---- konversation-1.0.1/konversation/images/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/konversation/images/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -110,6 +110,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -187,6 +188,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -209,6 +213,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -223,18 +228,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -253,14 +256,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -295,14 +302,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -326,7 +336,7 @@ - all: docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -364,9 +374,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/images/nickicons/alternative/Makefile.in konversation-1.0.1.n/konversation/images/nickicons/alternative/Makefile.in ---- konversation-1.0.1/konversation/images/nickicons/alternative/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/konversation/images/nickicons/alternative/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -104,6 +104,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -181,6 +182,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -203,6 +207,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -217,18 +222,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -247,14 +250,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -289,14 +296,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -323,7 +333,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -361,9 +371,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/images/nickicons/christmas/Makefile.in konversation-1.0.1.n/konversation/images/nickicons/christmas/Makefile.in ---- konversation-1.0.1/konversation/images/nickicons/christmas/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/konversation/images/nickicons/christmas/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -104,6 +104,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -181,6 +182,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -203,6 +207,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -217,18 +222,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -247,14 +250,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -289,14 +296,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -323,7 +333,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -361,9 +371,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/images/nickicons/classic/Makefile.in konversation-1.0.1.n/konversation/images/nickicons/classic/Makefile.in ---- konversation-1.0.1/konversation/images/nickicons/classic/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/konversation/images/nickicons/classic/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -104,6 +104,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -181,6 +182,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -203,6 +207,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -217,18 +222,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -247,14 +250,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -289,14 +296,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -323,7 +333,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -361,9 +371,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/images/nickicons/default/Makefile.in konversation-1.0.1.n/konversation/images/nickicons/default/Makefile.in ---- konversation-1.0.1/konversation/images/nickicons/default/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/konversation/images/nickicons/default/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -104,6 +104,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -181,6 +182,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -203,6 +207,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -217,18 +222,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -247,14 +250,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -289,14 +296,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -323,7 +333,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -361,9 +371,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/images/nickicons/Makefile.in konversation-1.0.1.n/konversation/images/nickicons/Makefile.in ---- konversation-1.0.1/konversation/images/nickicons/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/konversation/images/nickicons/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -110,6 +110,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -187,6 +188,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -209,6 +213,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -223,18 +228,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -253,14 +256,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -295,14 +302,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -326,7 +336,7 @@ - all: docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -364,9 +374,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/images/nickicons/smiling/Makefile.in konversation-1.0.1.n/konversation/images/nickicons/smiling/Makefile.in ---- konversation-1.0.1/konversation/images/nickicons/smiling/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/konversation/images/nickicons/smiling/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -104,6 +104,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -181,6 +182,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -203,6 +207,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -217,18 +222,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -247,14 +250,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -289,14 +296,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -323,7 +333,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -361,9 +371,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/images/nickicons/square/Makefile.in konversation-1.0.1.n/konversation/images/nickicons/square/Makefile.in ---- konversation-1.0.1/konversation/images/nickicons/square/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/konversation/images/nickicons/square/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -104,6 +104,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -181,6 +182,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -203,6 +207,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -217,18 +222,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -247,14 +250,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -289,14 +296,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -323,7 +333,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -361,9 +371,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/Makefile.in konversation-1.0.1.n/konversation/Makefile.in ---- konversation-1.0.1/konversation/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/konversation/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -111,6 +111,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -188,6 +189,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -210,6 +214,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -224,18 +229,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -254,14 +257,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -296,14 +303,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -328,7 +338,7 @@ - all: docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/admin/Doxyfile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -366,9 +376,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/scripts/Makefile.in konversation-1.0.1.n/konversation/scripts/Makefile.in ---- konversation-1.0.1/konversation/scripts/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/konversation/scripts/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -107,6 +107,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -184,6 +185,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -206,6 +210,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -220,18 +225,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -250,14 +253,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -292,14 +299,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -325,7 +335,7 @@ - all: docs-am all-am - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -363,9 +373,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-scriptsSCRIPTS: $(scripts_SCRIPTS) - @$(NORMAL_INSTALL) -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/blowfish/Makefile.in konversation-1.0.1.n/konversation/src/blowfish/Makefile.in ---- konversation-1.0.1/konversation/src/blowfish/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/konversation/src/blowfish/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -132,6 +132,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -209,6 +210,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -231,6 +235,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -245,18 +250,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -275,14 +278,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -317,14 +324,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -355,7 +365,7 @@ - - .SUFFIXES: - .SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -393,9 +403,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstLTLIBRARIES: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/config/Makefile.in konversation-1.0.1.n/konversation/src/config/Makefile.in ---- konversation-1.0.1/konversation/src/config/Makefile.in 2007-07-16 20:15:57.000000000 +0300 -+++ konversation-1.0.1.n/konversation/src/config/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -50,8 +50,7 @@ - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(noinst_LTLIBRARIES) --am__DEPENDENCIES_1 = --libkonversationconfig_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -+libkonversationconfig_la_LIBADD = - am_libkonversationconfig_la_OBJECTS = preferences.lo - #>- libkonversationconfig_la_OBJECTS = \ - #>- $(am_libkonversationconfig_la_OBJECTS) -@@ -139,6 +138,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -216,6 +216,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -238,6 +241,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -252,18 +256,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -282,14 +284,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -324,14 +330,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -358,7 +367,6 @@ - #>- libkonversationconfig_la_LDFLAGS = $(all_libraries) -no-undefined - #>+ 1 - libkonversationconfig_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) --libkonversationconfig_la_LIBADD = $(LIB_KDEUI) - kde_kcfg_DATA = konversation.kcfg - #>- all: all-am - #>+ 1 -@@ -366,7 +374,7 @@ - - .SUFFIXES: - .SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -404,9 +412,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstLTLIBRARIES: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/linkaddressbook/Makefile.in konversation-1.0.1.n/konversation/src/linkaddressbook/Makefile.in ---- konversation-1.0.1/konversation/src/linkaddressbook/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/konversation/src/linkaddressbook/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -51,9 +51,7 @@ - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(noinst_LTLIBRARIES) --am__DEPENDENCIES_1 = --liblinkaddressbookui_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) -+liblinkaddressbookui_la_LIBADD = - am_liblinkaddressbookui_la_OBJECTS = linkaddressbookui.lo \ - addressbook_base.lo addressbook.lo nicklisttooltip.lo \ - nicksonlinetooltip.lo addresseeitem.lo -@@ -137,6 +135,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -214,6 +213,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -236,6 +238,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -250,18 +253,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -280,14 +281,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -322,14 +327,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -359,14 +367,13 @@ - #>- liblinkaddressbookui_la_LDFLAGS = $(all_libraries) -no-undefined - #>+ 1 - liblinkaddressbookui_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) --liblinkaddressbookui_la_LIBADD = $(COMPAT_LIBS) $(LIB_KDEUI) $(LIB_KABC) - #>- all: all-am - #>+ 1 - all: docs-am all-am - - .SUFFIXES: - .SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -404,9 +411,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - clean-noinstLTLIBRARIES: -diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/Makefile.in konversation-1.0.1.n/konversation/src/Makefile.in ---- konversation-1.0.1/konversation/src/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/konversation/src/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -263,6 +263,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -340,6 +341,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -362,6 +366,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -376,18 +381,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -406,14 +409,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -448,14 +455,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -577,7 +587,7 @@ - - .SUFFIXES: - .SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -615,9 +625,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -diff -uNr -x debian -x .pc konversation-1.0.1/Makefile.in konversation-1.0.1.n/Makefile.in ---- konversation-1.0.1/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/Makefile.in 2007-07-17 03:00:10.000000000 +0300 -@@ -128,6 +128,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -205,6 +206,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -227,6 +231,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -241,18 +246,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -271,14 +274,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -313,14 +320,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -348,7 +358,7 @@ - .SUFFIXES: - am--refresh: - @: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -390,12 +400,12 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - #>- cd $(srcdir) && $(AUTOCONF) - #>+ 2 - cd $(srcdir) && rm -f configure - cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - - config.h: stamp-h1 -@@ -407,7 +417,7 @@ - stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status - @rm -f stamp-h1 - cd $(top_builddir) && $(SHELL) ./config.status config.h --$(srcdir)/config.h.in: $(am__configure_deps) -+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h1 - touch $@ -@@ -915,7 +925,7 @@ - .NOEXPORT: - - #>+ 2 --KDE_DIST=COPYING-DOCS subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 VERSION Makefile.am.in -+KDE_DIST=stamp-h.in COPYING-DOCS subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 VERSION Makefile.am.in - - #>+ 2 - docs-am: -diff -uNr -x debian -x .pc konversation-1.0.1/po/ar/Makefile.in konversation-1.0.1.n/po/ar/Makefile.in ---- konversation-1.0.1/po/ar/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/ar/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/bg/Makefile.in konversation-1.0.1.n/po/bg/Makefile.in ---- konversation-1.0.1/po/bg/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/bg/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/ca/Makefile.in konversation-1.0.1.n/po/ca/Makefile.in ---- konversation-1.0.1/po/ca/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/ca/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/cs/Makefile.in konversation-1.0.1.n/po/cs/Makefile.in ---- konversation-1.0.1/po/cs/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/cs/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/da/Makefile.in konversation-1.0.1.n/po/da/Makefile.in ---- konversation-1.0.1/po/da/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/da/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/de/Makefile.in konversation-1.0.1.n/po/de/Makefile.in ---- konversation-1.0.1/po/de/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/de/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/el/Makefile.in konversation-1.0.1.n/po/el/Makefile.in ---- konversation-1.0.1/po/el/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/el/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/en_GB/Makefile.in konversation-1.0.1.n/po/en_GB/Makefile.in ---- konversation-1.0.1/po/en_GB/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/en_GB/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/es/Makefile.in konversation-1.0.1.n/po/es/Makefile.in ---- konversation-1.0.1/po/es/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/es/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/et/Makefile.in konversation-1.0.1.n/po/et/Makefile.in ---- konversation-1.0.1/po/et/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/et/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/fi/Makefile.in konversation-1.0.1.n/po/fi/Makefile.in ---- konversation-1.0.1/po/fi/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/fi/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/fr/Makefile.in konversation-1.0.1.n/po/fr/Makefile.in ---- konversation-1.0.1/po/fr/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/fr/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/gl/Makefile.in konversation-1.0.1.n/po/gl/Makefile.in ---- konversation-1.0.1/po/gl/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/gl/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/he/Makefile.in konversation-1.0.1.n/po/he/Makefile.in ---- konversation-1.0.1/po/he/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/he/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/hu/Makefile.in konversation-1.0.1.n/po/hu/Makefile.in ---- konversation-1.0.1/po/hu/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/hu/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/it/Makefile.in konversation-1.0.1.n/po/it/Makefile.in ---- konversation-1.0.1/po/it/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/it/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/ja/Makefile.in konversation-1.0.1.n/po/ja/Makefile.in ---- konversation-1.0.1/po/ja/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/ja/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/ka/Makefile.in konversation-1.0.1.n/po/ka/Makefile.in ---- konversation-1.0.1/po/ka/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/ka/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/ko/Makefile.in konversation-1.0.1.n/po/ko/Makefile.in ---- konversation-1.0.1/po/ko/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/ko/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/lt/Makefile.in konversation-1.0.1.n/po/lt/Makefile.in ---- konversation-1.0.1/po/lt/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/lt/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/Makefile.in konversation-1.0.1.n/po/Makefile.in ---- konversation-1.0.1/po/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -110,6 +110,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -187,6 +188,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -209,6 +213,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -223,18 +228,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -253,14 +256,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -295,14 +302,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -328,7 +338,7 @@ - all: docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -366,9 +376,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/nl/Makefile.in konversation-1.0.1.n/po/nl/Makefile.in ---- konversation-1.0.1/po/nl/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/nl/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/pa/Makefile.in konversation-1.0.1.n/po/pa/Makefile.in ---- konversation-1.0.1/po/pa/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/pa/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/pt/Makefile.in konversation-1.0.1.n/po/pt/Makefile.in ---- konversation-1.0.1/po/pt/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/pt/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/pt_BR/Makefile.in konversation-1.0.1.n/po/pt_BR/Makefile.in ---- konversation-1.0.1/po/pt_BR/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/pt_BR/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/ru/Makefile.in konversation-1.0.1.n/po/ru/Makefile.in ---- konversation-1.0.1/po/ru/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/ru/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/sr/Makefile.in konversation-1.0.1.n/po/sr/Makefile.in ---- konversation-1.0.1/po/sr/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/sr/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/sr@Latn/Makefile.in konversation-1.0.1.n/po/sr@Latn/Makefile.in ---- konversation-1.0.1/po/sr@Latn/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/sr@Latn/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/sv/Makefile.in konversation-1.0.1.n/po/sv/Makefile.in ---- konversation-1.0.1/po/sv/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/sv/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/ta/Makefile.in konversation-1.0.1.n/po/ta/Makefile.in ---- konversation-1.0.1/po/ta/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/ta/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/tr/Makefile.in konversation-1.0.1.n/po/tr/Makefile.in ---- konversation-1.0.1/po/tr/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/tr/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: -diff -uNr -x debian -x .pc konversation-1.0.1/po/zh_TW/Makefile.in konversation-1.0.1.n/po/zh_TW/Makefile.in ---- konversation-1.0.1/po/zh_TW/Makefile.in 2007-07-16 20:15:58.000000000 +0300 -+++ konversation-1.0.1.n/po/zh_TW/Makefile.in 2007-07-17 03:00:11.000000000 +0300 -@@ -112,6 +112,7 @@ - FFLAGS = @FFLAGS@ - FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ - GMSGFMT = @GMSGFMT@ -+GREP = @GREP@ - HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -189,6 +190,9 @@ - LIB_XRENDER = @LIB_XRENDER@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ - MAKEINFO = @MAKEINFO@ - MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ - MCOPIDL = @MCOPIDL@ -@@ -211,6 +215,7 @@ - QT_INCLUDES = @QT_INCLUDES@ - QT_LDFLAGS = @QT_LDFLAGS@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ -@@ -225,18 +230,16 @@ - VERSION = @VERSION@ - WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ - XGETTEXT = @XGETTEXT@ -+XMKMF = @XMKMF@ - XMLLINT = @XMLLINT@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_INCLUDES = @X_INCLUDES@ - X_LDFLAGS = @X_LDFLAGS@ - X_PRE_LIBS = @X_PRE_LIBS@ - X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - all_includes = @all_includes@ - all_libraries = @all_libraries@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -@@ -255,14 +258,18 @@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ - doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ - doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - include_ARTS_FALSE = @include_ARTS_FALSE@ - include_ARTS_TRUE = @include_ARTS_TRUE@ - include_x11_FALSE = @include_x11_FALSE@ -@@ -297,14 +304,17 @@ - konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ - po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ - sbindir = @sbindir@ -@@ -335,7 +345,7 @@ - all: all-nls docs-am all-recursive - - .SUFFIXES: --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - #>- @for dep in $?; do \ - #>- case '$(am__configure_deps)' in \ - #>- *$$dep*) \ -@@ -373,9 +383,9 @@ - $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - --$(top_srcdir)/configure: $(am__configure_deps) -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - - mostlyclean-libtool: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/debian/patches/series /tmp/ZeUXpSU1gs/konversation-1.1/debian/patches/series --- konversation-1.0.1/debian/patches/series 2008-08-13 23:12:10.000000000 +0100 +++ konversation-1.1/debian/patches/series 2008-08-13 23:12:10.000000000 +0100 @@ -2,14 +2,6 @@ 02_am_maintainer_mode.diff 03_pedantic-errors.diff 04_disable_no_undefined.diff -06_fix_relibtoolization.diff kubuntu_01_kdepot.diff 10_debian_channel.diff 11_dbug_autoreplace.diff -12_dbug405384_dccsendfile.diff -13_dbug412894_lowercase_nick.diff -14_dbug412803_assert_crash.diff -15_CVE-2007-4400.diff -16_konversation_desktop.diff -17_serverlist_compiz_workaround.diff -98_buildprep.diff diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/debian/rules /tmp/ZeUXpSU1gs/konversation-1.1/debian/rules --- konversation-1.0.1/debian/rules 2008-08-13 23:12:10.000000000 +0100 +++ konversation-1.1/debian/rules 2008-08-13 23:12:10.000000000 +0100 @@ -18,6 +18,7 @@ build/konversation:: $(GENERATED_MANPAGES) clean:: -rm -f $(GENERATED_MANPAGES) + -rm -f po/*/konversation.gmo ### Extra file installation install/konversation:: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/da/index.docbook /tmp/ZeUXpSU1gs/konversation-1.1/doc/da/index.docbook --- konversation-1.0.1/doc/da/index.docbook 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/doc/da/index.docbook 2006-10-22 07:12:59.000000000 +0100 @@ -2,10 +2,7 @@ - Konversation"> - + IRC"> - + &kmyapplication; er en &irc;-klient for &kde; 3.2 eller senere. Den tilbyder følgende funktioner. +>&konversation; er en &irc;-klient for &kde; 3.2 eller senere. Den tilbyder følgende funktioner. @@ -329,16 +326,16 @@ Hjemmesiden for &kmyapplication; er Hjemmesiden for &konversation; er &konviwebsite;. Spørgsmål og svar om &kmyapplication; kan diskuteres via e-mail-listen &kmyapplication;-Users. Spørgsmål og svar om &konversation; kan diskuteres via e-mail-listen &konversation;-Users. Abonnér venligst for at lære om nye funktioner, fejlrapporter og lignende. For at blive informeret om nye udgaver, kan du gå med i e-mail-listen &kmyapplication;-Announce&konversation;-Announce. Dette er en e-mail-liste med et lille antal breve, som kun bruges til at annoncere nye udgaver eller programrettelser. Udviklere af &kmyapplication; kan ofte kontaktes via &irc; på Udviklere af &konversation; kan ofte kontaktes via &irc; på irc.kde.org kanalen #konversation. @@ -346,7 +343,7 @@ Brug af &kmyapplication; +>Brug af &konversation; @@ -358,7 +355,7 @@ >Enkelt udtrykt er &irc; en chat-protokol, defineret af officielle Internetstandarder, med mulighed for at stjæle mange timer af dit liv. For at bruge &irc; skal du være forbundet til en server, og derefter gå med i en kanal (som svarer til et chatrum) eller blot deltage i en privat konversation. For at blive forbundet til en server og kanal, startes &kmyapplication;. Skærmen For at blive forbundet til en server og kanal, startes &konversation;. Skærmen Serverliste vises. @@ -391,9 +388,9 @@ >Listen med indstellede &irc;-netværk angives her. Et &irc;-netværk er en samling samarbejdende servere. Du behøver kun at forbinde dig til en af serverne i netværket for at være forbundet til hele &irc;-netværket. Når du er forbundet, vil &kmyapplication; automatisk gå med i de viste angives her. Et &irc;-netværk er en samling samarbejdende servere. Du behøver kun at forbinde dig til en af serverne i netværket for at være forbundet til hele &irc;-netværket. Når du er forbundet, vil &konversation; automatisk gå med i de viste Kanaler. Når &kmyapplication; startes for første gang, er netværket . Når &konversation; startes for første gang, er netværket FreenodeNår du klikker på knappen Forbind første gang du åbner &kmyapplication;, ser du måske følgende meddelelse, som fortæller dig at din standard første gang du åbner &konversation;, ser du måske følgende meddelelse, som fortæller dig at din standardidentitet ikke er rigtigt indstillet. @@ -445,7 +442,7 @@ Første gang du åbner &kmyapplication; hentes information om nuværende bruger fra operativsystemet, og standardværdier for identiteten udfyldes. Hvis brugerinformationen i operativsystemet ikke er fuldstændig, for eksempel hvis intet Fuldstændigt navn er defineret, vil du se meddelelsen ovenfor. For at rette problemet, klikkes på Første gang du åbner &konversation; hentes information om nuværende bruger fra operativsystemet, og standardværdier for identiteten udfyldes. Hvis brugerinformationen i operativsystemet ikke er fuldstændig, for eksempel hvis intet Fuldstændigt navn er defineret, vil du se meddelelsen ovenfor. For at rette problemet, klikkes på O.k. og så kigges i Opsætning af din identitetHovedskærmen åbnes og viser meddelelser som sendes af serveren til klienten. (Hvis &kmyapplication; ikke vil forbindes til serveren, se åbnes og viser meddelelser som sendes af serveren til klienten. (Hvis &konversation; ikke vil forbindes til serveren, se Ofte stillede spørgsmål.) Når servermeddelelser er færdige med at rulle forbi, går &kmyapplication; med i den kanal eller de kanaler som blev valgt. +>.) Når servermeddelelser er færdige med at rulle forbi, går &konversation; med i den kanal eller de kanaler som blev valgt. @@ -541,7 +538,7 @@ >Indstil din identitet Inden du begynder at bruge &kmyapplication; regelmæssigt bør du indstille hvordan du vil være identificeret på netværket. +>Inden du begynder at bruge &konversation; regelmæssigt bør du indstille hvordan du vil være identificeret på netværket. Klik på . Eftersom aliasser skal være entydige på hele &irc;-netværket, kan dit ønskede navn måske ikke tillades af servere eftersom en anden allerede bruger det. Indtast alternative aliasser for dig selv. Hvis dit første valg ikke tillades af serveren, forsøger &kmyapplication; med de alternative aliasser. +>Eftersom aliasser skal være entydige på hele &irc;-netværket, kan dit ønskede navn måske ikke tillades af servere eftersom en anden allerede bruger det. Indtast alternative aliasser for dig selv. Hvis dit første valg ikke tillades af serveren, forsøger &konversation; med de alternative aliasser. Ifølge RFC 2812 er den maksimale aliasnavnelængde 9, men det afgøres i virkeligheden af serveren. For at afgøre maksimum for en server, forbindes til serveren. Led efter meddelelsen [Support] under fanebladet i fanebladet Servermeddelelsen. For eksempel: [18:51] *Eisfuchs* [21:45] [Support] Eisfuchs MODES=4 MAXCHANNELS=20 NICKLEN=16 USERLEN=10 HOSTLEN=63 TOPICLEN=450 KICKLEN=450 CHANNELLEN=30 KEYLEN=23 CHANTYPES=# PREFIX=@+ CASEMAPPING=ascii CAPAB IRCD=dancer +>[18:51] *Eisfuchs* [21:45] [Support] Eisfuchs MODES=4 MAXCHANNELS=20 NICKLEN=16 USERLEN=10 HOSTLEN=63 TOPICLEN=450 KICKLEN=450 CHANNELLEN=30 KEYLEN=23 CHANTYPES=# PREFIX=@+ CASEMAPPING=ascii CAPAB &irc;D=dancer Hvis du har registreret dit alias med &irc;-netværket, indtastes tjenesten og kodeordet for godkende dit alias. Når &kmyapplication; forbinder, sendes automatisk Hvis du har registreret dit alias med &irc;-netværket, indtastes tjenesten og kodeordet for godkende dit alias. Når &konversation; forbinder, sendes automatisk /msg i en kanal som du gået med i med denne Identitet, ændrer &kmyapplication; automatisk dit alias til , ændrer &konversation; automatisk dit alias til Borte alias. Andre brugere mærker at du er væk fra maskinen. Så snart du udfører kommandoen /away i den kanal hvor du er borte, ændrer &kmyapplication; automatisk dit alias tilbage til det normale. Hvis du ikke automatisk vil ændre dit alias når du er borte, så lad det være tomt. i den kanal hvor du er borte, ændrer &konversation; automatisk dit alias tilbage til det normale. Hvis du ikke automatisk vil ændre dit alias når du er borte, så lad det være tomt. Hvis du markerer dette felt sender &kmyapplication; automatisk Hvis du markerer dette felt sender &konversation; automatisk Bortemeddelelse til alle kanaler som du gået med i med denne Identitet Denne indstilling påvirker hvordan tegn du skriver kodes når de skal sendes til serveren. Den påvirker også hvordan meddelelser vises. Når du først åbner &kmyapplication;, hentes denne indstilling automatisk fra operativsystemet. Hvis du synes at have problemer med at se andre brugeres meddelelser rigtigt, så forsøg at ændre denne indstilling.Denne indstilling påvirker hvordan tegn du skriver kodes når de skal sendes til serveren. Den påvirker også hvordan meddelelser vises. Når du først åbner &konversation;, hentes denne indstilling automatisk fra operativsystemet. Hvis du synes at have problemer med at se andre brugeres meddelelser rigtigt, så forsøg at ændre denne indstilling. Når du forbinder, spørger mange servere din maskine efter et IDENT-svar. Hvis din maskine ikke kører en IDENT-server, sendes svaret af &kmyapplication;. Ingen mellemrum er tilladt. Et forslag er at bruge dit fornavn.Når du forbinder, spørger mange servere din maskine efter et IDENT-svar. Hvis din maskine ikke kører en IDENT-server, sendes svaret af &konversation;. Ingen mellemrum er tilladt. Et forslag er at bruge dit fornavn. Klik for at anvende dine ændringer. For at alle ændringer skal få virkning, skal du afbryde fra serveren og forbinde igen. Den enkleste måde at gøre det er at afslutte &kmyapplication; og starte forfra.Klik for at anvende dine ændringer. For at alle ændringer skal få virkning, skal du afbryde fra serveren og forbinde igen. Den enkleste måde at gøre det er at afslutte &konversation; og starte forfra. @@ -849,7 +846,7 @@ Skærmen Serverliste vises når du starter programmet &kmyapplication;. Den vises også når du vælger vises når du starter programmet &konversation;. Den vises også når du vælger Fil Markér dette hvis du ønsker at &kmyapplication; automatisk skal forbinde til netværket så snart du åbner &kmyapplication;.Markér dette hvis du ønsker at &konversation; automatisk skal forbinde til netværket så snart du åbner &konversation;. Dette er en liste med &irc;-servere i netværket. Ved forbindelse til netværket, forsøger &kmyapplication; at forbinde til den øverste server først. Hvis det mislykkes, forsøger den med den anden server. Hvis det mislykkes, forsøger den med den tredje, og så videre. I det mindste en server skal angives. Klik på en server for at markere den. i netværket. Ved forbindelse til netværket, forsøger &konversation; at forbinde til den øverste server først. Hvis det mislykkes, forsøger den med den anden server. Hvis det mislykkes, forsøger den med den tredje, og så videre. I det mindste en server skal angives. Klik på en server for at markere den. Valgfrit. Dette er en liste over kanalerne du automatisk går med i så snart &kmyapplication; er forbundet til en server. Du kan lade den være tom hvis du ikke vil gå med i nogen kanaler automatisk.Valgfrit. Dette er en liste over kanalerne du automatisk går med i så snart &konversation; er forbundet til en server. Du kan lade den være tom hvis du ikke vil gå med i nogen kanaler automatisk. netværk. Undgå at indtaste samme server under to forskellige netværk. Ellers virker &kmyapplication;s . Ellers virker &konversation;s integration med adressbogen og overvågning af online aliasserDen filtrerede liste med kanaler vises her. Bemærk at hvis du ikke bruger regulære udtryk, giver &kmyapplication; en liste over alle kanaler hvis navn indeholder filterstrengen som du indskrev. Kanalnavnet behøver ikke begynde med strengen du skrev.Den filtrerede liste med kanaler vises her. Bemærk at hvis du ikke bruger regulære udtryk, giver &konversation; en liste over alle kanaler hvis navn indeholder filterstrengen som du indskrev. Kanalnavnet behøver ikke begynde med strengen du skrev. Hvis den indsatte tekst er længere end 256 tegn, eller den indeholder mere end en linje, kommer en advarselsbesked frem, der fortæller dig at store indsendelser kan forårsage nulstilling af forbindelsen og oversvømmelse. Du kan stadig fortsætte med din meddelelse, men det er en dårlig idé at gøre det, da oversvømmelse vil irritere andre brugere på kanalen, eller din forbindelse til serveren kan blive afbrudt. Det er bedre at sende beskederne i mindre stumper. En konvention som bruges i mange kanaler er at indlede meddelelser rettede til en bruger med deres alias. &kmyapplication; sørger for en bekvem funktion til at komplettere aliasser. Begynd med at skrive brugerens alias, tryk derefter på En konvention som bruges i mange kanaler er at indlede meddelelser rettede til en bruger med deres alias. &konversation; sørger for en bekvem funktion til at komplettere aliasser. Begynd med at skrive brugerens alias, tryk derefter på Tab. &kmyapplication; kompletterer så resten af brugerens alias, fulgt af et kolon. For at brugerindstille kompletteringsegenskaben, vælges . &konversation; kompletterer så resten af brugerens alias, fulgt af et kolon. For at brugerindstille kompletteringsegenskaben, vælges Opsætning Nick-feltet, og klik på Forbind-kanppen. Når &kmyapplication; er forbundet til serveren, indtastes kommandoen -kanppen. Når &konversation; er forbundet til serveren, indtastes kommandoen /join RFC 2812 for en fuldstændig liste over alle kommandoer, eller besøg irchelp.org. For en liste af kommandoer der behandles specielt af &kmyapplication;, se . For en liste af kommandoer der behandles specielt af &konversation;, se Konversations kommandoer @@ -1922,7 +1919,7 @@ >alias for en privat konversation, almindeligvis kendt på IRC som en for en privat konversation, almindeligvis kendt på &irc; som en forespørgsel. Alt som skrives her ses kun hos dig og din partner. @@ -1992,7 +1989,7 @@ >Private konversationer (forespørgsler) En privat konversation er en som kun du og en anden person kan se. Private konversationer kalde "forespørgsler" i &kmyapplication;. For at starte en privat konversation, skrives En privat konversation er en som kun du og en anden person kan se. Private konversationer kalde "forespørgsler" i &konversation;. For at starte en privat konversation, skrives /query . Når en anden åbner en forespørgsel til dig, laver &kmyapplication; et nyt faneblad med deres alias. Hvis du ikke vil tale med personen, så luk fanebladet. +>Når en anden åbner en forespørgsel til dig, laver &konversation; et nyt faneblad med deres alias. Hvis du ikke vil tale med personen, så luk fanebladet. @@ -2041,7 +2038,7 @@ Påmindelser er handlinger som &kmyapplication; udfører så snart en begivenhed indtræffer. Antag at du lader &kmyapplication; køre, men minimeret eller skjult bagved andre programvinduer på desktoppen. Hvis nogen vil kommunikere med dig, eller hvis en ven går med i en kanal, vil du gerne have det at vide. Bekendtgørelser dørger for dette. +> er handlinger som &konversation; udfører så snart en begivenhed indtræffer. Antag at du lader &konversation; køre, men minimeret eller skjult bagved andre programvinduer på desktoppen. Hvis nogen vil kommunikere med dig, eller hvis en ven går med i en kanal, vil du gerne have det at vide. Bekendtgørelser dørger for dette. For at indstille påmindelser, vælges Du kan også selv blive underrette når nogle nævner dit alias i en meddelelse med &kmyapplication;s Du kan også selv blive underrette når nogle nævner dit alias i en meddelelse med &konversation;s fremhævningsfunktion. @@ -2134,7 +2131,7 @@ >Overvåg hvem der er på nettet &kmyapplication; holder dig informeret om dine venner er forbundet til &irc;-netværket eller ej. +>&konversation; holder dig informeret om dine venner er forbundet til &irc;-netværket eller ej. Du kan tilknytte online aliasser til kontaktindgange i adressebogen. Når du gør det, skrives aliasset og &irc;-netværket hvor aliasset er forbundet til ind i adressebogens kontakt. &irc;-netværket opbevares fordi aliasser er entydige i et enkelt &irc;-netværk. Aliasser i to forskellige &irc;-netværk svarer ikke nødvendigtvis til samme person, men samme alias på to forskellige servere i samme &irc;-netværk svarer til samme person. @@ -2227,8 +2224,8 @@ Brug disse knapper til at tilknytte et alias til en kontakt i din adressebog, fjerne en tilknytning, eller åbne adressebogen for at redigere kontaktinformationen. Se KAdressBook-håndbogen for yderligere instruktioner om hvordan man bruger KDE's adressebog. &kaddressbook;-håndbogen for yderligere instruktioner om hvordan man bruger &kde;'s adressebog. @@ -2279,7 +2276,7 @@ >Hvis du ønsker at skærmen Overvågede online aliasser automatisk skal vises når du starter &kmyapplication;, så markér dette felt. automatisk skal vises når du starter &konversation;, så markér dette felt. Bemærk: Når du viser skærmen Overvågede aliasser, kan det tage et stykke tid inden nogen aliasser vises, indtil &kmyapplication; har spurgt serveren. Normalt lader du skærmen , kan det tage et stykke tid inden nogen aliasser vises, indtil &konversation; har spurgt serveren. Normalt lader du skærmen Overvågede aliasser være i gang. &kmyapplication; viser også meddelelser i alle &konversation; viser også meddelelser i alle kanaler så snart en bruger fra din Overvågede aliasserIndstillinger Indstil &kmyapplication;Indstil &konversation; i hovedmenuen. Skærmen Indtast et strengmønster her. Alle modtagne meddelelser som matcher mønstret, noget sted i meddelelsen, aktiverer fremhævning af meddelelsen. Hvis du har værktøjet KDE's editor for regulære udtryk installeret på systemet, er knappen til højre aktiveret. Klik for at vise editoren, som hjælper dig med at oprette mere komplicerede mønstre. (KDE's editor for regulære udtryk er en del af pakken Indtast et strengmønster her. Alle modtagne meddelelser som matcher mønstret, noget sted i meddelelsen, aktiverer fremhævning af meddelelsen. Hvis du har værktøjet &kde;editor for regulære udtryk installeret på systemet, er knappen til højre aktiveret. Klik for at vise editoren, som hjælper dig med at oprette mere komplicerede mønstre. (&kde;editor for regulære udtryk er en del af pakken kdeutils.) @@ -2423,11 +2420,11 @@ > Hvis du vil kan &kmyapplication; afspille en lyd når mønstret matches. Klik på knappen for at vælge en lydfil at afspille. Klik på testknappen for at høre lyden.Hvis du vil kan &konversation; afspille en lyd når mønstret matches. Klik på knappen for at vælge en lydfil at afspille. Klik på testknappen for at høre lyden. Hvis du ønsker at &kmyapplication; automatisk skal sende en svarmeddelelse når mønstret matches, skriv meddelelsen her. Brug denne funktion med forsigtighed eftersom du kan irritere &irc;-brugere med for meget snak hvis du ikke er forsigtig. Du kan også indtaste &irc;- eller &kmyapplication;-kommandoer her.Hvis du ønsker at &konversation; automatisk skal sende en svarmeddelelse når mønstret matches, skriv meddelelsen her. Brug denne funktion med forsigtighed eftersom du kan irritere &irc;-brugere med for meget snak hvis du ikke er forsigtig. Du kan også indtaste &irc;- eller &konversation;-kommandoer her. Meddelelser på skærmen (OSD) er en unik funktion i &kmyapplication;. Når &osd; er aktiveret, vises kanalmeddelelser på desktoppens skærm, også selvom &kmyapplication; er minimeret. Her er et eksempel på &osd; i funktion. Meddelelsen længst oppe til venstre på skærmen er fra &kmyapplication;, som kører minimeret i statusfeltet. +>) er en unik funktion i &konversation;. Når &osd; er aktiveret, vises kanalmeddelelser på desktoppens skærm, også selvom &konversation; er minimeret. Her er et eksempel på &osd; i funktion. Meddelelsen længst oppe til venstre på skærmen er fra &konversation;, som kører minimeret i statusfeltet. @@ -2479,7 +2476,7 @@ >Indstillinger Indstil &kmyapplication;Indstil &konversation; i hovedmenuen. Skærmen knappen Indsæt IRC-farveknappen Indsæt &irc;-farve knappen Indsæt IRC-farve eller vælg knappen Indsæt &irc;-farve eller vælg Indsæt IRC-farve&irc;-farve i hovedmenuen. Skærmen IRC-farvevælger&irc;-farvevælger vises. Skærmen IRC-farvevælger. +>Skærmen &irc;-farvevælger. Skærmen IRC-farvevælger +>Skærmen &irc;-farvevælger @@ -2604,7 +2601,7 @@ >. Fortsæt med at indtaste meddelelsen på indtastningslinjen. For at ændre farve igen, klikkes på knappen Indsæt IRC-farveIndsæt &irc;-farve. Vælg en anden farve og klik på O.k. @@ -2902,7 +2899,7 @@ Du forsøger at sende en fil til modtageren. &kmyapplication; venter på at modtageren skal acceptere filen. +>Du forsøger at sende en fil til modtageren. &konversation; venter på at modtageren skal acceptere filen. @@ -2912,7 +2909,7 @@ &kmyapplication; forsøger at oprette en forbindelse med den anden ende. +>&konversation; forsøger at oprette en forbindelse med den anden ende. @@ -2922,7 +2919,7 @@ &kmyapplication; sender filen til den anden ende. +>&konversation; sender filen til den anden ende. @@ -2932,7 +2929,7 @@ &kmyapplication; modtager filen fra den anden ende. +>&konversation; modtager filen fra den anden ende. @@ -2994,7 +2991,7 @@ &kmyapplication; forsøger at hente afsenderens IP-adresse. +>&konversation; forsøger at hente afsenderens IP-adresse. @@ -3020,7 +3017,7 @@ >DCC Status (hvis det ikke allerede er der). Klik på fanebladet DCC Status for at vise det. Klik på filen for at markere den, og klik derefter på denne knap for at acceptere filen, så begynder overførslen. Bemærk: Du kan indstille &kmyapplication; til automatisk at acceptere overførsler fra andre personer ved at vælge for at vise det. Klik på filen for at markere den, og klik derefter på denne knap for at acceptere filen, så begynder overførslen. Bemærk: Du kan indstille &konversation; til automatisk at acceptere overførsler fra andre personer ved at vælge Indstillinger Integration i KAddressBook +>Integration med &kaddressbook;. Du kan tilknytte ethvert &nickname;til en kontakt i KAddressBook. Når du har gjort dette vil &kmyapplication; vise kontaktens rigtige navn i parentes efter &nickname; i Du kan tilknytte ethvert &nickname;til en kontakt i KAddressBook. Når du har gjort dette vil &konversation; vise kontaktens rigtige navn i parentes efter &nickname; i Alias-Panelet. @@ -3144,21 +3141,21 @@ Bemærk at &kmyapplication; udfylder aliasset for dig med protokollen IRCBemærk at &konversation; udfylder aliasset for dig med protokollen &irc;. Se KAddressBook's håndbog for yderligere instruktioner om hvordan man bruger KDE's adressebog. +>&kaddressbook;'s håndbog for yderligere instruktioner om hvordan man bruger &kde;s adressebog. Udfyld mulig yderligere information om aliasset du kender til og klik på O.k. Personens rigtige navn vises i parenteser foran aliasset i Aliaspanelet i &kmyapplication;. Det rigtige navn vises også når musen holdes stille over aliasset. +> i &konversation;. Det rigtige navn vises også når musen holdes stille over aliasset. Så snart et alias er knyttet sammen med en kontakt i adressebogen, kan du højreklikke på personens alias i og redigere den tilknyttede kontakt, knytte aliasset sammen med en anden kontakt, eller fjerne tilknytningen. Hvis du har tilknyttet et alias til en kontakt, og brugeren ændrer sit alias mens du kører &kmyapplication;, tilknyttes det nye alias automatisk til kontakten, og desuden beholdes den oprindelige tilknytning. +>Hvis du har tilknyttet et alias til en kontakt, og brugeren ændrer sit alias mens du kører &konversation;, tilknyttes det nye alias automatisk til kontakten, og desuden beholdes den oprindelige tilknytning. Hvis du knytter et alias i IRC til en kontakt i Hvis du knytter et alias i &irc; til en kontakt i Kopete, vises også tilknytningen i &kmyapplication; og modsat. +>, vises også tilknytningen i &konversation; og modsat. Bemærk: Det er muligt at markere mere end et alias i Brugere sender ind imellem &URL;'er for interessante steder eller andre ressourcer på nettet, i hvilken som helst kanal. Du kan dobbeltklikke på alle sådanne &URL;'er så starter &kmyapplication; programmet som hører sammen med &URL;'en. Programmet som startes afhænger af &MIME;-typen som &URL;'en har. For eksempel aktiveres din almindelige browser for en &URL; som begynder med . Du kan dobbeltklikke på alle sådanne &URL;'er så starter &konversation; programmet som hører sammen med &URL;'en. Programmet som startes afhænger af &MIME;-typen som &URL;'en har. For eksempel aktiveres din almindelige browser for en &URL; som begynder med http:, og viser den. Hvis &URL;'en ruller forbi på skærmen, kan det være svært at finde den igen. &kmyapplication; kan gemme en bekvem liste med alle &URL;'er for dig. For at aktivere denne funktion, vælges , og viser den. Hvis &URL;'en ruller forbi på skærmen, kan det være svært at finde den igen. &konversation; kan gemme en bekvem liste med alle &URL;'er for dig. For at aktivere denne funktion, vælges Vindue Dette er listen med &URL;'er som er set siden du startede &kmyapplication;. Søjlen Dette er listen med &URL;'er som er set siden du startede &konversation;. Søjlen Alias er alias på personen som sendte &URL;'en. Hvis alias er blankt, blev &URL;'en vist under fanebladet er alias på personen som sendte &URL;'en. Hvis alias er blankt, blev &URL;'en vist i fanebladet Servermeddelelser. (&URL;'er som vises i meddelelser for at gå med i eller forlade kanaler er ikke på listen.) Klik på en &URL; for at markere den. @@ -3282,16 +3279,16 @@ >Opsætning af din foretrukne browser Når du klikker på en fremhævet &URL; hvorsomhelst i &kmyapplication;, vil den starte standardprogrammet i KDE tilknyttet &MIME;-typen for denne &URL;. For eksempel, når der klikkes på en &URL; der begynder med Når du klikker på en fremhævet &URL; hvorsomhelst i &konversation;, vil den starte standardprogrammet i &kde; tilknyttet &MIME;-typen for denne &URL;. For eksempel, når der klikkes på en &URL; der begynder med http, startes &konqueror; for at vise netsiden. Du kan angive et andet program end KDE's standard. For eksempel, kan du bruge Mozilla i stedet for. +>, startes &konqueror; for at vise netsiden. Du kan angive et andet program end &kde;'s standard. For eksempel, kan du bruge Mozilla i stedet for. For at vælge en anden browser, vælges Opsætning Indstil &kmyapplication;Indstil &konversation; i hovedmenuen. Skærmen mailto: &URL;'er. mailto: &URL;'er starter altid KDE's standardprogram. +> &URL;'er starter altid &kde;s standardprogram. Klik på Anvend for at gemme dine ændringer. Du skal forbinde til hver server igen for at alle ændringer skal få virkning. Den nemmeste måde at gøre det er at afslutte &kmyapplication; og starte forfra. +> for at gemme dine ændringer. Du skal forbinde til hver server igen for at alle ændringer skal få virkning. Den nemmeste måde at gøre det er at afslutte &konversation; og starte forfra. @@ -3437,7 +3434,7 @@ >. For at få &kmyapplication; til automatisk at indsætte en For at få &konversation; til automatisk at indsætte en huske-linje så snart du sender kommandoen Logning Hvis logning er aktiveret, logger &kmyapplication; hver Hvis logning er aktiveret, logger &konversation; hver server, kanal og privat konversation (spørgsmål). Hver session opbevares i en logfil på disken. Når du åbner samme session igen, tilføjer &kmyapplication; til loggen. Loggen vokser til en grænse som du kan indstille (se nedenfor). Når grænsen nås, kasseres de ældste meddelelser. +>. Hver session opbevares i en logfil på disken. Når du åbner samme session igen, tilføjer &konversation; til loggen. Loggen vokser til en grænse som du kan indstille (se nedenfor). Når grænsen nås, kasseres de ældste meddelelser. Så snart du åbner en session igen, læses cirka de sidste 1024 tegn af foregående session fra slutningen af loggen og vises på skærmen. @@ -3534,7 +3531,7 @@ > Brug dette felt til at indstille maksimal størrelse på logfilen. Indstillingen får ingen effekt førend du genstarter &kmyapplication;. Hver logfil kan have en separat indstilling.Brug dette felt til at indstille maksimal størrelse på logfilen. Indstillingen får ingen effekt førend du genstarter &konversation;. Hver logfil kan have en separat indstilling. @@ -3546,7 +3543,7 @@ >Indstillinger Indstil &kmyapplication;Indstil &konversation; i hovedmenuen, og derefter ekspandere OpførselIndstillinger Indstil &kmyapplication;Indstil &konversation; i hovedmenuen, og derefter ekspandere Opførsel &kmyapplication;'s kommandoer +>&konversation;'s kommandoer Følgende kommandoer tolkes af &kmyapplication; og kan være forskellige fra almindelige &irc;-kommandoer. Flag indenfor forkantede parenteser er valgfrie. Flag adskilte med en lodret streg (|) er forskellige former af kommandoen. Kommandoer som ikke er på denne liste, sendes til serveren som de skrives ind. +>Følgende kommandoer tolkes af &konversation; og kan være forskellige fra almindelige &irc;-kommandoer. Flag indenfor forkantede parenteser er valgfrie. Flag adskilte med en lodret streg (|) er forskellige former af kommandoen. Kommandoer som ikke er på denne liste, sendes til serveren som de skrives ind. @@ -3629,7 +3626,7 @@ >/me ovenfor, undtagen at meddelelsen sendes til alle kanaler og forespørgsler som er åbne på alle servere du er tilsluttet i &kmyapplication;. ovenfor, undtagen at meddelelsen sendes til alle kanaler og forespørgsler som er åbne på alle servere du er tilsluttet i &konversation;. @@ -3706,7 +3703,7 @@ > og lukker tilsvarende kanalfaneblad. Inde i en &kmyapplication; kanal eller et forespørgselsfaneblad, kan du kun indtaste . Inde i en &konversation; kanal eller et forespørgselsfaneblad, kan du kun indtaste /partalias for en privat konversation, almindeligvis kendt på IRC som en for en privat konversation, almindeligvis kendt på &irc; som en forespørgsel. Alt som skrives her ses kun hos dig og din partner. Du kan indtaste mere end et &nickname; adskilt af mellemrum og et forspørgselsfanebald for hvert &nickname;. Hver sådan forespørgselsfaneblad vil være privat mellem dig og den forespurgte partner. @@ -3924,7 +3921,7 @@ >/msg kommandoen ovenfor, undtagen at meddelelsen sendes til alle kanaler og forespørgsler som du har åbnet på alle servere du er tilknyttet i &kmyapplication;. kommandoen ovenfor, undtagen at meddelelsen sendes til alle kanaler og forespørgsler som du har åbnet på alle servere du er tilknyttet i &konversation;. @@ -3981,7 +3978,7 @@ >alias IRC-op rettigheder (administrator). Dette virker kun hvis aliasset er på listen på servernes O:-linje. En IRC-op har ret til at udføre &irc;-op rettigheder (administrator). Dette virker kun hvis aliasset er på listen på servernes O:-linje. En &irc;-op har ret til at udføre /killalias ikke indtastes, forsøges det at give dig selv IRC-op rettigheder. Du bliver spurgt om dit IRC-op brugernavn og kodeord i begge tilfælde. +> ikke indtastes, forsøges det at give dig selv &irc;-op rettigheder. Du bliver spurgt om dit &irc;-op brugernavn og kodeord i begge tilfælde. @@ -4060,7 +4057,7 @@ >kanal udelades, og bliver som standard til kanalen som er aktiv under fanebladet. Hvis udelades, og bliver som standard til kanalen som er aktiv i fanebladet. Hvis meddelelse/away ovenfor, bortset fra at kommandoen sendes til alle servere du er forbundet til i &kmyapplication;. ovenfor, bortset fra at kommandoen sendes til alle servere du er forbundet til i &konversation;. @@ -4152,7 +4149,7 @@ > Kører et skalscript som virker sammen med &kmyapplication; som hedder Kører et skalscript som virker sammen med &konversation; som hedder script Sender dit systems KDE- og Qt-versionsnummer til kanalen. +>Sender dit systems &kde;- og &Qt;-versionsnummer til kanalen. Viser eller indstiller opsætning af &kmyapplication; uden at bruge opsætningsskærmen. Hvis en parameter indeholder mellemrum, omgive den med citationstegn. +>Viser eller indstiller opsætning af &konversation; uden at bruge opsætningsskærmen. Hvis en parameter indeholder mellemrum, omgive den med citationstegn. Eksempler: @@ -4270,7 +4267,7 @@ > Viser nuværende værdi af indstillingen som viser &kmyapplication;s ikon i statusfeltet. +>Viser nuværende værdi af indstillingen som viser &konversation;s ikon i statusfeltet. Lukker for &kmyapplication;s ikon i statusfeltet. +>Lukker for &konversation;s ikon i statusfeltet. @@ -4312,7 +4309,7 @@ > ikke indskrives, bruges standardgrunden fra Indstillinger. Kommandoen må kun bruges under et kanalfaneblad. +>. Kommandoen må kun bruges i et kanalfaneblad. @@ -4351,7 +4348,7 @@ >kanal. Når dette indtastes under et kanalfaneblad, kan . Når dette indtastes i et kanalfaneblad, kan kanal Åbner et nyt faneblad som kører en KDE-terminal. Åbner et nyt faneblad som kører en &kde;-terminal. @@ -4634,7 +4631,7 @@ >/msg ovenfor, bortset fra at meddelelsen sendes med CTCP-protokollen. Svaret fra den anden side afhænger af &irc;-klientprogrammet brugeren kører. Hvis du for eksempel taler med en anden brugere af &kmyapplication;, returneres ovenfor, bortset fra at meddelelsen sendes med CTCP-protokollen. Svaret fra den anden side afhænger af &irc;-klientprogrammet brugeren kører. Hvis du for eksempel taler med en anden brugere af &konversation;, returneres /ctcp Eisfuchs TIME/ctcp Eisfuchs VERSION returnerer versionsnumret for &kmyapplication; fra Eisfuchs maskine. returnerer versionsnumret for &konversation; fra Eisfuchs maskine. @@ -4658,7 +4655,7 @@ >Scripter &kmyapplication; levereres med nogle praktiske scripter som du kan køre fra programmet. For at køre et script under et kanalfaneblad, DCC-faneblad eller serverfaneblad, indtastes en kommando på formen +>&konversation; levereres med nogle praktiske scripter som du kan køre fra programmet. For at køre et script i et kanalfaneblad, DCC-faneblad eller serverfaneblad, indtastes en kommando på formen for at sende dine KDE- og Qt-versionsnumre til kanalen. +>for at sende dine &kde;- og &Qt;-versionsnumre til kanalen. Du kan skrive dine egne scripter. Scripter er skalscripter og kan skrives med hvilket som helst skalsprog, såsom bash, perl eller python. Når &kmyapplication; kører et script, er de første tre parametre som sendes til scriptet: +>Du kan skrive dine egne scripter. Scripter er skalscripter og kan skrives med hvilket som helst skalsprog, såsom bash, perl eller python. Når &konversation; kører et script, er de første tre parametre som sendes til scriptet: Portnumret for &irc;-serveren under fanebladet hvor kommandoen Portnumret for &irc;-serveren i fanebladet hvor kommandoen /exec Bemærk at scriptet bruger DCOP til at kommunikere med &kmyapplication;. Kommandoen Bemærk at scriptet bruger DCOP til at kommunikere med &konversation;. Kommandoen /say gør at udskriften sendes til kanalen som en normal meddelelse. For at vise noget under fanebladet uden at sende det til andre brugere, bruges gør at udskriften sendes til kanalen som en normal meddelelse. For at vise noget i fanebladet uden at sende det til andre brugere, bruges info i stedet. Kig i eksisterende scriptfiler for flere eksempler på at skrive scripter. @@ -4801,7 +4798,7 @@ Hovedvinduet for &kmyapplication; +>Hovedvinduet for &konversation; <para ><action >Afslutter</action -> &kmyapplication;</para +> &konversation;</para ></listitem> </varlistentry> </variablelist> @@ -5058,7 +5055,7 @@ > <guimenu >Indsæt</guimenu > <guimenuitem ->IRC-farve</guimenuitem +>&irc;-farve</guimenuitem > </menuchoice ></term> <listitem @@ -5280,7 +5277,7 @@ <listitem ><para> <action ->Tillader dig at ændre tastaturgenveje for &kmyapplication;.</action> +>Tillader dig at ændre tastaturgenveje for &konversation;.</action> </para ></listitem> </varlistentry> @@ -5296,7 +5293,7 @@ <listitem ><para> <action ->Tillader dig at tilføje eller fjerne knapper fra &kmyapplication;'s værktøjslinje.</action> +>Tillader dig at tilføje eller fjerne knapper fra &konversation;'s værktøjslinje.</action> </para ></listitem> </varlistentry> @@ -5324,7 +5321,7 @@ ><guimenu >Opsætnings</guimenu > <guimenuitem ->Indstil &kmyapplication;</guimenuitem +>Indstil &konversation;</guimenuitem > </menuchoice ></term> <listitem @@ -5605,7 +5602,7 @@ <qandaentry> <question> <para ->Når jeg starter &kmyapplication; vil jeg forbindes til en server uden at gå med i nogen kanaler. Hvordan gør jeg det?</para> +>Når jeg starter &konversation; vil jeg forbindes til en server uden at gå med i nogen kanaler. Hvordan gør jeg det?</para> </question> <answer> <para @@ -5620,7 +5617,7 @@ <qandaentry> <question> <para ->&kmyapplication; forbinder ikke til nogen server. Hvad er der galt?</para> +>&konversation; forbinder ikke til nogen server. Hvad er der galt?</para> </question> <answer> <para @@ -5648,7 +5645,7 @@ </listitem> <listitem> <para ->Hvis du er bag en brandmur, så sørg for at de rigtige porte er aktiverede. &kmyapplication; kræver at følgende porte er aktiverede: </para> +>Hvis du er bag en brandmur, så sørg for at de rigtige porte er aktiverede. &konversation; kræver at følgende porte er aktiverede: </para> <para> <itemizedlist> @@ -5669,7 +5666,7 @@ </para> <para ->For mere information om IRC-forbindelsesproblemer, se <ulink url="http://www.irchelp.org/irchelp/networks/connectprob.html" +>For mere information om &irc;-forbindelsesproblemer, se <ulink url="http://www.irchelp.org/irchelp/networks/connectprob.html" >irchelp.org</ulink >. </para> @@ -5718,7 +5715,7 @@ >Medvirkende og licens &kmyapplication; +>Konversation Program ophavsret 2002-2005 ved Konversation-gruppen. Hvordan får man fat på &kmyapplication; +>Hvordan får man fat på &konversation; &install.intro.documentation; Den seneste version af &kmyapplication;, inklusive kildekode og byggeinstruktioner kan også hentes fra Den seneste version af &konversation;, inklusive kildekode og byggeinstruktioner kan også hentes fra &konviwebsite; hjemmeside. @@ -5915,7 +5912,7 @@ --> For at det skal lykkes at bruge &kmyapplication; har du brug for &kde; 3.2 eller senere, og en netværksforbindelse. For tidligere &kde;-versioner kan visse funktioner mangles. Hvis du vil køre &kmyapplication; bag en brandmur, så se For at det skal lykkes at bruge &konversation; har du brug for &kde; 3.2 eller senere, og en netværksforbindelse. For tidligere &kde;-versioner kan visse funktioner mangles. Hvis du vil køre &konversation; bag en brandmur, så se Spørgsmål og svar. Hvis du ønsker at bruge SSL-protokollen, vil du måske have brug for OpenSSL. diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/da/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/doc/da/Makefile.in --- konversation-1.0.1/doc/da/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/doc/da/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,8 +49,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -94,7 +88,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -169,12 +165,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -188,6 +186,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -207,24 +206,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -236,19 +233,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -275,30 +271,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -359,10 +355,6 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -373,22 +365,21 @@ #>- distdir: $(DISTFILES) #>+ 1 distdir: distdir-nls $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -439,7 +430,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -455,12 +446,20 @@ #>+ 1 install-data-am: install-docs install-nls +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -479,17 +478,20 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/es/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/doc/es/Makefile.in --- konversation-1.0.1/doc/es/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/doc/es/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,8 +49,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -94,7 +88,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -169,12 +165,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -188,6 +186,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -207,24 +206,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -236,19 +233,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -275,30 +271,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -359,10 +355,6 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -373,22 +365,21 @@ #>- distdir: $(DISTFILES) #>+ 1 distdir: distdir-nls $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -439,7 +430,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -455,12 +446,20 @@ #>+ 1 install-data-am: install-nls +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -479,45 +478,48 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: #>+ 2 -KDE_DIST=identities_gen_co.png kaddressbook.png channellist_screen_co.png notification_screen_co.png identities_away_co.png quickbuttons_screen.png quickconnect_screen.png led_yellow_off.png led_red_on.png irc_owner.png irc_away.png notifylist_screen_co.png configure.png nickthemes_screen_co.png irc_halfop.png kimproxy_create_screen_co.png irc_normal.png led_green_off.png webbrowser_screen_co.png colorchooser_screen.png nicksonline_co.png highlighting_screen_co.png irc_voice.png logviewer_co.png dccstatus_screen_co.png identities_adv_co.png led_blue_off.png Makefile.in urlcatcher_screen_co.png irc_op.png osd_screen_co.png osd_demo.png kimproxy_create_screen2.png channel_screen_tour_co.png checkidentities.png led_blue_on.png irc_admin.png first_channel_co.png colorize.png led_yellow_on.png addserver_co.png led_red_off.png serverlist_co.png addnetwork_co.png led_green_on.png Makefile.am first_serverlist_co.png addchannel.png +KDE_DIST=identities_gen_co.png kaddressbook.png channellist_screen_co.png identities_away_co.png notification_screen_co.png quickbuttons_screen.png led_red_on.png quickconnect_screen.png led_yellow_off.png irc_away.png irc_owner.png notifylist_screen_co.png configure.png nickthemes_screen_co.png irc_halfop.png kimproxy_create_screen_co.png irc_normal.png led_green_off.png webbrowser_screen_co.png nicksonline_co.png colorchooser_screen.png highlighting_screen_co.png logviewer_co.png irc_voice.png identities_adv_co.png dccstatus_screen_co.png led_blue_off.png Makefile.in urlcatcher_screen_co.png irc_op.png osd_screen_co.png osd_demo.png kimproxy_create_screen2.png channel_screen_tour_co.png checkidentities.png led_blue_on.png irc_admin.png first_channel_co.png colorize.png led_yellow_on.png addserver_co.png led_red_off.png serverlist_co.png addnetwork_co.png led_green_on.png Makefile.am first_serverlist_co.png addchannel.png #>+ 2 -docs-am: addchannel.png kimproxy_create_screen2.png identities_away_co.png kaddressbook.png notification_screen_co.png urlcatcher_screen_co.png led_blue_on.png channel_screen_tour_co.png channellist_screen_co.png irc_voice.png led_yellow_on.png irc_normal.png irc_admin.png irc_halfop.png irc_op.png kimproxy_create_screen_co.png notifylist_screen_co.png led_green_on.png logviewer_co.png addnetwork_co.png highlighting_screen_co.png first_serverlist_co.png nickthemes_screen_co.png nicksonline_co.png webbrowser_screen_co.png led_red_on.png configure.png osd_screen_co.png osd_demo.png led_yellow_off.png irc_away.png colorchooser_screen.png led_blue_off.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png irc_owner.png dccstatus_screen_co.png quickbuttons_screen.png colorize.png led_red_off.png identities_gen_co.png led_green_off.png first_channel_co.png addserver_co.png +docs-am: irc_op.png irc_voice.png led_green_on.png addnetwork_co.png notifylist_screen_co.png led_yellow_off.png highlighting_screen_co.png quickbuttons_screen.png urlcatcher_screen_co.png irc_owner.png addchannel.png configure.png notification_screen_co.png irc_normal.png irc_admin.png webbrowser_screen_co.png colorize.png kimproxy_create_screen2.png led_yellow_on.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png led_red_off.png identities_adv_co.png colorchooser_screen.png first_serverlist_co.png irc_halfop.png identities_gen_co.png irc_away.png dccstatus_screen_co.png led_blue_off.png logviewer_co.png led_blue_on.png addserver_co.png kimproxy_create_screen_co.png identities_away_co.png kaddressbook.png osd_demo.png nicksonline_co.png nickthemes_screen_co.png osd_screen_co.png checkidentities.png led_red_on.png channellist_screen_co.png led_green_off.png serverlist_co.png #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation - @for base in addchannel.png kimproxy_create_screen2.png identities_away_co.png kaddressbook.png notification_screen_co.png urlcatcher_screen_co.png led_blue_on.png channel_screen_tour_co.png channellist_screen_co.png irc_voice.png led_yellow_on.png irc_normal.png irc_admin.png irc_halfop.png irc_op.png kimproxy_create_screen_co.png notifylist_screen_co.png led_green_on.png logviewer_co.png addnetwork_co.png highlighting_screen_co.png first_serverlist_co.png nickthemes_screen_co.png nicksonline_co.png webbrowser_screen_co.png led_red_on.png configure.png osd_screen_co.png osd_demo.png led_yellow_off.png irc_away.png colorchooser_screen.png led_blue_off.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png irc_owner.png dccstatus_screen_co.png quickbuttons_screen.png colorize.png led_red_off.png identities_gen_co.png led_green_off.png first_channel_co.png addserver_co.png ; do \ + @for base in irc_op.png irc_voice.png led_green_on.png addnetwork_co.png notifylist_screen_co.png led_yellow_off.png highlighting_screen_co.png quickbuttons_screen.png urlcatcher_screen_co.png irc_owner.png addchannel.png configure.png notification_screen_co.png irc_normal.png irc_admin.png webbrowser_screen_co.png colorize.png kimproxy_create_screen2.png led_yellow_on.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png led_red_off.png identities_adv_co.png colorchooser_screen.png first_serverlist_co.png irc_halfop.png identities_gen_co.png irc_away.png dccstatus_screen_co.png led_blue_off.png logviewer_co.png led_blue_on.png addserver_co.png kimproxy_create_screen_co.png identities_away_co.png kaddressbook.png osd_demo.png nicksonline_co.png nickthemes_screen_co.png osd_screen_co.png checkidentities.png led_red_on.png channellist_screen_co.png led_green_off.png serverlist_co.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ done uninstall-nls: - for base in addchannel.png kimproxy_create_screen2.png identities_away_co.png kaddressbook.png notification_screen_co.png urlcatcher_screen_co.png led_blue_on.png channel_screen_tour_co.png channellist_screen_co.png irc_voice.png led_yellow_on.png irc_normal.png irc_admin.png irc_halfop.png irc_op.png kimproxy_create_screen_co.png notifylist_screen_co.png led_green_on.png logviewer_co.png addnetwork_co.png highlighting_screen_co.png first_serverlist_co.png nickthemes_screen_co.png nicksonline_co.png webbrowser_screen_co.png led_red_on.png configure.png osd_screen_co.png osd_demo.png led_yellow_off.png irc_away.png colorchooser_screen.png led_blue_off.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png irc_owner.png dccstatus_screen_co.png quickbuttons_screen.png colorize.png led_red_off.png identities_gen_co.png led_green_off.png first_channel_co.png addserver_co.png ; do \ + for base in irc_op.png irc_voice.png led_green_on.png addnetwork_co.png notifylist_screen_co.png led_yellow_off.png highlighting_screen_co.png quickbuttons_screen.png urlcatcher_screen_co.png irc_owner.png addchannel.png configure.png notification_screen_co.png irc_normal.png irc_admin.png webbrowser_screen_co.png colorize.png kimproxy_create_screen2.png led_yellow_on.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png led_red_off.png identities_adv_co.png colorchooser_screen.png first_serverlist_co.png irc_halfop.png identities_gen_co.png irc_away.png dccstatus_screen_co.png led_blue_off.png logviewer_co.png led_blue_on.png addserver_co.png kimproxy_create_screen_co.png identities_away_co.png kaddressbook.png osd_demo.png nicksonline_co.png nickthemes_screen_co.png osd_screen_co.png checkidentities.png led_red_on.png channellist_screen_co.png led_green_off.png serverlist_co.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ done #>+ 5 distdir-nls: - for file in addchannel.png kimproxy_create_screen2.png identities_away_co.png kaddressbook.png notification_screen_co.png urlcatcher_screen_co.png led_blue_on.png channel_screen_tour_co.png channellist_screen_co.png irc_voice.png led_yellow_on.png irc_normal.png irc_admin.png irc_halfop.png irc_op.png kimproxy_create_screen_co.png notifylist_screen_co.png led_green_on.png logviewer_co.png addnetwork_co.png highlighting_screen_co.png first_serverlist_co.png nickthemes_screen_co.png nicksonline_co.png webbrowser_screen_co.png led_red_on.png configure.png osd_screen_co.png osd_demo.png led_yellow_off.png irc_away.png colorchooser_screen.png led_blue_off.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png irc_owner.png dccstatus_screen_co.png quickbuttons_screen.png colorize.png led_red_off.png identities_gen_co.png led_green_off.png first_channel_co.png addserver_co.png ; do \ + for file in irc_op.png irc_voice.png led_green_on.png addnetwork_co.png notifylist_screen_co.png led_yellow_off.png highlighting_screen_co.png quickbuttons_screen.png urlcatcher_screen_co.png irc_owner.png addchannel.png configure.png notification_screen_co.png irc_normal.png irc_admin.png webbrowser_screen_co.png colorize.png kimproxy_create_screen2.png led_yellow_on.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png led_red_off.png identities_adv_co.png colorchooser_screen.png first_serverlist_co.png irc_halfop.png identities_gen_co.png irc_away.png dccstatus_screen_co.png led_blue_off.png logviewer_co.png led_blue_on.png addserver_co.png kimproxy_create_screen_co.png identities_away_co.png kaddressbook.png osd_demo.png nicksonline_co.png nickthemes_screen_co.png osd_screen_co.png checkidentities.png led_red_on.png channellist_screen_co.png led_green_off.png serverlist_co.png ; do \ cp $(srcdir)/$$file $(distdir); \ done diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/et/index.docbook /tmp/ZeUXpSU1gs/konversation-1.1/doc/et/index.docbook --- konversation-1.0.1/doc/et/index.docbook 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/doc/et/index.docbook 2008-07-22 19:16:22.000000000 +0100 @@ -2,16 +2,8 @@ - Konversation"> - - + + IRC"> @@ -38,7 +30,7 @@ >"> - + - MarekTõlge eesti keelde + + + &kmyapplication; on K Töölaua Keskkonna kasutajasõbralik &irc; klient. +>&konversation; on K Töölaua Keskkonna kasutajasõbralik &irc; klient. &kmyapplication; on &irc; klient KDE töökeskkonnale (versioon 3.2 või uuem). See pakub järgmisi võimalusi: +>&konversation; on &irc; klient &kde; töökeskkonnale (versioon 3.2 või uuem). See pakub järgmisi võimalusi: @@ -343,22 +334,22 @@ > Põimimine KDE aadressiraamatuga.Põimimine &aadressiraamat;uga. &kmyapplication;i veebilehekülg on &konversation;i veebilehekülg on &konviwebsite;. &kmyapplication;i kohta käivaid küsimusi ja vastuseid saab esitada Konversation-Users. &konversation;i kohta käivaid küsimusi ja vastuseid saab esitada &konversation;-Users meililistis. Palun liitu sellega, kui soovid teada saada uutest võimalustest või anda teada vigadest jne. Ainult uutest väljalasetest saab teada, kui liituda meililistiga Konversation-Announce&konversation;-Announce. See on üsna väikese mahuga list, kus antakse ainult teada uutest väljalasetest või parandustest. &kmyapplication;i arendajatega saab enamasti ühendust &irc; vahendusel &konversation;i arendajatega saab enamasti ühendust &irc; vahendusel irc.kde.org kanalil #konversation. @@ -366,7 +357,7 @@ &kmyapplication;i kasutamine +>&konversation;i kasutamine @@ -378,7 +369,7 @@ >Hästi lihtsalt öelduna on &irc; Interneti ametlike standarditega kindlaks määratud vestlusprotokoll, mis võib endale nõuda päris palju tunde sinu elust. &irc; kasutamiseks tuleb ühenduda serveriga ja seejärel kanaliga (see on umbes sama, mis jututuba) või siis alustada eravestlust. Serveri ja kanaliga ühendumiseks ava &kmyapplication;. Ilmub Serveri ja kanaliga ühendumiseks ava &konversation;. Ilmub serverite nimekiri. @@ -411,9 +402,9 @@ >Siin on kirjas seadistatud &irc; võrgud. &irc; võrk kujutab endast koostööd tegevate serverite kogumit. Sul tuleb võtta ühendust ainult ühe võrku kuuluva serveriga ning sa oled kohe ühendatud terve &irc; võrguga. Ühendumise järel võtab &kmyapplication; automaatselt ühendust kõigi näidatud . &irc; võrk kujutab endast koostööd tegevate serverite kogumit. Sul tuleb võtta ühendust ainult ühe võrku kuuluva serveriga ning sa oled kohe ühendatud terve &irc; võrguga. Ühendumise järel võtab &konversation; automaatselt ühendust kõigi näidatud kanalitega. &kmyapplication;i esmakordsel käivitamisel ootab sind juba ees itega. &konversation;i esmakordsel käivitamisel ootab sind juba ees FreenodeKui klõpsad nupule Ühenda &kmyapplication;i esmakordsel käivitamisel, näed järgmist teadet, mis ütleb, et sinu vaikimisi &konversation;i esmakordsel käivitamisel, näed järgmist teadet, mis ütleb, et sinu vaikimisi identiteet ei ole korrektselt määratud. @@ -465,7 +456,7 @@ &kmyapplication; hangib esmakordsel käivitamisel info kasutaja kohta operatsioonisüsteemist ja täidab saadud infoga vaikimisi identiteedi. Kui operatsioonisüsteemi info kasutaja kohta pole täielik (puudub näiteks tegelik nimi), näed mainitud teadet. Probleemi lahendamiseks klõpsa nupule &konversation; hangib esmakordsel käivitamisel info kasutaja kohta operatsioonisüsteemist ja täidab saadud infoga vaikimisi identiteedi. Kui operatsioonisüsteemi info kasutaja kohta pole täielik (puudub näiteks tegelik nimi), näed mainitud teadet. Probleemi lahendamiseks klõpsa nupule OK ja uuri lähemalt Identiteedi määramineIlmub peaaken, mis näitab serverilt kliendile saadetavaid teateid (kui &kmyapplication; serveriga ühendust ei saa, uuri osa , mis näitab serverilt kliendile saadetavaid teateid (kui &konversation; serveriga ühendust ei saa, uuri osa Küsimused ja vastused). Kui serveri teated on üle ekraani jooksnud, liitub &kmyapplication; valitud kanali või kanalitega. +>). Kui serveri teated on üle ekraani jooksnud, liitub &konversation; valitud kanali või kanalitega. @@ -561,7 +552,7 @@ >Identiteedi määramine Enne seda, kui hakkad regulaarselt &kmyapplication;i kasutama, peaksid seadistustes kindlaks määrama, kuidas, kellena ja mismoodi sa võrgus esined. +>Enne seda, kui hakkad regulaarselt &konversation;it kasutama, peaksid seadistustes kindlaks määrama, kuidas, kellena ja mismoodi sa võrgus esined. Vali menüükäsk . Kuna hüüdnimi peab olema serveri ulatuses unikaalne, võib juhtuda, et server keeldub seda aktsepteerimast, kui kellelgi on juba samasugune hüüdnimi. Selleks oleks mõttekas lisada vastavatesse kastidesse alternatiivsed hüüdnimed. Kui server lükkab esimesena sisestatu tagasi, on valmis järgmine hüüdnimi, mida &kmyapplication; sellisel juhul serverile saadab. +>Kuna hüüdnimi peab olema serveri ulatuses unikaalne, võib juhtuda, et server keeldub seda aktsepteerimast, kui kellelgi on juba samasugune hüüdnimi. Selleks oleks mõttekas lisada vastavatesse kastidesse alternatiivsed hüüdnimed. Kui server lükkab esimesena sisestatu tagasi, on valmis järgmine hüüdnimi, mida &konversation; sellisel juhul serverile saadab. RFC 2812 kohaselt võib hüüdnimi olla maksimaalselt üheksamärgiline, kuid tegelikult on see serveri otsustada. Serveri maksimumi selgitamiseks võta serveriga ühendust. Kui oled oma hüüdnime &irc; võrgus registreerinud, sisesta ka teenus ja oma hüüdnime autentimisel kasutatav parool. Kui &kmyapplication; ühendust loob, saadab rakendus automaatselt serverile Kui oled oma hüüdnime &irc; võrgus registreerinud, sisesta ka teenus ja oma hüüdnime autentimisel kasutatav parool. Kui &konversation; ühendust loob, saadab rakendus automaatselt serverile /msg Kirjuta hüüdnimi, mis osutab, et oled eemal. Kui annad käsu /away /away sõnum mis tahes kanalil, millega oled ühinenud antud identiteeti kasutades, asub tegevusse &kmyapplication; ja sinu hüüdnimi asendatakse i kasutades, asub tegevusse &konversation; ja sinu hüüdnimi asendatakse eemaloleku hüüdnimega. Ühtlasi saadetakse eemalolekusõnum Selle kasti märkimisel saadab &kmyapplication; automaatselt Selle kasti märkimisel saadab &konversation; automaatselt eemalolekusõnumi kõigile kanalitele, millega oled antud identiteeti See mõjutab seda, millises kodeeringus saadetakse sinu kirjutatud märgid serverile. Samuti mõjutab see sõnumite näitamist. &kmyapplication;i esmakordsel käivitamisel hangib rakendus kodeeringu operatsioonisüsteemist. Kui sul aga tekib raskusi teiste kasutajate sõnumite nägemisega, võiksid proovida kodeeringut vahetad.See mõjutab seda, millises kodeeringus saadetakse sinu kirjutatud märgid serverile. Samuti mõjutab see sõnumite näitamist. &konversation;i esmakordsel käivitamisel hangib rakendus kodeeringu operatsioonisüsteemist. Kui sul aga tekib raskusi teiste kasutajate sõnumite nägemisega, võiksid proovida kodeeringut vahetad. Ühendumisel esitavad paljud serverid sinu arvutile IDENT-päringu. Kui sinu arvutis IDENT-serverit ei tööta, saadab &kmyapplication; siinmääratud vastuse. Tühikud ei ole vastuses lubatud. Vaikimisi kasutatakse sinu eesnime.Ühendumisel esitavad paljud serverid sinu arvutile IDENT-päringu. Kui sinu arvutis IDENT-serverit ei tööta, saadab &konversation; siinmääratud vastuse. Tühikud ei ole vastuses lubatud. Vaikimisi kasutatakse sinu eesnime. Klõpsa siia tehtud muudatuste rakendamiseks. Et kõik rakenduks, tuleb ühendus serveriga katkestada ja siis uuesti ühendust võtta. Lihtsaim viis selleks on väljuda &kmyapplication;ist ja see uuesti käivitada.Klõpsa siia tehtud muudatuste rakendamiseks. Et kõik rakenduks, tuleb ühendus serveriga katkestada ja siis uuesti ühendust võtta. Lihtsaim viis selleks on väljuda &konversation;ist ja see uuesti käivitada. @@ -883,7 +874,7 @@ >Uute võrkude, serverite ja automaatselt liituvate kanalite määramine &kmyapplication;i käivitamisel avatakse aken &konversation;i käivitamisel avatakse aken Serverite nimekiri. See avatakse ka menüükäsuga Selle kasti märkimisel loob &kmyapplication; automaatselt ühenduse antud võrguga &kmyapplication;i käivitamisel.Selle kasti märkimisel loob &konversation; automaatselt ühenduse antud võrguga &konversation;i käivitamisel. See on võrgusolevate &irc; serverite nimekiri. Võrguga ühendumisel püüab &kmyapplication; ühenduda nimekirjas kõige esimesena seisva serveriga. Kui see ei õnnestu, üritatakse ühenduda nimekirjas teisel kohal seisva serveriga, seejärel kolmandaga ja nii edasi. Määrata tuleb vähemalt üks server. Serveri saab valida selle nimele klõpsates. nimekiri. Võrguga ühendumisel püüab &konversation; ühenduda nimekirjas kõige esimesena seisva serveriga. Kui see ei õnnestu, üritatakse ühenduda nimekirjas teisel kohal seisva serveriga, seejärel kolmandaga ja nii edasi. Määrata tuleb vähemalt üks server. Serveri saab valida selle nimele klõpsates. Lisavõimalus. See on kanalite nimekiri, millega liitutakse automaatselt pärast seda, kui &kmyapplication; on serveriga ühenduse loonud. Kui see tühjaks jätta, ei liituta automaatselt ühegi kanaliga.Lisavõimalus. See on kanalite nimekiri, millega liitutakse automaatselt pärast seda, kui &konversation; on serveriga ühenduse loonud. Kui see tühjaks jätta, ei liituta automaatselt ühegi kanaliga. võrgu alla erinevate &irc; võrkude kanaleid. Ürita vältida ühe ja sama serveri lisamist erinevatesse võrkudesse. Vastasel juhul ei pruugi korralikult toimida &kmyapplication;i udesse. Vastasel juhul ei pruugi korralikult toimida &konversation;i koostöö sinu aadressiraamatuga ning võrgusviibijate jälgimineSiin on näha kanalite nimekiri. Pane tähele, et kui sa ei kasuta regulaaravaldisi, näitab &kmyapplication; kõiki kanaleid, mille nimi sisaldab sisestatud filtristringi. Kanali nimi ei pea ilmtingimata algama sisestatud filtristringiga.Siin on näha kanalite nimekiri. Pane tähele, et kui sa ei kasuta regulaaravaldisi, näitab &konversation; kõiki kanaleid, mille nimi sisaldab sisestatud filtristringi. Kanali nimi ei pea ilmtingimata algama sisestatud filtristringiga. Kui asetatud tekst on pikem kui 256 sümbolit või sisaldab enam kui ühe rea, ilmub hoiatus, mis teatab, et pikad sõnumid võivad põhjustada ühenduse katkestusi ja üleujutusi. Sa võid muidugi ka sellisel juhul sõnumi teele saata, kuid see pole üldse eriti hea mõte, sest üleujutus ei meeldi kindlasti teistele kasutajatele ja pealegi võib server sinuga ühenduse katkestada. Märksa mõttekam oleks saata sõnum teele lühemate tükkidena. Paljudel kanalitel on kombeks lisada konkreetsele kasutajale mõeldud sõnumi ette ka tema hüüdnimi. &kmyapplication; pakub mugava võimaluse hüüdnimi automaatselt lõpetada. Alusta kirjutamist ja kui hüüdnime on juba paari tähe jagu kirja pandud, vajuta klahvi Paljudel kanalitel on kombeks lisada konkreetsele kasutajale mõeldud sõnumi ette ka tema hüüdnimi. &konversation; pakub mugava võimaluse hüüdnimi automaatselt lõpetada. Alusta kirjutamist ja kui hüüdnime on juba paari tähe jagu kirja pandud, vajuta klahvi Tab. &kmyapplication; hoolitseb ise selle eest, et hüüdnimi saaks korrektselt lõpetatud ja ka koolon selle järele lisatud. Lõpetamisvõimaluse kohandamiseks vali menüükäsk . &konversation; hoolitseb ise selle eest, et hüüdnimi saaks korrektselt lõpetatud ja ka koolon selle järele lisatud. Lõpetamisvõimaluse kohandamiseks vali menüükäsk Seadistused , pead privaatvestlust, avad URL püüdja&URL; püüdja või ühe või rohkem konsooli. Teisele kaardile lülitumiseks klõpsa vastava kaardi tähisele või kasuta nende vahel liikumiseks hiireratast. @@ -1471,7 +1462,7 @@ >, kanalite nimekiri või URL püüdja&URL; püüdja. @@ -1574,7 +1565,7 @@ tavaline kasutaja @@ -1583,7 +1574,7 @@ häälega kasutaja, kes võib kõnelda modereeritaval kanalil. @@ -1592,7 +1583,7 @@ kanali pooloperaator @@ -1601,7 +1592,7 @@ kanali operaator @@ -1610,7 +1601,7 @@ kanali omanik @@ -1619,7 +1610,7 @@ kanali administraator @@ -1630,7 +1621,7 @@ Kui kasutaja on eemal, näidatakse ikooni peal väikest punast risti. @@ -1759,7 +1750,7 @@ >Hüüdnimi ja klõpsa nupule Ühenda. Kui &kmyapplication; on serveriga ühenduse loonud, anna kanaliga liitumiseks käsk . Kui &konversation; on serveriga ühenduse loonud, anna kanaliga liitumiseks käsk /join RFC 2812, samuti leiab selle veebileheküljelt irchelp.org. Kui soovid näha käske, mida &kmyapplication; spetsiaalselt kohtleb, vaata osa Konversationi käsud. Kui soovid näha käske, mida &konversation; spetsiaalselt kohtleb, vaata osa &konversation;i käsud. @@ -1958,7 +1949,7 @@ >hüüdnimi privaatvestluse alustamiseks. Tavaliselt nimetatakse seda IRC-s privaatvestluse alustamiseks. Tavaliselt nimetatakse seda &irc;-s päringuks. Kõik, mida siin kirjutatakse, on näha ainult sulle ja sinu partnerile. @@ -2028,7 +2019,7 @@ >Privaatvestlused (päringud) Privaatvestlus on vestlus, mida näed ainult sina ja sinu partner. &kmyapplication; nimetab privaatvestlusi "päringuks". Selle alustamiseks kirjuta sisendreale Privaatvestlus on vestlus, mida näed ainult sina ja sinu partner. &konversation; nimetab privaatvestlusi "päringuks". Selle alustamiseks kirjuta sisendreale /query hüüdnimi on selle kasutaja hüüdnimi, kellega soovid vestlust alustada. Võimalik on ka leida kasutaja hüüdnimi hüüdnimede paneelil, klõpsata sellel &HPN;ga ja valida il, klõpsata sellel &HPNga; ja valida Ava päring. Kui keegi tahab sinuga privaatvestlust alustada, loob &kmyapplication; uue kaardi, kus osaleb siis see kasutaja ja sina. Kui sa ei soovi vestelda, sulge kaart. +>Kui keegi tahab sinuga privaatvestlust alustada, loob &konversation; uue kaardi, kus osaleb siis see kasutaja ja sina. Kui sa ei soovi vestelda, sulge kaart. @@ -2077,7 +2068,7 @@ Märguanded on toimingud, mida &kmyapplication; võtab ette teatud sündmuste toimumisel. Oletame, et &kmyapplication; töötab, kuid on minimeeritud või varjatud töölaual teiste avatud akende taha. Kui keegi soovib nüüd sinuga suhelda või mõni sinu sõber kanaliga liitub, oleks hea, kui sa sellest teada saaksid. Selleks ongi märguanded. +> on toimingud, mida &konversation; võtab ette teatud sündmuste toimumisel. Oletame, et &konversation; töötab, kuid on minimeeritud või varjatud töölaual teiste avatud akende taha. Kui keegi soovib nüüd sinuga suhelda või mõni sinu sõber kanaliga liitub, oleks hea, kui sa sellest teada saaksid. Selleks ongi märguanded. Märguannete seadistamiseks vali menüükäsk Sa võid lasta ka endale märku anda, kui keegi mainib sinu hüüdnime oma sõnumis. kasutades selleks &kmyapplication;i Sa võid lasta ka endale märku anda, kui keegi mainib sinu hüüdnime oma sõnumis. kasutades selleks &konversation;i esiletõstmise võimalust. @@ -2170,7 +2161,7 @@ >Võrgusviibijate jälgimine &kmyapplication; võib sulle teada anda, kas sinu sõbrad on parajasti &irc; võrguga ühenduses või mitte. +>&konversation; võib sulle teada anda, kas sinu sõbrad on parajasti &irc; võrguga ühenduses või mitte. Sa võid seostada hüüdnimed oma aadressiraamatu kirjetega. Sellisel juhul lisatakse aadressiraamatu kontaktile sinu sõbra hüüdnimi ja &irc; võrk, milles hüüdnimi parajasti tegutseb. &irc; võrk pannakse kirja seepärast, et hüüdnimi on konkreetses &irc; võrgus unikaalne. Üks ja sama hüüdnimi kahes erinevas &irc; võrgus ei pruugi olla sugugi üks ja sama isik, kuid üldjuhul on üks ja sama hüüdnimi ühe ja sama &irc; võrgu erinevates serverites just üks ja sama isik. @@ -2263,7 +2254,7 @@ Nende nuppudega saab siduda hüüdnime kirjega aadressiraamatus, seose eemaldada või avada aadressiraamatu, et kontakti infot muuta. Vaata ka KDE aadressiraamatu käsiraamatut&aadressiraamat;u käsiraamatut, kus saad põhjalikumalt teada, kuidas ja mida aadressiraamatuga saab ette võtta. @@ -2315,7 +2306,7 @@ >Kui soovid, et aken Jälgitavad hüüdnimed võrgus avataks automaatselt &kmyapplication;i käivitamisel, märgi ära see kastike. avataks automaatselt &konversation;i käivitamisel, märgi ära see kastike. Märkus: kui avad akna Jälgitavad hüüdnimed võrgus, kulub veidi aega, enne kui iga vajalik hüüdnimi seal näha on, sest &kmyapplication; peab kõigepealt serverilt andmed hankima. Tavaliselt oleks mõttekas aken , kulub veidi aega, enne kui iga vajalik hüüdnimi seal näha on, sest &konversation; peab kõigepealt serverilt andmed hankima. Tavaliselt oleks mõttekas aken Jälgitavad hüüdnimed võrgus üldse lahti jätta. &kmyapplication; näitab ka teadet kõigil &konversation; näitab ka teadet kõigil kanalitel, kui kasutaja, kes on sinu jälgitavate hüüdnimedeSul on võimalik määrata, kuidas näidatakse sõnumeid kanali- ja päringuaknas. Esiletõstmise isselülitamiseks vali menüükäsk Esiletõstmise sisselülitamiseks vali menüükäsk Seadistused &kmyapplication;i seadistamine&konversation;i seadistamine. Ilmub dialoog Kirjuta siia otsingumuster. Kõik saabuvad sõnumid, milles leitakse antud mustrile vastav tekst, tõstetakse esile. Kui sinu süsteemi on paigaldatud KDE regulaaravaldiste redaktor, saad seda kasutada mustrist paremal asuvale nupule klõpsates. See redaktor aitab sul vähese vaevaga luua ka väga keerulisi mustreid (KDE regulaaravaldiste redaktor kuulub paketti Kirjuta siia otsingumuster. Kõik saabuvad sõnumid, milles leitakse antud mustrile vastav tekst, tõstetakse esile. Kui sinu süsteemi on paigaldatud &kde; regulaaravaldiste redaktor, saad seda kasutada mustrist paremal asuvale nupule klõpsates. See redaktor aitab sul vähese vaevaga luua ka väga keerulisi mustreid (&kde; regulaaravaldiste redaktor kuulub paketti kdeutils). @@ -2459,11 +2450,11 @@ > Soovi korral võib &kmyapplication; mustri esinemisel ka heli esitada. Klõpsa sellele nupule esitatava helifaili valimiseks. Testinupule klõpsates saad heli kuulda.Soovi korral võib &konversation; mustri esinemisel ka heli esitada. Klõpsa sellele nupule esitatava helifaili valimiseks. Testinupule klõpsates saad heli kuulda. Kui soovid, et &kmyapplication; saadaks mustri esinemisel automaatselt vastussõnumi, kirjuta selle tekst siia. Kasuta seda võimalust siiski ettevaatlikult, sest sellised sõnumid võivad pahandada teisi &irc; kasutajaid, eriti kui neid peaks sageli saadetama. Siin võib anda ka &irc; või &kmyapplication;i käske.Kui soovid, et &konversation; saadaks mustri esinemisel automaatselt vastussõnumi, kirjuta selle tekst siia. Kasuta seda võimalust siiski ettevaatlikult, sest sellised sõnumid võivad pahandada teisi &irc; kasutajaid, eriti kui neid peaks sageli saadetama. Siin võib anda ka &irc; või &konversation;i käske. Ekraaniesitus (On Screen Display ehk &osd;) on &kmyapplication;i unikaalne omadus. &osd; sisselülitamisel ilmuvad kanali sõnumid otse ekraanile ka siis, kui &kmyapplication; on minimeeritud. Siin on näha &osd; tegevus. Sõnum ekraani ülemises vasakpoolses osas on pärit &kmyapplication;ist, mis ise aga töötab süsteemsesse salve minimeerituna. +> ehk &osd;) on &konversation;i unikaalne omadus. &osd; sisselülitamisel ilmuvad kanali sõnumid otse ekraanile ka siis, kui &konversation; on minimeeritud. Siin on näha &osd; tegevus. Sõnum ekraani ülemises vasakpoolses osas on pärit &konversation;ist, mis ise aga töötab süsteemsesse salve minimeerituna. @@ -2515,7 +2506,7 @@ > Seadistused &kmyapplication;i seadistamine&konversation;i seadistamine. Ilmub dialoog IRC värvi lisamise nupp&irc; värvi lisamise nupp IRC värvi lisamise nupule või vali menüükäsk &irc; värvi lisamise nupule või vali menüükäsk Lisamine IRC värv&irc; värv . Ilmub IRC värvivalija&irc; värvivalija. IRC värvivalija. +>&irc; värvivalija. IRC värvivalija +>&irc; värvivalija @@ -2640,7 +2631,7 @@ >. Jätka sõnumi kirjutamist sisendireal. Kui soovid uuesti värvi muuta, klõpsa taas nupule Lisa IRC värvLisa &irc; värv. Vali mõni muu värv ja klõpsa nupule OK. @@ -2940,7 +2931,7 @@ Püüad saata faili ja &kmyapplication; ootab vastuvõtmisega soostumist. +>Püüad saata faili ja &konversation; ootab vastuvõtmisega soostumist. @@ -2950,7 +2941,7 @@ &kmyapplication; püüab luua partneriga ühendust. +>&konversation; püüab luua partneriga ühendust. @@ -2960,7 +2951,7 @@ &kmyapplication; saadab faili. +>&konversation; saadab faili. @@ -2970,7 +2961,7 @@ &kmyapplication; saab faili. +>&konversation; saab faili. @@ -3032,7 +3023,7 @@ &kmyapplication; püüab leida saatja IP aadressi. +>&konversation; püüab leida saatja IP aadressi. @@ -3060,7 +3051,7 @@ >DCC olek tähisel ja kui seejärel klõpsad faili vastuvõtmisega nõustumise nuppu, algabki edastus. Märkus: &kmyapplication; on võimalik panna faile automaatselt vastu võtma ( &konversation; on võimalik panna faile automaatselt vastu võtma ( Seadistused Põimimine KDE aadressiraamatuga +>Põimimine &aadressiraamat;uga. Iga hüüdnimi on võimalik seostada KDE aadressiraamatus leiduva kontaktiga. Kui oled seda teinud, näitab &kmyapplication; Iga hüüdnimi on võimalik seostada &aadressiraamat;us leiduva kontaktiga. Kui oled seda teinud, näitab &konversation; hüüdnimede paneelil hüüdnime järel sulgudes ka tema tegelikku nime. Et seostada hüüdnimi kontaktiga KDE aadressiraamatus, klõpsa &HPN;ga Et seostada hüüdnimi kontaktiga &aadressiraamat;us, klõpsa &HPNga; peaakna hüüdnimede paneelil , mis näitab infot, mille põhjal saad kindlaks teha kasutaja tegeliku nime. Nüüd tee &HPN;ga veel kord klõps isiku hüüdnimel ja vali . Nüüd tee &HPNga; veel kord klõps isiku hüüdnimel ja vali Aadressiraamatu seosed klõpsa siia kaardi klõpsa siia akna IM aadressid avamiseks. @@ -3170,48 +3161,48 @@ IM aadresside kaart. +>IM aadresside aken. IM aadresside kaart. +>IM aadresside aken. Pane tähele, et &kmyapplication; annab ise hüüdnime Pane tähele, et &konversation; annab ise hüüdnime IRC protokolli tarbeks juba ette. Vaata ka KDE aadressiraamatu käsiraamatut, kus saad põhjalikumalt teada, kuidas ja mida aadressiraamatuga saab ette võtta. +>&aadressiraamat;u käsiraamatut, kus saad põhjalikumalt teada, kuidas ja mida &kde; aadressiraamatuga saab ette võtta. Anna hüüdnime kohta kõikvõimalik lisainfo, mida soovid ja tead, ning klõpsa nupule OK. Seejärel näitab &kmyapplication; . Seejärel näitab &konversation; hüüdnimede paneelil hüüdnime järel sulgudes ka isiku tegelikku nime. Tegelik nimi ilmub nähtavale ka siis, kui viia hiirekursor hüüdnime kohale. Kui hüüdnimi on seostatud kontaktiga KDE aadressiraamatus, võid teha Kui hüüdnimi on seostatud kontaktiga &aadressiraamat;us, võid teha hüüdnimede paneelil isiku hüüdnime peal klõpsu &HPN;ga ning muuta seostatud kontakti, seostada hüüdnime mõne muu kontaktiga või seose kustutada. +>il isiku hüüdnime peal klõpsu &HPNga; ning muuta seostatud kontakti, seostada hüüdnime mõne muu kontaktiga või seose kustutada. Kui hüüdnimi on kontaktiga seostatud, aga kasutaja muudab oma hüüdnime ajal, mil sinul &kmyapplication; töötab, muudetakse automaatselt seost ning uus hüüdnimi seostatakse kontaktiga, säilitades samas ka algse seose. +>Kui hüüdnimi on kontaktiga seostatud, aga kasutaja muudab oma hüüdnime ajal, mil sinul &konversation; töötab, muudetakse automaatselt seost ning uus hüüdnimi seostatakse kontaktiga, säilitades samas ka algse seose. Kui seostada IRC hüüdnimi kontaktiga Kopetes, näeb seda seost ka &kmyapplication;is ning vastupidi. +>Kui seostada &irc; hüüdnimi kontaktiga &kopete;s, näeb seda seost ka &konversation;is ning vastupidi. Märkus: Igal kanalil edastavad kasutajad mõnikord huvipakkuvate veebilehekülgede või muude internetiressursside &URL;-e. Kui teed sellisel &URL;-il topeltklõpsu, käivitab &kmyapplication; &URL;-iga seonduva rakenduse. Käivitatav rakendus sõltub &URL;-i &MIME; tüübist. Näiteks &URL;, mille alguses seisab edastavad kasutajad mõnikord huvipakkuvate veebilehekülgede või muude internetiressursside &URL;-e. Kui teed sellisel &URL;-il topeltklõpsu, käivitab &konversation; &URL;-iga seonduva rakenduse. Käivitatav rakendus sõltub &URL;-i &MIME; tüübist. Näiteks &URL;, mille alguses seisab http:, avab sinu vaikeveebilehitseja ja näitab veebilehekülge (sa võid ka määrata, millist veebilehitsejat kasutada). Kui &URL; sõnumite reas üle ekraani libiseb, võib olla üpris keeruline seda uuesti üles leida. &kmyapplication; suudab aga sinu eest mugavalt vajalikud &URL;-id meeles pidada. Selleks vali menüükäsk kasutada). Kui &URL; sõnumite reas üle ekraani libiseb, võib olla üpris keeruline seda uuesti üles leida. &konversation; suudab aga sinu eest mugavalt vajalikud &URL;-id meeles pidada. Selleks vali menüükäsk Aknad URL püüdja&url; püüdja . Luuakse uus kaart nimetusega URL püüdja&url; püüdja. URL püüdja. +>&url; püüdja. @@ -3265,7 +3256,7 @@ URL püüdja. +>&url; püüdja. @@ -3276,7 +3267,7 @@ See on &URL;-ide nimekiri, mis on esinenud alates &kmyapplication;i käivitamisest. Veerus See on &URL;-ide nimekiri, mis on esinenud alates &konversation;i käivitamisest. Veerus Hüüdnimi on selle isiku hüüdnimi, kes &URL;-i edastas. Kui hüüdnimi puudub, esines see serveri sõnumiteEelistatud veebilehitseja määramine Kui klõpsad &kmyapplication;is esile tõstetud &URL;-ile, avatakse see rakendusega, mida KDE vaikimisi seostab antud &URL;-i &MIME; tüübiga. Näiteks klõps &URL;-ile, mille alguses seisab Kui klõpsad &konversation;is esile tõstetud &URL;-ile, avatakse see rakendusega, mida &kde; vaikimisi seostab antud &URL;-i &MIME; tüübiga. Näiteks klõps &URL;-ile, mille alguses seisab http, avab &konqueror;i ja näitab veebilehekülge. Sa võid siiski määrata mõne muu rakenduse kui KDE vaikevalik, näiteks kasutada veebilehitsejat Mozilla. +>, avab &konqueror;i ja näitab veebilehekülge. Sa võid siiski määrata mõne muu rakenduse kui &kde; vaikevalik, näiteks kasutada veebilehitsejat Mozilla. Muu veebilehitseja määramiseks vali menüükäsk Seadistused &kmyapplication;i seadistamine&konversation;i seadistamine. Ilmub dialoog mailto: &URL;-idele. mailto: &URL;-id käivitavad alati KDE vaikimisi e-posti rakenduse. +> &URL;-id käivitavad alati &kde; vaikimisi e-posti rakenduse. Klõpsa muudatuste rakendamiseks nupule Rakenda. Et kõik rakenduks, tuleb ühendus kõigi serverite ja kanalitega katkestada ja siis uuesti ühendust võtta. Lihtsaim viis selleks on väljuda &kmyapplication;ist ja see uuesti käivitada. +>. Et kõik rakenduks, tuleb ühendus kõigi serverite ja kanalitega katkestada ja siis uuesti ühendust võtta. Lihtsaim viis selleks on väljuda &konversation;ist ja see uuesti käivitada. @@ -3479,7 +3470,7 @@ >. Seda, kuidas &kmyapplication; lisab automaatselt Seda, kuidas &konversation; lisab automaatselt meelespidamisrea, kui annad käsu Logimine Kui logimine on lubatud, peab &kmyapplication; logi iga Kui logimine on lubatud, peab &konversation; logi iga serveri, kanali ja privaatvestluse (päringu) seansi kohta. Kõik seansid salvestatakse kettal logifaili. Kui avad sama seansi uuesti, lisab &kmyapplication; uued andmed logifaili lõppu. Logi kasvab suuruseni, mille sa saad ise kindlaks määrata (vaata allpool). Suuruspiirini jõudes hakatakse vanemaid teateid kustutama. +> seansi kohta. Kõik seansid salvestatakse kettal logifaili. Kui avad sama seansi uuesti, lisab &konversation; uued andmed logifaili lõppu. Logi kasvab suuruseni, mille sa saad ise kindlaks määrata (vaata allpool). Suuruspiirini jõudes hakatakse vanemaid teateid kustutama. Seansi taasavamisel loetakse eelmise seansi lõpust umbkaudu 1024 märki ning näidatakse ekraanil. @@ -3576,7 +3567,7 @@ > Siin saab määrata logifaili maksimaalse suuruse. See hakkab kehtima pärast &kmyapplication;i taaskäivitamist. Igal logifailil võib maksimaalne suurus olla teistest erinev.Siin saab määrata logifaili maksimaalse suuruse. See hakkab kehtima pärast &konversation;i taaskäivitamist. Igal logifailil võib maksimaalne suurus olla teistest erinev. @@ -3588,7 +3579,7 @@ > Seadistused &kmyapplication;i seadistamine&konversation;i seadistamine ning ilmuvast dialoogist Käitumine Seadistused &kmyapplication;i seadistamine&konversation;i seadistamine ning ilmuvast dialoogist Käitumine &kmyapplication;i käsud +>&konversation;i käsud Allpool on toodud käsud, mida &kmyapplication; iseseisvalt tõlgendab ja mis võivad erineda standardsetest &irc; käskudest. Nurksulgudes asuv osa ei ole kohustuslik. Püstkriipsuga (|) on eraldatud käsu erinevad vormid. Käsud, mida siin ei leitud, saadetakse serverile nii, nagu need sisestatakse. +>Allpool on toodud käsud, mida &konversation; iseseisvalt tõlgendab ja mis võivad erineda standardsetest &irc; käskudest. Nurksulgudes asuv osa ei ole kohustuslik. Püstkriipsuga (|) on eraldatud käsu erinevad vormid. Käsud, mida siin ei leitud, saadetakse serverile nii, nagu need sisestatakse. @@ -3671,7 +3662,7 @@ >/me, ainult et sõnum saadetakse kõigile kanalitele ja päringutele, mis on avatud ükspuha millises serveris, millega &kmyapplication; on ühendatud., ainult et sõnum saadetakse kõigile kanalitele ja päringutele, mis on avatud ükspuha millises serveris, millega &konversation; on ühendatud. @@ -3748,7 +3739,7 @@ >el ja sulgeb vastava kanali kaardi. &kmyapplication;i kanali või päringukaardil võib anda lihtsalt käsu i kaardi. &konversation;i kanali või päringukaardil võib anda lihtsalt käsu /parthüüdnimi privaatvestluse alustamiseks. Tavaliselt nimetatakse seda IRC-s privaatvestluse alustamiseks. Tavaliselt nimetatakse seda &irc;-s päringuks. Kõik, mida siin kirjutatakse, on näha ainult sulle ja sinu partnerile. Kui siin anda tühikutega eraldatult enam kui üks hüüdnimi, avatakse päringukaart iga hüüdnime tarbeks. Iga päringukaart ja seal kõneldav on nähtav ainult sulle ja konkreetsele partnerile. @@ -3970,7 +3961,7 @@ >/msg, ainult et sõnum saadetakse kõigile kanalitele ja päringutele kõigis serverites, millega &kmyapplication; on ühendatud., ainult et sõnum saadetakse kõigile kanalitele ja päringutele kõigis serverites, millega &konversation; on ühendatud. @@ -4027,7 +4018,7 @@ >hüüdnimi IRC-Op ehk administraatori privileegid. See on võimalik ainult siis, kui hüüdnimi esineb serveri O: real. IRC operaatoritel on õigus suvaline hüüdnimi kõrvaldada ( &irc;-Op ehk administraatori privileegid. See on võimalik ainult siis, kui hüüdnimi esineb serveri O: real. &irc; operaatoritel on õigus suvaline hüüdnimi kõrvaldada (/killhüüdnimi sisestamata, püütakse IRC-Op privileegid anda sulle endale. Nii või teisiti päritakse sinu käest igal juhul IRC-Op kasutajanime ja parooli. +> sisestamata, püütakse &irc;-Op privileegid anda sulle endale. Nii või teisiti päritakse sinu käest igal juhul &irc;-Op kasutajanime ja parooli. @@ -4152,7 +4143,7 @@ >/away, ainult et käsk saadetakse kõigile serveritele, millega &kmyapplication; on ühendatud, ainult et käsk saadetakse kõigile serveritele, millega &konversation; on ühendatud. @@ -4198,7 +4189,7 @@ > Käivitab &kmyapplication;iga ühilduva skripti nimega Käivitab &konversation;iga ühilduva skripti nimega skript Saadab kanalile sinu süsteemi KDE ja Qt versiooni info. +>Saadab kanalile sinu süsteemi &kde; ja &Qt; versiooni info. Saadab kanalile sinu Linuxi versiooni info. +>Saadab kanalile sinu &Linux; versiooni info. @@ -4279,7 +4270,7 @@ > Näitab või kehtestab &kmyapplication;i seadistusi ilma seadistustedialoogi avamata. Kui parameetris esineb tühikuid, aseta see jutumärkidesse. +>Näitab või kehtestab &konversation;i seadistusi ilma seadistustedialoogi avamata. Kui parameetris esineb tühikuid, aseta see jutumärkidesse. Näited: @@ -4316,7 +4307,7 @@ > Näitab parajasti kehtivat väärtust &kmyapplication;i ikooni süsteemses salves näitamise seadistuse kohta. +>Näitab parajasti kehtivat väärtust &konversation;i ikooni süsteemses salves näitamise seadistuse kohta. Lülitab &kmyapplication;i ikooni näitamise süsteemses salves välja. +>Lülitab &konversation;i ikooni näitamise süsteemses salves välja. @@ -4457,7 +4448,7 @@ >-all andmisel üldse igasuguseid kasutajalt pärit sõnumeid (päringud, teadaanded, CTCP, DCC, erandid). andmisel üldse igasuguseid kasutajalt pärit sõnumeid (päringud, teadaanded, &CTCP;, DCC, erandid). @@ -4547,7 +4538,7 @@ > Avab uue kaardi KDE Konsooliga. Avab uue kaardi &kde; Konsooliga. @@ -4680,7 +4671,7 @@ >/msg, ainult et sõnum saadetakse CTCP protokolli kasutades. Vastus sellele oleneb teise poole kasutatavast &irc; klientprogrammist. Näiteks teise &kmyapplication;i kasutajaga vesteldes tagastab , ainult et sõnum saadetakse &CTCP; protokolli kasutades. Vastus sellele oleneb teise poole kasutatavast &irc; klientprogrammist. Näiteks teise &konversation;i kasutajaga vesteldes tagastab /ctcp Eisfuchs TIME/ctcp Eisfuchs VERSION aga Eisfuchsi arvutis töötava &kmyapplication;i versiooni. aga Eisfuchsi arvutis töötava &konversation;i versiooni. @@ -4704,7 +4695,7 @@ >Skriptide kasutamine &kmyapplication; pakub mitu vahvat skripti, mida saab käivitada otse rakendusest. Skripti käivitamiseks kanali-, päringu-, DCC või serverikaardil anna käsk kujul +>&konversation; pakub mitu vahvat skripti, mida saab käivitada otse rakendusest. Skripti käivitamiseks kanali-, päringu-, DCC või serverikaardil anna käsk kujul mis edastab kanalile sinu süsteemi KDE ja Qt versiooni. +>mis edastab kanalile sinu süsteemi &kde; ja &Qt; versiooni. uname -a. See saadab kanalile sinu Linuxi versiooni. +>. See saadab kanalile sinu &Linux; versiooni. Kõigi saadaolevate skriptide nägemiseks anna Konsoolis järgmine käsk: @@ -4770,7 +4761,7 @@ > Skripte võib ka ise kirja panna. Need on shelliskriptid ning neid võib kirjutada mis tahes shellikeeles, näiteks bash, perl või python. Kui &kmyapplication; skripti käivitab, saadetakse skriptile kõigepealt kolm parameetrit: +>Skripte võib ka ise kirja panna. Need on shelliskriptid ning neid võib kirjutada mis tahes shellikeeles, näiteks bash, perl või python. Kui &konversation; skripti käivitab, saadetakse skriptile kõigepealt kolm parameetrit: @@ -4814,7 +4805,7 @@ Pane tähele, et skript kasutab &kmyapplication;iga suhtlemisel DCOP-i. Käsk Pane tähele, et skript kasutab &konversation;iga suhtlemisel &DCOP;-i. Käsk say sunnib väljundi kanalile tavalise sõnumina saatma. Millegi näitamiseks kaardil ilma seda teistele kasutajatele saatmata kasuta käsku info &kmyapplication;i peaaken +>&konversation;i peaaken <para ><action >Lõpetab</action -> &kmyapplication;i töö.</para +> &konversation;i töö.</para ></listitem> </varlistentry> </variablelist> @@ -5104,7 +5095,7 @@ > <guimenu >Lisamine</guimenu > <guimenuitem ->IRC värv</guimenuitem +>&irc; värv</guimenuitem > </menuchoice ></term> <listitem @@ -5190,8 +5181,8 @@ ></term> <listitem ><para> - <action -></action> + <action +>Lisab aktiivse võrgu ja kanali järjehoidjatesse</action> </para ></listitem> </varlistentry> @@ -5207,7 +5198,7 @@ <listitem ><para> <action -></action> +>Avab järjehoidjate redaktori</action> </para ></listitem> </varlistentry> @@ -5223,7 +5214,7 @@ <listitem ><para> <action -></action> +>Loob uue järjehoidjate kataloogi</action> </para ></listitem> </varlistentry> @@ -5326,7 +5317,7 @@ <listitem ><para> <action ->Võimaldab muuta &kmyapplication;i kiirklahve.</action> +>Võimaldab muuta &konversation;i kiirklahve.</action> </para ></listitem> </varlistentry> @@ -5342,7 +5333,7 @@ <listitem ><para> <action ->Võimaldab lisada nuppe &kmyapplication;i tööriistaribale või neid sealt eemaldada.</action> +>Võimaldab lisada nuppe &konversation;i tööriistaribale või neid sealt eemaldada.</action> </para ></listitem> </varlistentry> @@ -5370,7 +5361,7 @@ ><guimenu >Seadistused</guimenu > <guimenuitem ->&kmyapplication;i seadistamine</guimenuitem +>&konversation;i seadistamine</guimenuitem > </menuchoice ></term> <listitem @@ -5561,14 +5552,14 @@ > <guimenu >Redigeerimine</guimenu > <guimenuitem ->URL püüdja</guimenuitem +>&url; püüdja</guimenuitem > </menuchoice ></term> <listitem ><para> <action >Avab <link linkend="urlcatcher" ->URL püüdja</link +>&url; püüdja</link > dialoogi.</action> </para ></listitem> @@ -5653,7 +5644,7 @@ <qandaentry> <question> <para ->Tahaksin &kmyapplication;i käivitades kohe ühenduda serveriga, aga mitte mõne konkreetse kanaliga. Kuidas seda teha?</para> +>Tahaksin &konversation;i käivitades kohe ühenduda serveriga, aga mitte mõne konkreetse kanaliga. Kuidas seda teha?</para> </question> <answer> <para @@ -5668,7 +5659,7 @@ <qandaentry> <question> <para ->&kmyapplication; ei saa ühegi serveriga ühendust. Milles asi?</para> +>&konversation; ei saa ühegi serveriga ühendust. Milles asi?</para> </question> <answer> <para @@ -5696,7 +5687,7 @@ </listitem> <listitem> <para ->Kui oled tulemüüri taga, kontrolli, et korrektsed pordid oleks ikka lubatud. &kmyapplication; vajab tööks järgmisi porte: </para> +>Kui oled tulemüüri taga, kontrolli, et korrektsed pordid oleks ikka lubatud. &konversation; vajab tööks järgmisi porte: </para> <para> <itemizedlist> @@ -5717,7 +5708,7 @@ </para> <para ->Rohkem infot IRC ühenduse probleemide kohta annab <ulink url="http://www.irchelp.org/irchelp/networks/connectprob.html" +>Rohkem infot &irc; ühenduse probleemide kohta annab <ulink url="http://www.irchelp.org/irchelp/networks/connectprob.html" >irchelp.org</ulink >. </para> @@ -5730,7 +5721,7 @@ <qandaentry> <question> <para ->Kui ma püüan valida käsu <menuchoice +>Kui ma püüan valida käsku <menuchoice > <guisubmenu >Aken</guisubmenu > <guisubmenu @@ -5766,9 +5757,9 @@ >Autorid ja litsents &kmyapplication; +>&konversation; Rakenduse autoriõigus 2002-2005: Konversationi meeskond. +>Rakenduse autoriõigus 2002-2005: &konversation;i meeskond. &konviwebsite; @@ -5825,7 +5816,7 @@ > Alex Zepeda &Alex.Zepeda; garbanzo@hooked.net @@ -5941,10 +5932,10 @@ &kmyapplication;i hankimine +>&konversation;i hankimine &install.intro.documentation; &kmyapplication;i uusima versiooni, sealhulgas lähtekoodi ja paigaldamise juhised leiab ka &kmyapplication;i koduleheküljelt&konversation;i uusima versiooni, sealhulgas lähtekoodi ja paigaldamise juhised leiab ka &konversation;i koduleheküljelt. @@ -5967,7 +5958,7 @@ --> &kmyapplication;i edukaks kasutamiseks on vajalik &kde; 3.2 või uuem ning internetiühendus. Varasematel &kde; versioonidel puudusid mitmed huvitavad võimalused. Kui kasutad &kmyapplication;i tulemüüri taga asudes, vaata osa &konversation;i edukaks kasutamiseks on vajalik &kde; 3.2 või uuem ning internetiühendus. Varasematel &kde; versioonidel puudusid mitmed huvitavad võimalused. Kui kasutad &konversation;i tulemüüri taga asudes, vaata osa Küsimused ja vastused. Kui soovid kasutada SSL protokolli, on vajalik OpenSSL. diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/et/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/doc/et/Makefile.in --- konversation-1.0.1/doc/et/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/doc/et/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,8 +49,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -94,7 +88,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -169,12 +165,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -188,6 +186,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -207,24 +206,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -236,19 +233,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -275,30 +271,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -359,10 +355,6 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -373,22 +365,21 @@ #>- distdir: $(DISTFILES) #>+ 1 distdir: distdir-nls $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -439,7 +430,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -455,12 +446,20 @@ #>+ 1 install-data-am: install-docs install-nls +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -479,17 +478,20 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/it/index.docbook /tmp/ZeUXpSU1gs/konversation-1.1/doc/it/index.docbook --- konversation-1.0.1/doc/it/index.docbook 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/doc/it/index.docbook 2006-10-17 00:41:55.000000000 +0100 @@ -2,10 +2,7 @@ - Konversation"> - + IRC"> - + &kmyapplication; è un client &irc; per 3.&kde;2 o successivi. Offre le seguenti funzionalità: +>&konversation; è un client &irc; per &kde; 3.2 o successivi. Offre le seguenti funzionalità: @@ -343,16 +340,16 @@ Il sito Web di &kmyapplication; è Il sito Web di &konversation; è &konviwebsite;. Si possono discutere domande e risposte su &kmyapplication; sulla mailing list degli utenti di &kmyapplication;. Si possono discutere domande e risposte su &konversation; sulla mailing list degli utenti di &konversation;. Iscrivitici per avere informazioni su nuove funzionalità, segnalare errori e così via. Per tenerti informato sulle nuove versioni, puoi entrare nella nostra mailing list degli annunci di &kmyapplication;mailing list degli annunci di &konversation;. È una mailing list a basso volume di traffico, usata solo per annunciare nuove versioni o correzioni. Gli sviluppatori di &kmyapplication; possono spesso essere contattati su &irc; a Gli sviluppatori di &konversation; possono spesso essere contattati su &irc; a irc.kde.org canale #konversation. @@ -360,7 +357,7 @@ Uso di &kmyapplication; +>Uso di &konversation; @@ -372,7 +369,7 @@ >In parole povere, &irc; è un protocollo di chat, definito da standard Internet ufficiali, e capace di rubare parecchie ore della tua vita. Per usare &irc;, devi connetterti a un server, e quindi accedere a un canale (equivalente a una chat room) o limitarti a conversazioni private. Per connetterti a un server e a un canale, apri &kmyapplication;. Apparirà la schermata Per connetterti a un server e a un canale, apri &konversation;. Apparirà la schermata Elenco dei Server. @@ -405,9 +402,9 @@ >L'elenco di Reti &irc; configurate è mostrato qui. Una rete &irc; è una raccolta di server che collaborano. Devi connetterti a solo uno dei server nella rete per essere connesso all'intera rete &irc;. Una volta connesso, &kmyapplication; entrerà automaticamente nei &irc; configurate è mostrato qui. Una rete &irc; è una raccolta di server che collaborano. Devi connetterti a solo uno dei server nella rete per essere connesso all'intera rete &irc;. Una volta connesso, &konversation; entrerà automaticamente nei Canali mostrati. Quanto &kmyapplication; viene avviato per la prima volta, la rete mostrati. Quanto &konversation; viene avviato per la prima volta, la rete FreenodeQuando fai clic sul pulsante Connetti la prima volta che apri &kmyapplication;, potresti vedere il messaggio seguente, che ti dice che la tua la prima volta che apri &konversation;, potresti vedere il messaggio seguente, che ti dice che la tua identità predefinita non è impostata correttamente. @@ -459,7 +456,7 @@ La prima volta che &kmyapplication; viene aperto, ottiene delle informazione sull'utente attuale dal sistema operativo e inserisce dei valori predefiniti per l'identità. Se le informazioni sull'utente del sistema operativo non sono complete (per esempio, se non è definito un nome completo) potresti vedere il messaggio sopra. Per correggere il problema, fai clic su La prima volta che &konversation; viene aperto, ottiene delle informazione sull'utente attuale dal sistema operativo e inserisce dei valori predefiniti per l'identità. Se le informazioni sull'utente del sistema operativo non sono complete (per esempio, se non è definito un nome completo) potresti vedere il messaggio sopra. Per correggere il problema, fai clic su OK e vedi Impostare la tua identitàLa schermata Principale mostrerà i messaggi inviati dal server al client (se &kmyapplication; non si dovesse connettere al server, vedi mostrerà i messaggi inviati dal server al client (se &konversation; non si dovesse connettere al server, vedi Domande e risposte). Quando i messaggi del server avranno finito di scorrere, &kmyapplication; entrerà nei canali scelti. +>). Quando i messaggi del server avranno finito di scorrere, &konversation; entrerà nei canali scelti. @@ -555,7 +552,7 @@ >Impostare la tua identità Prima di iniziare a usare &kmyapplication; regolarmente, dovresti impostare come sarai identificato sulla rete. +>Prima di iniziare a usare &konversation; regolarmente, dovresti impostare come sarai identificato sulla rete. Fai clic su . Siccome i nick devono essere univoci all'interno di un'intera rete &irc;, il nome che vuoi potrebbe essere respinto dal server perché qualcun altro sta già usando quel nick. Inserisci i tuoi nick alternativi nelle caselle apposite. Se la tua prima scelta è rifiutata dal server, &kmyapplication; proverà con i nick alternativi. +>Siccome i nick devono essere univoci all'interno di un'intera rete &irc;, il nome che vuoi potrebbe essere respinto dal server perché qualcun altro sta già usando quel nick. Inserisci i tuoi nick alternativi nelle caselle apposite. Se la tua prima scelta è rifiutata dal server, &konversation; proverà con i nick alternativi. Secondo la RFC 2812, la lunghezza massima di un nick è 9, ma ciò in realtà è determinato dal server. Per determinare il massimo per un server, connettiti al server. Nella linguetta Se hai registrato il tuo nick sulla rete &irc;, inserisci il servizio e la password per autenticare il tuo nick. Quando &kmyapplication; si connetterà, invierà automaticamente Se hai registrato il tuo nick sulla rete &irc;, inserisci il servizio e la password per autenticare il tuo nick. Quando &konversation; si connetterà, invierà automaticamente /msg in qualsiasi canale in cui sei entrato con questa Identità, &kmyapplication; cambierà automaticamente il tuo nick nel , &konversation; cambierà automaticamente il tuo nick nel Nick di assenza. Gli altri utenti potranno vedere che sei assente dal tuo computer. Ogni volta che effettui un comando /away in qualsiasi canale nel quale sei assente, &kmyapplication; farà tornare automaticamente il tuo nick quello originale. Se non vuoi cambiare automaticamente il tuo nick quando sei assente, lascia in bianco. in qualsiasi canale nel quale sei assente, &konversation; farà tornare automaticamente il tuo nick quello originale. Se non vuoi cambiare automaticamente il tuo nick quando sei assente, lascia in bianco. Se segni questa casella, &kmyapplication; invierà automaticamente il Se segni questa casella, &konversation; invierà automaticamente il Messaggio di assenza a tutti i canali in cui sei entrato con questa Identità Questa impostazione influenza come sono codificati i caratteri che scrivi quando vengono inviati al server. Influenza anche come sono visualizzati i messaggi. Quando apri &kmyapplication; per la prima volta, questa impostazione viene recuperata automaticamente dal sistema operativo. Se sembra che ci siano problemi a leggere i messaggi degli altri utenti, prova a cambiare questa impostazione.Questa impostazione influenza come sono codificati i caratteri che scrivi quando vengono inviati al server. Influenza anche come sono visualizzati i messaggi. Quando apri &konversation; per la prima volta, questa impostazione viene recuperata automaticamente dal sistema operativo. Se sembra che ci siano problemi a leggere i messaggi degli altri utenti, prova a cambiare questa impostazione. Quando ti connetti, molti server interrogano il tuo computer per avere una risposta IDENT. Se il tuo computer non ha un server IDENT in esecuzione, questa risposta è inviata da &kmyapplication;. Non sono ammessi spazi. Si suggerisce di usare il tuo nome.Quando ti connetti, molti server interrogano il tuo computer per avere una risposta IDENT. Se il tuo computer non ha un server IDENT in esecuzione, questa risposta è inviata da &konversation;. Non sono ammessi spazi. Si suggerisce di usare il tuo nome. Fai clic per applicare i tuoi cambiamenti. Per attivare tutti i cambiamenti, devi disconnetterti dal server e riconnetterti. Il modo più semplice per farlo è terminare &kmyapplication; e riavviare.Fai clic per applicare i tuoi cambiamenti. Per attivare tutti i cambiamenti, devi disconnetterti dal server e riconnetterti. Il modo più semplice per farlo è terminare &konversation; e riavviare. @@ -857,7 +854,7 @@ La schermata Elenco dei server appare quando apri il programma &kmyapplication;. Appare anche quando scegli appare quando apri il programma &konversation;. Appare anche quando scegli File Segna qui se vuoi che &kmyapplication; si connetta automaticamente a questa rete ogni volta che apri &kmyapplication;.Segna qui se vuoi che &konversation; si connetta automaticamente a questa rete ogni volta che apri &konversation;. Questo è un elenco di Server &irc; nella rete. Quando si connetterà alla rete, &kmyapplication; proverà a connettersi al server in alto per primo. Se non funziona, proverà con il secondo. Se non funziona, proverà con il terzo, e così via. Deve essere specificato almeno un server. Fai clic su un server per evidenziarlo. &irc; nella rete. Quando si connetterà alla rete, &konversation; proverà a connettersi al server in alto per primo. Se non funziona, proverà con il secondo. Se non funziona, proverà con il terzo, e così via. Deve essere specificato almeno un server. Fai clic su un server per evidenziarlo. Opzionale: questo è un elenco dei canali in cui &kmyapplication; entrerà automaticamente una volta connesso a un server. Puoi lasciarlo in bianco se non vuoi entrare automaticamente in nessun canale.Opzionale: questo è un elenco dei canali in cui &konversation; entrerà automaticamente una volta connesso a un server. Puoi lasciarlo in bianco se non vuoi entrare automaticamente in nessun canale. l'integrazione con la tua rubrica e il controllo dei nick collegati di &kmyapplication; non funzioneranno correttamente. +> di &konversation; non funzioneranno correttamente. @@ -1209,7 +1206,7 @@ L'elenco filtrato dei canali viene mostrato qui. Nota che se non usi espressioni regolari, &kmyapplication; elenca ogni canale che contenga la stringa di filtraggio che hai inserito. Il nome del canale non deve necessariamente iniziare con la stringa che hai inserito.L'elenco filtrato dei canali viene mostrato qui. Nota che se non usi espressioni regolari, &konversation; elenca ogni canale che contenga la stringa di filtraggio che hai inserito. Il nome del canale non deve necessariamente iniziare con la stringa che hai inserito. Se il testo incollato è più lungo di 256 caratteri, o contiene più di una riga, apparirà un messaggio di avvertimento che ti avvertirà che gli interventi di grandi dimensioni possono causare reimpostazioni della connessione e flooding. Puoi procedere con l'inserimento, ma farlo è una cattiva idea, perché il flooding darà fastidio agli altri nel canale, o potresti essere disconnesso dal server. È meglio mandare il messaggio in spezzoni più corti. Una convenzione usata in molti canali è far precedere i messaggi diretti a un utente dal suo nick. &kmyapplication; fornisce una comoda funzionalità di completamento nick. Inizia a scrivere il nick dell'utente, quindi premi Una convenzione usata in molti canali è far precedere i messaggi diretti a un utente dal suo nick. &konversation; fornisce una comoda funzionalità di completamento nick. Inizia a scrivere il nick dell'utente, quindi premi Tab. &kmyapplication; completerà il resto del nick dell'utente seguito da due punti. Per personalizzare la funzionalità di completamento, scegli . &konversation; completerà il resto del nick dell'utente seguito da due punti. Per personalizzare la funzionalità di completamento, scegli ImpostazioniNick, e fai clic sul pulsante Connetti. Quando &kmyapplication; si sarà connesso al server, inserisci il comando . Quando &konversation; si sarà connesso al server, inserisci il comando /join RFC 2812 per un elenco completo di tutti i comandi, o visita irchelp.org. Per un elenco dei comandi trattati specialmente da &kmyapplication;, vedi comandi Konversation. Per un elenco dei comandi trattati specialmente da , vedi comandi di &konversation;. @@ -1908,7 +1905,7 @@ >nick dell'utente per una conversazione privata, su IRC nota anche come dell'utente per una conversazione privata, su &irc; nota anche come query. Ogni cosa scritta qui è visibile solo a te a al tuo compagno di conversazione privata. @@ -1978,7 +1975,7 @@ >Conversazioni private (query) Una conversazione privata è una che solo tu e l'altra persona potete vedere. Le conversazioni private sono spesso chiamate "query" in irc. Per avviare una conversazione privata, scrivi Una conversazione privata è una che solo tu e l'altra persona potete vedere. Le conversazioni private sono spesso chiamate "query" in &irc;. Per avviare una conversazione privata, scrivi /query . Quando qualcun altro inizia una conversazione privata con te, &kmyapplication; crea una nuova scheda con il suo nick. Se non vuoi parlare con quella persona, chiudi la scheda. +>Quando qualcun altro inizia una conversazione privata con te, &konversation; crea una nuova scheda con il suo nick. Se non vuoi parlare con quella persona, chiudi la scheda. @@ -2027,7 +2024,7 @@ Le Notifiche sono azioni che &kmyapplication; eseguirà ogni qualvolta avviene un evento. Immagina di avere &kmyapplication; in esecuzione, ma minimizzato o nascosto dietro a alle finestre di altre applicazioni sul tuo desktop. Se qualcuno vuole comunicare con te, o un tuo amico entra in un canale, vorresti esserne avvertito. Le notifiche fanno questo. +> sono azioni che &konversation; eseguirà ogni qualvolta avviene un evento. Immagina di avere &konversation; in esecuzione, ma minimizzato o nascosto dietro a alle finestre di altre applicazioni sul tuo desktop. Se qualcuno vuole comunicare con te, o un tuo amico entra in un canale, vorresti esserne avvertito. Le notifiche fanno questo. Per configurare le notifiche, scegli Puoi anche farti avvertire quando qualcuno nomina il tuo nick in un messaggio usando la funzionalità di evidenziazione di &kmyapplication;. di &konversation;. @@ -2120,7 +2117,7 @@ >Controllare chi è collegato &kmyapplication; ti terrà informato su quando i tuoi amici sono connessi alla rete &irc;. +>&konversation; ti terrà informato su quando i tuoi amici sono connessi alla rete &irc;. Puoi associare i nick in rete a dei contatti nella tua rubrica. Quando lo fai, il nick e la rete &irc; dove il nick è collegato sono inseriti nel contatto della rubrica. La rete &irc; è registrata perché i nick sono univoci all'interno di una singola rete &irc;. Il nick in due reti &irc; diverse non è necessariamente la stessa persona, ma lo stesso nick all'interno della stessa rete &irc; è di solito la stessa persona. @@ -2213,8 +2210,8 @@ Usa questi pulsanti per associare un nick a un contatto della tua rubrica, rimuovere un'associazione, o aprire la rubrica per modificare le informazioni del contatto. Vedi il Manuale di KAddressBook per istruzioni aggiuntive sull'uso della rubrica di KDE. Manuale di &kaddressbook; per istruzioni aggiuntive sull'uso della rubrica di &kde;. @@ -2265,7 +2262,7 @@ >Se vuoi che la schermata Nick sorvegliati collegati sia visualizzata automaticamente quando apri &kmyapplication;, segna questa casella. sia visualizzata automaticamente quando apri &konversation;, segna questa casella. Nota: ogni qualvolta che mostri la schermata Nick sorvegliati collegati, ci potrebbe volere un po' prima che qualsiasi nick sia mostrato, fino a quando &kmyapplication; non avrà interrogato il server. Normalmente, lascerai la schermata , ci potrebbe volere un po' prima che qualsiasi nick sia mostrato, fino a quando &konversation; non avrà interrogato il server. Normalmente, lascerai la schermata Nick sorvegliati collegati in esecuzione. &kmyapplication; mostra inoltre un messaggio in tutti i &konversation; mostra inoltre un messaggio in tutti i canali ogni qualvolta un utente nel tuo elenco di Nick sorvegliati ImpostazioniConfigura &kmyapplication;Configura &konversation; dal menu principale. Apparirà la schermata Inserisci qui uno schema di stringa. Ogni messaggio ricevuto che corrisponda a questo schema, in qualsiasi parte, attiverà l'evidenziazione del messaggio. Se hai il programma di modifica delle espressioni regolari di KDE installato sul tuo sistema, il pulsante a destra dello schema sarà abilitato. Facci clic per visualizzare l'editor, che ti aiuterà a preparare degli schemi complessi. L'editor delle espressioni regolari di KDE fa parte del pacchetto Inserisci qui uno schema di stringa. Ogni messaggio ricevuto che corrisponda a questo schema, in qualsiasi parte, attiverà l'evidenziazione del messaggio. Se hai il programma di modifica delle espressioni regolari di &kde; installato sul tuo sistema, il pulsante a destra dello schema sarà abilitato. Facci clic per visualizzare l'editor, che ti aiuterà a preparare degli schemi complessi. L'editor delle espressioni regolari di &kde; fa parte del pacchetto kdeutils. @@ -2409,11 +2406,11 @@ > Se vuoi, &kmyapplication; riprodurrà un suono quando si troverà una corrispondenza allo schema. Fai clic sul pulsante per scegliere un file audio da riprodurre. Fai clic sul pulsante di prova per sentire il suono.Se vuoi, &konversation; riprodurrà un suono quando si troverà una corrispondenza allo schema. Fai clic sul pulsante per scegliere un file audio da riprodurre. Fai clic sul pulsante di prova per sentire il suono. Se volessi che &kmyapplication; inviasse automaticamente un messaggio di risposta quando viene trovata una corrispondenza allo schema, inserisci qui il messaggio. Usa questa funzionalità con prudenza, perché potresti infastidire gli utenti &irc; con troppi messaggi. Qui puoi anche inserire comandi &irc; o di &kmyapplication;.Se volessi che &konversation; inviasse automaticamente un messaggio di risposta quando viene trovata una corrispondenza allo schema, inserisci qui il messaggio. Usa questa funzionalità con prudenza, perché potresti infastidire gli utenti &irc; con troppi messaggi. Qui puoi anche inserire comandi &irc; o di &konversation;. Vista a schermo o On Screen Display (&osd;) è una funzionalità unica di &kmyapplication;. Con l'&osd; attivato, i messaggi dei canali appariranno sul tuo desktop, anche se &kmyapplication; è minimizzato. Ecco un esempio dell'&osd; in azione. Il messaggio nella parte in alto a sinistra dello schermo viene da &kmyapplication;, che è in esecuzione minimizzata nel vassoio di sistema. +> (&osd;) è una funzionalità unica di &konversation;. Con l'&osd; attivato, i messaggi dei canali appariranno sul tuo desktop, anche se &konversation; è minimizzato. Ecco un esempio dell'&osd; in azione. Il messaggio nella parte in alto a sinistra dello schermo viene da &konversation;, che è in esecuzione minimizzata nel vassoio di sistema. @@ -2467,7 +2464,7 @@ >ImpostazioniConfigura &kmyapplication;Configura &konversation; sul menu principale. Apparirà la schermata Pulsante Inserisci colore IRCPulsante Inserisci colore &irc; pulsante Inserisci colore IRC o scegli pulsante Inserisci colore &irc; o scegli InserisciColore IRCColore &irc; nel menu principale. Apparirà la schermata Scelta Colori IRCScelta Colori &irc;. La schermata Scelta Colori IRC. +>La schermata Scelta Colori &irc;. La schermata Scelta Colori IRC +>La schermata Scelta Colori &irc; @@ -2592,7 +2589,7 @@ >. Continua a scrivere il tuo messaggio nella Linea di input. Per cambiare ancora il tuo colore, fai clic sul pulsante Inserisci colore IRCInserisci colore &irc;. Scegli un colore diverso e fai clic su OK. @@ -2892,7 +2889,7 @@ Stai cercando di inviare un file al destinatario. &kmyapplication; sta aspettando che il destinatario accetti il file. +>Stai cercando di inviare un file al destinatario. &konversation; sta aspettando che il destinatario accetti il file. @@ -2902,7 +2899,7 @@ &kmyapplication; sta cercando di stabilire una connessione con l'altro terminale. +>&konversation; sta cercando di stabilire una connessione con l'altro terminale. @@ -2912,7 +2909,7 @@ &kmyapplication; sta inviando il file all'altro terminale. +>&konversation; sta inviando il file all'altro terminale. @@ -2922,7 +2919,7 @@ &kmyapplication; sta ricevendo il file dall'altro terminale. +>&konversation; sta ricevendo il file dall'altro terminale. @@ -2984,7 +2981,7 @@ &kmyapplication; sta cercando di ottenere il numero IP del mittente. +>&konversation; sta cercando di ottenere il numero IP del mittente. @@ -3012,7 +3009,7 @@ >Stato DCC per mostrarla. Fai clic sul file per selezionarlo, quindi fai clic su questo pulsante per accettare il file e il trasferimento avrà inizio. Nota: Puoi configurare &kmyapplication; per accettare automaticamente invii da altre persone scegliendo Puoi configurare &konversation; per accettare automaticamente invii da altre persone scegliendo Impostazioni Integrare con la rubrica di KDE +>Integrazione con &kaddressbook; Puoi associare qualsiasi nick con un contatto nella rubrica di KDE. Una volta che l'hai fatto, &kmyapplication; mostrerà il vero nome del contatto tra parentesi dopo il nick, nel Puoi associare qualsiasi nick con un contatto di &kaddressbook;. Una volta che l'hai fatto, &konversation; mostrerà il vero nome del contatto tra parentesi dopo il nick, nel Pannello dei nick. Per associare un nick con un contatto nella rubrica di KDE, fai clic con il &RMB; sul nick della persona nel Per associare un nick con un contatto di &kaddressbook;, fai clic con il &RMB; sul nick della persona nel Pannello dei nick della schermata Principale Nota che &kmyapplication; ti inserisce il nick con il protocollo Nota che &konversation; ti inserisce il nick con il protocollo IRC. Vedi il Manuale di KAddressBook per istruzioni aggiuntive sull'uso della rubrica di KDE. +>Manuale di &kaddressbook; per istruzioni aggiuntive sull'uso della rubrica di &kde;. Inserisci qualsiasi informazione aggiuntiva sul nick che sai e fai clic su OK. Il nome vero della persona apparirà tra parentesi di fianco al nick nel Pannello dei nick di &kmyapplication;. Il nome vero apparirà anche quando il mouse passerà sopra il nick. +> di &konversation;. Il nome vero apparirà anche quando il mouse passerà sopra il nick. Una volta che un nick è stato associato a un contatto nella rubrica di KDE, puoi fare clic con il &RMB; sul nick della persona nel Una volta che un nick è stato associato a un contatto di &kaddressbook;, puoi fare clic con il &RMB; sul nick della persona nel Pannello dei nick e modificare il contatto associato, associare in nick a un contatto diverso, o eliminare l'associazione. Se hai associato un nick con un contatto e l'utente cambia il suo nick mentre stai usando &kmyapplication;, &kmyapplication; assocerà automaticamente il nuovo nick con il contatto, mantenendo anche l'associazione originale. +>Se hai associato un nick con un contatto e l'utente cambia il suo nick mentre stai usando &konversation;, &konversation; assocerà automaticamente il nuovo nick con il contatto, mantenendo anche l'associazione originale. Se associ un nick IRC con un contatto in Kopete, l'associazione apparirà anche in &kmyapplication; e viceversa. +>Se associ un nick &irc; con un contatto in &kopete;, l'associazione apparirà anche in &konversation; e viceversa. Nota: è possibile evidenziare più di un nick nel In qualsiasi canale, gli utenti a volte pubblicano gli &URL; di siti interessanti o altre risorse del Web. Puoi fare doppio clic su uno qualsiasi di questi &URL;, e &kmyapplication; avvierà l'applicazione associata con l'&URL;. L'applicazione dipende dal tipo &MIME; dell'&URL;. Per esempio un &URL; che cominci per , gli utenti a volte pubblicano gli &URL; di siti interessanti o altre risorse del Web. Puoi fare doppio clic su uno qualsiasi di questi &URL;, e &konversation; avvierà l'applicazione associata con l'&URL;. L'applicazione dipende dal tipo &MIME; dell'&URL;. Per esempio un &URL; che cominci per http: attiverà il tuo browser Web predefinito di KDE e mostrerà la pagina web (Puoi anche specificare quale attiverà il tuo browser Web predefinito di &kde; e mostrerà la pagina web (Puoi anche specificare quale browser Web usare). Se l'&URL; scorre oltre la schermata, potresti aver problemi a ritrovarlo. &kmyapplication; può tenerti un comodo elenco di tutti gli &URL;. Per attivare questa funzionalità, scegli usare). Se l'&URL; scorre oltre la schermata, potresti aver problemi a ritrovarlo. &konversation; può tenerti un comodo elenco di tutti gli &URL;. Per attivare questa funzionalità, scegli FinestreRaccoglitore di URLRaccoglitore di &url; nel menu principale. Sarà creata una nuova scheda chiamata Raccoglitore di URLRaccoglitore di &url;. La scheda Raccoglitore di URL. +>La scheda Raccoglitore di &url;. @@ -3217,7 +3214,7 @@ La scheda Raccoglitore di URL. +>La scheda Raccoglitore di &url;. @@ -3228,9 +3225,9 @@ Questo è l'elenco di &URL; visti da quando hai avviato &kmyapplication;. La colonna Questo è l'elenco di &URL; visti da quando hai avviato &konversation;. La colonna Nick è il nick della persona che ha pubblicato la &nickname;. Se il nick è vuoto, la URL è apparsa in una scheda è il nick della persona che ha pubblicato la &nickname;. Se il nick è vuoto, la &url; è apparsa in una scheda Messaggi del server (gli &URL; che appaiono in messaggi di entrata e di uscita non sono elencati). Fai clic su un &URL; per selezionarlo. @@ -3276,16 +3273,16 @@ >Impostare il tuo browser Web preferito Quando fai clic su un &URL; evidenziato da qualsiasi parte in &kmyapplication;, verrà avviata l'applicazione predefinita di KDE associata al tipo &MIME; dell'&URL;. Per esempio, quando si fa clic su un &URL; che comincia per Quando fai clic su un &URL; evidenziato da qualsiasi parte in &konversation;, verrà avviata l'applicazione predefinita di &kde; associata al tipo &MIME; dell'&URL;. Per esempio, quando si fa clic su un &URL; che comincia per http, viene avviato &konqueror; per mostrare la pagina Web. Puoi specificare un'applicazione diversa da quella predefinita di KDE. Per esempio, puoi usare Mozilla. +>, viene avviato &konqueror; per mostrare la pagina Web. Puoi specificare un'applicazione diversa da quella predefinita di &kde;. Per esempio, puoi usare Mozilla. Per scegliere un browser diverso, scegli ImpostazioniConfigura &kmyapplication;Configura &konversation; sul menu principale. Apparirà la schermata mailto:. mailto: avvierà sempre il programma di posta predefinito di KDE. +> avvierà sempre il programma di posta predefinito di &kde;. Fai clic su Applica per salvare i tuoi cambiamenti. Devi riconnetterti a ciascun server e canale per rendere effettivi i cambiamenti. Il modo più semplice di farlo è terminare e riavviare &kmyapplication;. +> per salvare i tuoi cambiamenti. Devi riconnetterti a ciascun server e canale per rendere effettivi i cambiamenti. Il modo più semplice di farlo è terminare e riavviare &konversation;. @@ -3431,7 +3428,7 @@ >. Per far inserire a &kmyapplication; un Per far inserire a &konversation; un Segnariga ogni volta che esegui un comando Log Se il log è abilitato, &kmyapplication; manterrà un registro di ogni sessione dei Se il log è abilitato, &konversation; manterrà un registro di ogni sessione dei Server, Canale, e Conversazione privata. Ogni sessione è conservata su disco in un file di log. Quando riapri la stessa sessione, &kmyapplication; aggiunge al log. Il log cresce fino a un limite che puoi impostare (vedi sotto). Quando il limite è raggiunto, vengono cancellati i messaggi più vecchi. +>. Ogni sessione è conservata su disco in un file di log. Quando riapri la stessa sessione, &konversation; aggiunge al log. Il log cresce fino a un limite che puoi impostare (vedi sotto). Quando il limite è raggiunto, vengono cancellati i messaggi più vecchi. Ogni volta che riapri una sessione, circa gli ultimi 1024 caratteri della sessione precedente sono letti dalla coda del log e visualizzati sullo schermo. @@ -3528,7 +3525,7 @@ > Usa questa casella per impostare la dimensione massima del file di log. Questa impostazione non avrà effetto finché non riavvierai &kmyapplication;. Ogni file di log può avere un'impostazione diversa.Usa questa casella per impostare la dimensione massima del file di log. Questa impostazione non avrà effetto finché non riavvierai &konversation;. Ogni file di log può avere un'impostazione diversa. @@ -3540,7 +3537,7 @@ >Impostazioni Configura &kmyapplication;Configura &konversation; nel menu principale, quindi espandendo ComportamentoImpostazioni Configura KonversationConfigura &konversation; nel menu principale, quindi espandendo Comportamento Comandi di &kmyapplication; +>Comandi di &konversation; I comandi seguenti sono interpretati da &kmyapplication; e potrebbero essere diversi dai comandi &irc; standard. Gli elementi tra parentesi quadre sono opzionali. Gli elementi separati da barre (|) sono forme alternative del comando. I comandi non elencati qui sono inviati al server come sono stati inseriti. +>I comandi seguenti sono interpretati da &konversation; e potrebbero essere diversi dai comandi &irc; standard. Gli elementi tra parentesi quadre sono opzionali. Gli elementi separati da barre (|) sono forme alternative del comando. I comandi non elencati qui sono inviati al server come sono stati inseriti. @@ -3623,7 +3620,7 @@ >/me sopra, tranne che il messaggio è inviato a tutti i canali e conversazioni private che sono aperte su tutti i server con cui sei connesso con &kmyapplication;. sopra, tranne che il messaggio è inviato a tutti i canali e conversazioni private che sono aperte su tutti i server con cui sei connesso con &konversation;. @@ -3700,7 +3697,7 @@ > e chiude la scheda canale corrispondente. All'interno di un canale di &kmyapplication; o di una scheda di conversazione privata, puoi semplicemente inserire corrispondente. All'interno di un canale di &konversation; o di una scheda di conversazione privata, puoi semplicemente inserire /partnick dell'utente per una conversazione privata, comunemente nota su IRC anche come dell'utente per una conversazione privata, comunemente nota su &irc; anche come query. Tutto ciò che è scritto qui è visibile solo a te a al tuo compagno di conversazione privata. Puoi inserire più di nick separati da spazi e una scheda di conversazione privata sarà aperta per ogni nick. Ognuna di queste schede saranno private tra te e il compagno di conversazione. @@ -3918,7 +3915,7 @@ >/msg sopra, eccetto che il messaggio è inviato a tutti i canali e conversazioni private che hai aperto su tutti i server su cui sei connesso in &kmyapplication;. sopra, eccetto che il messaggio è inviato a tutti i canali e conversazioni private che hai aperto su tutti i server su cui sei connesso in &konversation;. @@ -3975,7 +3972,7 @@ >nick privilegi di operatore IRC (amministratore). Funziona soltanto se il nick è elencato nella riga O: del server. Gli operatori IRC hanno il privilegio di eseguire privilegi di operatore &irc; (amministratore). Funziona soltanto se il nick è elencato nella riga O: del server. Gli operatori &irc; hanno il privilegio di eseguire /killnick non è inserito, cerca di concederti i privilegi di operatore IRC. In ogni caso ti sarà chiesto il tuo nome utente da operatore IRC e la password. +> non è inserito, cerca di concederti i privilegi di operatore &irc;. In ogni caso ti sarà chiesto il tuo nome utente da operatore &irc; e la password. @@ -4100,7 +4097,7 @@ >/away sopra, eccetto che il comando è inviato a tutti i server con cui sei connesso in &kmyapplication;. sopra, eccetto che il comando è inviato a tutti i server con cui sei connesso in &konversation;. @@ -4146,7 +4143,7 @@ > Esegue lo script di shell compatibile di &kmyapplication; chiamato Esegue lo script di shell compatibile di &konversation; chiamato script Invia i numeri di versione di KDE e Qt del tuo sistema al canale. +>Invia i numeri di versione di &kde; e &Qt; del tuo sistema al canale. Invia la tua stringa di versione di Linux al canale. +>Invia la tua stringa di versione di &Linux; al canale. @@ -4227,7 +4224,7 @@ > Mostra o imposta le impostazioni di &kmyapplication; senza usare la schermata Impostazioni. Se un parametro contiene spazi, mettilo tra virgolette. +>Mostra o imposta le impostazioni di &konversation; senza usare la schermata Impostazioni. Se un parametro contiene spazi, mettilo tra virgolette. Esempi: @@ -4264,7 +4261,7 @@ > Mostra il valore attuale dell'impostazione per mostrare l'icona di &kmyapplication; nel vassoio di sistema. +>Mostra il valore attuale dell'impostazione per mostrare l'icona di &konversation; nel vassoio di sistema. Togli l'icona di &kmyapplication; dal vassoio di sistema. +>Togli l'icona di &konversation; dal vassoio di sistema. @@ -4405,7 +4402,7 @@ >-all, tutti i tipi di messaggio (conversazioni private, CTCP, DCC ed eccezioni) dall'utente sono ignorati come i messaggi sul canale. , tutti i tipi di messaggio (conversazioni private, &CTCP;, DCC ed eccezioni) dall'utente sono ignorati come i messaggi sul canale. @@ -4495,7 +4492,7 @@ > Apre una nuova scheda con la Konsole di KDE. Apre una nuova scheda con la &konsole; di &kde;. @@ -4628,7 +4625,7 @@ >/msg sopra, eccetto che il messaggio è inviato usando il protocollo CTCP. La risposta dall'altro capo dipende dal programma client &irc; che l'utente sta usando. Per esempio, quando stai conversando con un altro utente di &kmyapplication;, sopra, eccetto che il messaggio è inviato usando il protocollo &CTCP;. La risposta dall'altro capo dipende dal programma client &irc; che l'utente sta usando. Per esempio, quando stai conversando con un altro utente di &konversation;, /ctcp Eisfuchs TIME/ctcp Eisfuchs VERSION restituirà il numero di versione di &kmyapplication; sul computer di Eisfuchs. restituirà il numero di versione di &konversation; sul computer di Eisfuchs. @@ -4652,7 +4649,7 @@ >Scripting &kmyapplication; ha alcuni script utili che puoi eseguire dal programma. Per eseguire uno script in una scheda di canale, conversazione privata, DCC o server, scrivi un comando nella forma +>&konversation; ha alcuni script utili che puoi eseguire dal programma. Per eseguire uno script in una scheda di canale, conversazione privata, DCC o server, scrivi un comando nella forma per inviare i tuoi numeri di versione di KDE e Qt al canale. +>per inviare i tuoi numeri di versione di &kde; e &Qt; al canale. uname -a. Invia la tua stringa della versione di Linux al canale. +>. Invia la tua stringa della versione di &Linux; al canale. Per avere un elenco di tutti gli script disponibili, scrivi il comando seguente in uno schermo di Konsole. +>Per avere un elenco di tutti gli script disponibili, scrivi il comando seguente in uno schermo di &konsole;. Puoi scrivere i tuoi script. Gli script sono script di shell e possono essere scritti in qualsiasi linguaggio di shell, come bash, perl, o python. Quando &kmyapplication; esegue uno script, i primi tre parametri inviati allo script sono: +>Puoi scrivere i tuoi script. Gli script sono script di shell e possono essere scritti in qualsiasi linguaggio di shell, come bash, perl, o python. Quando &konversation; esegue uno script, i primi tre parametri inviati allo script sono: @@ -4762,7 +4759,7 @@ Nota che lo script usa DCOP per comunicare con &kmyapplication;. Il comando Nota che lo script usa &DCOP; per comunicare con &konversation;. Il comando say fa inviare l'output al canale come messaggio normale. Per mostrare qualcosa nella scheda senza inviarla ad altri utenti, usa piuttosto info La finestra principale di &kmyapplication; +>La finestra principale di &konversation; <para ><action >Esce</action -> da &kmyapplication;</para +> da &konversation;</para ></listitem> </varlistentry> </variablelist> @@ -5052,7 +5049,7 @@ > <guimenu >Inserisci</guimenu > <guimenuitem ->Colore IRC</guimenuitem +>Colore &irc;</guimenuitem > </menuchoice ></term> <listitem @@ -5274,7 +5271,7 @@ <listitem ><para> <action ->Ti permette di cambiare le scorciatoie da tastiera di &kmyapplication;.</action> +>Ti permette di cambiare le scorciatoie da tastiera di &konversation;.</action> </para ></listitem> </varlistentry> @@ -5290,7 +5287,7 @@ <listitem ><para> <action ->Ti permette di aggiungere o rimuovere pulsanti dalla barra degli strumenti di &kmyapplication;.</action> +>Ti permette di aggiungere o rimuovere pulsanti dalla barra degli strumenti di &konversation;.</action> </para ></listitem> </varlistentry> @@ -5318,7 +5315,7 @@ ><guimenu >Impostazioni</guimenu ><guimenuitem ->Configura &kmyapplication;</guimenuitem +>Configura &konversation;</guimenuitem > </menuchoice ></term> <listitem @@ -5509,14 +5506,14 @@ > <guimenu >Finestra</guimenu > <guimenuitem ->Raccogliotore di URL</guimenuitem +>Raccogliotore di &url;</guimenuitem > </menuchoice ></term> <listitem ><para> <action >Mostra la schermata <link linkend="urlcatcher" ->Raccoglitore di URL</link +>Raccoglitore di &url;</link >.</action> </para ></listitem> @@ -5601,7 +5598,7 @@ <qandaentry> <question> <para ->Quando avvio &kmyapplication;, vorrei connettermi a un server senza entrare in nessun canale. Come si fa?</para> +>Quando avvio &konversation;, vorrei connettermi a un server senza entrare in nessun canale. Come si fa?</para> </question> <answer> <para @@ -5616,7 +5613,7 @@ <qandaentry> <question> <para ->&kmyapplication; non vuole connettersi a nessun server. Cosa c'è che non va?</para> +>&konversation; non vuole connettersi a nessun server. Cosa c'è che non va?</para> </question> <answer> <para @@ -5644,7 +5641,7 @@ </listitem> <listitem> <para ->Se sei dietro un firewall, assicurati che le porte giuste siano attivate. &kmyapplication; ha bisogno delle seguenti porte attivate: </para> +>Se sei dietro un firewall, assicurati che le porte giuste siano attivate. &konversation; ha bisogno delle seguenti porte attivate: </para> <para> <itemizedlist> @@ -5665,7 +5662,7 @@ </para> <para ->Per maggiori informazioni sui problemi di connessione in IRC, riferisciti a <ulink url="http://www.irchelp.org/irchelp/networks/connectprob.html" +>Per maggiori informazioni sui problemi di connessione in &irc;, riferisciti a <ulink url="http://www.irchelp.org/irchelp/networks/connectprob.html" >irchelp.org</ulink >. </para> @@ -5714,9 +5711,9 @@ >Riconoscimenti e licenza &kmyapplication; +>&konversation; Copyright del programma 2002-2005 della squadra di Konversation. +>Copyright del programma 2002-2005 della squadra di &konversation;. &konviwebsite; @@ -5773,7 +5770,7 @@ > Alex Zepeda &Alex.Zepeda; garbanzo@hooked.net @@ -5889,10 +5886,10 @@ Come ottenere &kmyapplication; +>Come ottenere &konversation; &install.intro.documentation; Le ultime versioni di &kmyapplication;, inclusi il codice sorgente e istruzioni di compilazione, possono essere ottenute dalla pagina Web di &kmyapplication;Le ultime versioni di &konversation;, inclusi il codice sorgente e istruzioni di compilazione, possono essere ottenute dalla pagina Web di &konversation;. @@ -5915,7 +5912,7 @@ --> Per usare &kmyapplication;, hai bisogno di &kde; 3.2 o successivo, e di una connessione di rete. Su versioni precedenti di &kde; alcune funzionalità potrebbero mancare. Se userai &kmyapplication; da dietro un firewall, vedi Per usare &konversation;, hai bisogno di &kde; 3.2 o successivo, e di una connessione di rete. Su versioni precedenti di &kde; alcune funzionalità potrebbero mancare. Se userai &konversation; da dietro un firewall, vedi Domande e risposte. Se vuoi usare un protocollo SSL, potresti aver bisogno di OpenSSL. diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/it/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/doc/it/Makefile.in --- konversation-1.0.1/doc/it/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/doc/it/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,8 +49,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -94,7 +88,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -169,12 +165,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -188,6 +186,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -207,24 +206,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -236,19 +233,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -275,30 +271,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -359,10 +355,6 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -373,22 +365,21 @@ #>- distdir: $(DISTFILES) #>+ 1 distdir: distdir-nls $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -439,7 +430,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -455,12 +446,20 @@ #>+ 1 install-data-am: install-docs install-nls +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -479,27 +478,30 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: #>+ 2 -KDE_DIST=identities_gen_co.png channellist_screen_co.png notification_screen_co.png identities_away_co.png quickbuttons_screen.png quickconnect_screen.png notifylist_screen_co.png index.docbook colorchooser_screen.png nicksonline_co.png identities_adv_co.png Makefile.in osd_demo.png osd_screen_co.png channel_screen_tour_co.png checkidentities.png first_channel_co.png addserver_co.png serverlist_co.png addnetwork_co.png Makefile.am first_serverlist_co.png addchannel.png +KDE_DIST=identities_gen_co.png channellist_screen_co.png identities_away_co.png notification_screen_co.png quickbuttons_screen.png quickconnect_screen.png notifylist_screen_co.png index.docbook nicksonline_co.png colorchooser_screen.png identities_adv_co.png Makefile.in osd_screen_co.png osd_demo.png channel_screen_tour_co.png checkidentities.png first_channel_co.png addserver_co.png serverlist_co.png addnetwork_co.png Makefile.am first_serverlist_co.png addchannel.png #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) addchannel.png identities_away_co.png notification_screen_co.png channel_screen_tour_co.png channellist_screen_co.png notifylist_screen_co.png addnetwork_co.png first_serverlist_co.png nicksonline_co.png osd_screen_co.png osd_demo.png colorchooser_screen.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png quickbuttons_screen.png identities_gen_co.png index.docbook first_channel_co.png addserver_co.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook addnetwork_co.png notifylist_screen_co.png quickbuttons_screen.png addchannel.png notification_screen_co.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png identities_adv_co.png colorchooser_screen.png first_serverlist_co.png identities_gen_co.png addserver_co.png identities_away_co.png osd_demo.png nicksonline_co.png osd_screen_co.png checkidentities.png channellist_screen_co.png serverlist_co.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -526,20 +528,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation - @for base in addchannel.png identities_away_co.png notification_screen_co.png channel_screen_tour_co.png channellist_screen_co.png notifylist_screen_co.png addnetwork_co.png first_serverlist_co.png nicksonline_co.png osd_screen_co.png osd_demo.png colorchooser_screen.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png quickbuttons_screen.png identities_gen_co.png index.docbook first_channel_co.png addserver_co.png ; do \ + @for base in index.docbook addnetwork_co.png notifylist_screen_co.png quickbuttons_screen.png addchannel.png notification_screen_co.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png identities_adv_co.png colorchooser_screen.png first_serverlist_co.png identities_gen_co.png addserver_co.png identities_away_co.png osd_demo.png nicksonline_co.png osd_screen_co.png checkidentities.png channellist_screen_co.png serverlist_co.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ done uninstall-nls: - for base in addchannel.png identities_away_co.png notification_screen_co.png channel_screen_tour_co.png channellist_screen_co.png notifylist_screen_co.png addnetwork_co.png first_serverlist_co.png nicksonline_co.png osd_screen_co.png osd_demo.png colorchooser_screen.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png quickbuttons_screen.png identities_gen_co.png index.docbook first_channel_co.png addserver_co.png ; do \ + for base in index.docbook addnetwork_co.png notifylist_screen_co.png quickbuttons_screen.png addchannel.png notification_screen_co.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png identities_adv_co.png colorchooser_screen.png first_serverlist_co.png identities_gen_co.png addserver_co.png identities_away_co.png osd_demo.png nicksonline_co.png osd_screen_co.png checkidentities.png channellist_screen_co.png serverlist_co.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ done #>+ 5 distdir-nls: - for file in addchannel.png identities_away_co.png notification_screen_co.png channel_screen_tour_co.png channellist_screen_co.png notifylist_screen_co.png addnetwork_co.png first_serverlist_co.png nicksonline_co.png osd_screen_co.png osd_demo.png colorchooser_screen.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png quickbuttons_screen.png identities_gen_co.png index.docbook first_channel_co.png addserver_co.png ; do \ + for file in index.docbook addnetwork_co.png notifylist_screen_co.png quickbuttons_screen.png addchannel.png notification_screen_co.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png identities_adv_co.png colorchooser_screen.png first_serverlist_co.png identities_gen_co.png addserver_co.png identities_away_co.png osd_demo.png nicksonline_co.png osd_screen_co.png checkidentities.png channellist_screen_co.png serverlist_co.png ; do \ cp $(srcdir)/$$file $(distdir); \ done diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/konversation/index.docbook /tmp/ZeUXpSU1gs/konversation-1.1/doc/konversation/index.docbook --- konversation-1.0.1/doc/konversation/index.docbook 2006-10-06 17:44:15.000000000 +0100 +++ konversation-1.1/doc/konversation/index.docbook 2008-08-06 16:56:29.000000000 +0100 @@ -2,7 +2,6 @@ - Konversation"> IRC"> diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/konversation/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/doc/konversation/Makefile.in --- konversation-1.0.1/doc/konversation/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/doc/konversation/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,15 +16,11 @@ @SET_MAKE@ ####### kdevelop will overwrite this part!!! (begin)########## -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,17 +49,21 @@ DIST_SOURCES = #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ #>- html-recursive info-recursive install-data-recursive \ -#>- install-exec-recursive install-info-recursive \ -#>- install-recursive installcheck-recursive installdirs-recursive \ -#>- pdf-recursive ps-recursive uninstall-info-recursive \ -#>- uninstall-recursive -#>+ 6 +#>- install-dvi-recursive install-exec-recursive \ +#>- install-html-recursive install-info-recursive \ +#>- install-pdf-recursive install-ps-recursive install-recursive \ +#>- installcheck-recursive installdirs-recursive pdf-recursive \ +#>- ps-recursive uninstall-recursive +#>+ 7 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive nmcheck-recursive bcheck-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -71,8 +71,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -112,7 +110,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -187,12 +187,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -206,6 +208,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -225,24 +228,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -254,19 +255,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -293,30 +293,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -381,10 +381,6 @@ clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -416,8 +412,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -461,8 +456,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -487,8 +482,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -498,13 +493,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -520,22 +514,21 @@ #>- distdir: $(DISTFILES) #>+ 1 distdir: distdir-nls $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -549,7 +542,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -557,6 +550,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -602,8 +597,7 @@ distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -619,12 +613,20 @@ #>+ 1 install-data-am: install-docs install-nls +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -643,32 +645,34 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: #>+ 2 -KDE_DIST=identities_gen_co.png kaddressbook.png channellist_screen_co.png notification_screen_co.png identities_away_co.png quickbuttons_screen.png quickconnect_screen.png led_yellow_off.png led_red_on.png irc_owner.png irc_away.png notifylist_screen_co.png index.docbook configure.png nickthemes_screen_co.png irc_halfop.png serverlist_screen_co.png kimproxy_create_screen_co.png irc_normal.png led_green_off.png webbrowser_screen_co.png colorchooser_screen.png nicksonline_co.png highlighting_screen_co.png prefs_identity_screen_co.png logviewer_co.png irc_voice.png dccstatus_screen_co.png identities_adv_co.png led_blue_off.png Makefile.in urlcatcher_screen_co.png irc_op.png osd_demo.png osd_screen_co.png channel_screen_tour_co.png kimproxy_create_screen2.png checkidentities.png irc_admin.png led_blue_on.png first_channel_co.png colorize.png editserver_screen_co.png channel_screen_co.png led_yellow_on.png addserver_co.png led_red_off.png serverlist_co.png addnetwork_co.png led_green_on.png Makefile.am first_serverlist_co.png addchannel.png +KDE_DIST=identities_gen_co.png kaddressbook.png channellist_screen_co.png identities_away_co.png notification_screen_co.png quickbuttons_screen.png led_red_on.png quickconnect_screen.png led_yellow_off.png irc_away.png irc_owner.png notifylist_screen_co.png index.docbook configure.png nickthemes_screen_co.png irc_halfop.png kimproxy_create_screen_co.png serverlist_screen_co.png irc_normal.png led_green_off.png webbrowser_screen_co.png nicksonline_co.png colorchooser_screen.png prefs_identity_screen_co.png highlighting_screen_co.png logviewer_co.png irc_voice.png led_blue_off.png dccstatus_screen_co.png identities_adv_co.png Makefile.in urlcatcher_screen_co.png irc_op.png osd_screen_co.png osd_demo.png channel_screen_tour_co.png kimproxy_create_screen2.png checkidentities.png led_blue_on.png irc_admin.png first_channel_co.png editserver_screen_co.png colorize.png channel_screen_co.png led_yellow_on.png addserver_co.png led_red_off.png serverlist_co.png addnetwork_co.png led_green_on.png Makefile.am first_serverlist_co.png addchannel.png #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) addchannel.png kimproxy_create_screen2.png identities_away_co.png kaddressbook.png notification_screen_co.png urlcatcher_screen_co.png led_blue_on.png channel_screen_tour_co.png channellist_screen_co.png irc_voice.png led_yellow_on.png irc_normal.png irc_admin.png irc_halfop.png prefs_identity_screen_co.png irc_op.png kimproxy_create_screen_co.png notifylist_screen_co.png led_green_on.png logviewer_co.png addnetwork_co.png highlighting_screen_co.png first_serverlist_co.png nickthemes_screen_co.png nicksonline_co.png webbrowser_screen_co.png editserver_screen_co.png led_red_on.png configure.png osd_screen_co.png osd_demo.png led_yellow_off.png irc_away.png colorchooser_screen.png led_blue_off.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png irc_owner.png dccstatus_screen_co.png quickbuttons_screen.png colorize.png led_red_off.png identities_gen_co.png channel_screen_co.png serverlist_screen_co.png index.docbook led_green_off.png first_channel_co.png addserver_co.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) irc_op.png irc_voice.png index.docbook led_green_on.png addnetwork_co.png notifylist_screen_co.png led_yellow_off.png highlighting_screen_co.png quickbuttons_screen.png urlcatcher_screen_co.png irc_owner.png addchannel.png configure.png notification_screen_co.png irc_normal.png irc_admin.png webbrowser_screen_co.png colorize.png kimproxy_create_screen2.png led_yellow_on.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png led_red_off.png identities_adv_co.png prefs_identity_screen_co.png channel_screen_co.png colorchooser_screen.png first_serverlist_co.png serverlist_screen_co.png irc_halfop.png editserver_screen_co.png identities_gen_co.png irc_away.png dccstatus_screen_co.png led_blue_off.png logviewer_co.png led_blue_on.png addserver_co.png kimproxy_create_screen_co.png identities_away_co.png kaddressbook.png osd_demo.png nicksonline_co.png nickthemes_screen_co.png osd_screen_co.png checkidentities.png led_red_on.png channellist_screen_co.png led_green_off.png serverlist_co.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -695,20 +699,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation - @for base in addchannel.png kimproxy_create_screen2.png identities_away_co.png kaddressbook.png notification_screen_co.png urlcatcher_screen_co.png led_blue_on.png channel_screen_tour_co.png channellist_screen_co.png irc_voice.png led_yellow_on.png irc_normal.png irc_admin.png irc_halfop.png prefs_identity_screen_co.png irc_op.png kimproxy_create_screen_co.png notifylist_screen_co.png led_green_on.png logviewer_co.png addnetwork_co.png highlighting_screen_co.png first_serverlist_co.png nickthemes_screen_co.png nicksonline_co.png webbrowser_screen_co.png editserver_screen_co.png led_red_on.png configure.png osd_screen_co.png osd_demo.png led_yellow_off.png irc_away.png colorchooser_screen.png led_blue_off.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png irc_owner.png dccstatus_screen_co.png quickbuttons_screen.png colorize.png led_red_off.png identities_gen_co.png channel_screen_co.png serverlist_screen_co.png index.docbook led_green_off.png first_channel_co.png addserver_co.png ; do \ + @for base in irc_op.png irc_voice.png index.docbook led_green_on.png addnetwork_co.png notifylist_screen_co.png led_yellow_off.png highlighting_screen_co.png quickbuttons_screen.png urlcatcher_screen_co.png irc_owner.png addchannel.png configure.png notification_screen_co.png irc_normal.png irc_admin.png webbrowser_screen_co.png colorize.png kimproxy_create_screen2.png led_yellow_on.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png led_red_off.png identities_adv_co.png prefs_identity_screen_co.png channel_screen_co.png colorchooser_screen.png first_serverlist_co.png serverlist_screen_co.png irc_halfop.png editserver_screen_co.png identities_gen_co.png irc_away.png dccstatus_screen_co.png led_blue_off.png logviewer_co.png led_blue_on.png addserver_co.png kimproxy_create_screen_co.png identities_away_co.png kaddressbook.png osd_demo.png nicksonline_co.png nickthemes_screen_co.png osd_screen_co.png checkidentities.png led_red_on.png channellist_screen_co.png led_green_off.png serverlist_co.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ done uninstall-nls: - for base in addchannel.png kimproxy_create_screen2.png identities_away_co.png kaddressbook.png notification_screen_co.png urlcatcher_screen_co.png led_blue_on.png channel_screen_tour_co.png channellist_screen_co.png irc_voice.png led_yellow_on.png irc_normal.png irc_admin.png irc_halfop.png prefs_identity_screen_co.png irc_op.png kimproxy_create_screen_co.png notifylist_screen_co.png led_green_on.png logviewer_co.png addnetwork_co.png highlighting_screen_co.png first_serverlist_co.png nickthemes_screen_co.png nicksonline_co.png webbrowser_screen_co.png editserver_screen_co.png led_red_on.png configure.png osd_screen_co.png osd_demo.png led_yellow_off.png irc_away.png colorchooser_screen.png led_blue_off.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png irc_owner.png dccstatus_screen_co.png quickbuttons_screen.png colorize.png led_red_off.png identities_gen_co.png channel_screen_co.png serverlist_screen_co.png index.docbook led_green_off.png first_channel_co.png addserver_co.png ; do \ + for base in irc_op.png irc_voice.png index.docbook led_green_on.png addnetwork_co.png notifylist_screen_co.png led_yellow_off.png highlighting_screen_co.png quickbuttons_screen.png urlcatcher_screen_co.png irc_owner.png addchannel.png configure.png notification_screen_co.png irc_normal.png irc_admin.png webbrowser_screen_co.png colorize.png kimproxy_create_screen2.png led_yellow_on.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png led_red_off.png identities_adv_co.png prefs_identity_screen_co.png channel_screen_co.png colorchooser_screen.png first_serverlist_co.png serverlist_screen_co.png irc_halfop.png editserver_screen_co.png identities_gen_co.png irc_away.png dccstatus_screen_co.png led_blue_off.png logviewer_co.png led_blue_on.png addserver_co.png kimproxy_create_screen_co.png identities_away_co.png kaddressbook.png osd_demo.png nicksonline_co.png nickthemes_screen_co.png osd_screen_co.png checkidentities.png led_red_on.png channellist_screen_co.png led_green_off.png serverlist_co.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ done #>+ 5 distdir-nls: - for file in addchannel.png kimproxy_create_screen2.png identities_away_co.png kaddressbook.png notification_screen_co.png urlcatcher_screen_co.png led_blue_on.png channel_screen_tour_co.png channellist_screen_co.png irc_voice.png led_yellow_on.png irc_normal.png irc_admin.png irc_halfop.png prefs_identity_screen_co.png irc_op.png kimproxy_create_screen_co.png notifylist_screen_co.png led_green_on.png logviewer_co.png addnetwork_co.png highlighting_screen_co.png first_serverlist_co.png nickthemes_screen_co.png nicksonline_co.png webbrowser_screen_co.png editserver_screen_co.png led_red_on.png configure.png osd_screen_co.png osd_demo.png led_yellow_off.png irc_away.png colorchooser_screen.png led_blue_off.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png irc_owner.png dccstatus_screen_co.png quickbuttons_screen.png colorize.png led_red_off.png identities_gen_co.png channel_screen_co.png serverlist_screen_co.png index.docbook led_green_off.png first_channel_co.png addserver_co.png ; do \ + for file in irc_op.png irc_voice.png index.docbook led_green_on.png addnetwork_co.png notifylist_screen_co.png led_yellow_off.png highlighting_screen_co.png quickbuttons_screen.png urlcatcher_screen_co.png irc_owner.png addchannel.png configure.png notification_screen_co.png irc_normal.png irc_admin.png webbrowser_screen_co.png colorize.png kimproxy_create_screen2.png led_yellow_on.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png led_red_off.png identities_adv_co.png prefs_identity_screen_co.png channel_screen_co.png colorchooser_screen.png first_serverlist_co.png serverlist_screen_co.png irc_halfop.png editserver_screen_co.png identities_gen_co.png irc_away.png dccstatus_screen_co.png led_blue_off.png logviewer_co.png led_blue_on.png addserver_co.png kimproxy_create_screen_co.png identities_away_co.png kaddressbook.png osd_demo.png nicksonline_co.png nickthemes_screen_co.png osd_screen_co.png checkidentities.png led_red_on.png channellist_screen_co.png led_green_off.png serverlist_co.png ; do \ cp $(srcdir)/$$file $(distdir); \ done diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/doc/Makefile.in --- konversation-1.0.1/doc/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/doc/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -51,17 +47,21 @@ DIST_SOURCES = #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ #>- html-recursive info-recursive install-data-recursive \ -#>- install-exec-recursive install-info-recursive \ -#>- install-recursive installcheck-recursive installdirs-recursive \ -#>- pdf-recursive ps-recursive uninstall-info-recursive \ -#>- uninstall-recursive -#>+ 6 +#>- install-dvi-recursive install-exec-recursive \ +#>- install-html-recursive install-info-recursive \ +#>- install-pdf-recursive install-ps-recursive install-recursive \ +#>- installcheck-recursive installdirs-recursive pdf-recursive \ +#>- ps-recursive uninstall-recursive +#>+ 7 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive nmcheck-recursive bcheck-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -69,8 +69,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -110,7 +108,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -185,12 +185,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -204,6 +206,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -223,24 +226,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -252,19 +253,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -291,30 +291,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -324,7 +324,7 @@ KDE_DOCS = AUTO #>- SUBDIRS = $(AUTODIRS) #>+ 1 -SUBDIRS =. da es et it nl pt ru sv konversation +SUBDIRS =. it konversation et da ru sv es pt #>- all: all-recursive #>+ 1 all: docs-am all-recursive @@ -379,10 +379,6 @@ clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -414,8 +410,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -459,8 +454,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -485,8 +480,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -496,13 +491,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -516,22 +510,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -545,7 +538,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -553,6 +546,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -596,8 +591,7 @@ distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -611,12 +605,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -635,22 +637,24 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/addchannel.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/addchannel.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/addnetwork_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/addnetwork_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/addserver_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/addserver_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/channellist_screen_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/channellist_screen_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/channel_screen_tour_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/channel_screen_tour_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/checkidentities.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/checkidentities.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/colorchooser_screen.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/colorchooser_screen.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/dccstatus_screen_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/dccstatus_screen_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/first_channel_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/first_channel_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/first_serverlist_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/first_serverlist_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/identities_adv_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/identities_adv_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/identities_away_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/identities_away_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/identities_gen_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/identities_gen_co.png differ diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/index.docbook /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/index.docbook --- konversation-1.0.1/doc/nl/index.docbook 2006-10-06 17:44:51.000000000 +0100 +++ konversation-1.1/doc/nl/index.docbook 1970-01-01 01:00:00.000000000 +0100 @@ -1,5884 +0,0 @@ - - - Konversation"> - - - IRC"> - CTCP"> - nickname"> - Nickname"> - LED"> - OSD"> - URL"> - MIME"> - - - - - - -]> - - - - - - - - - - - - -Het handboek van &konversation; - - - Gary R. Cramblitt garycramblitt@comcast.net -&Bram.Schoenmakers; - - - - - -2003-2005 -Gary R. Cramblitt - - - - -&FDLNotice; - - - -2005-05-23 -0.18 - - - - -&konversation; is een gebruiksvriendelijk &irc;-programma voor de K Desktop Environment. - - - - - -KDE -kdeextragear-2 -Konversation -irc -internet relay chat -chat -communicatie - - - - - - - - - -Inleiding - - - -&konversation; is een &irc;-programma voor &kde; 3.2 of nieuwer. Het biedt de volgende functies: - - - -SSL-ondersteuning. -Gebruiksvriendelijke interface met tabbladen. -Snelknoppen met veelgebruikte commando's die aangepast kunnen worden -Automatisch verbinden en teruggaan naar kanalen. -Bestanden verzenden en ontvangen over DCC. -Schermnamenvolglijst. -Visuele en 'auditory' notificaties voor uiteenlopende gebeurtenissen, zoals berichten die uw schermnaam bevatten of schermnamen die op uw volglijst staan die online of offline gaan. (KDE 3.2 of later). -Aanpasbare accentuering van berichten gebaseerd op schermnaam of reguliere expressie. -Schermnaamaanvulling. -Alle &URL;-adressen verzamelen en opslaan die in de berichten voorkomen. -On-screen display van berichten, zelfs wanneer het programma geminimaliseerd is. -Negeerlijst voor een bepaalde schermnaam. -Automatisch loggen en logbeheer. -Markeren van regels in de logbestanden. -Script-functionaliteit. -Integratie met &kaddressbook; - - - -De website van &konversation; is &konviwebsite;. Vragen en antwoorden voor &konversation; kunnen gesteld of gelezen worden op de mailinglijst van Konversation. Wanneer u zich hiervoor inschrijft wordt u op de hoogte gehouden van nieuwe mogelijkheden, bugs en dat soort zaken. Om op de hoogte te blijven van nieuwe uitgaven kunt u zich inschrijven op de mailinglijst Aankondingen van &konversation;. Op deze lijst is het veel rustiger doordat er enkel aankondigingen gedaan worden van de nieuwe uitgaven of patches. - -De ontwikkelaars van &konversation; kunnen meestal gevonden worden op &irc; op irc.kde.org, kanaal #konversation. - - - - -&konversation; gebruiken - - - - -Wanneer u nog nooit &irc; gebruikt hebt... - -&irc; is een chatprotocol, opgesteld volgens de officiële internetstandaarden. Het is bovendien goed in staat om vele uren van uw leven op te slokken. Om &irc; te gebruiken dient u verbinding te maken met een server om vervolgens aan een kanaal (chatroom) deel te nemen. U kunt ook privégesprekken aangaan. - -Om met een server en kanaal te verbinden start u &konversation;. De Serverlijst komt in beeld. - - - -Serverlijst - - - - - - - - - - - - - Serverlijst - - - - - - - -OnderNetwerken vindt u de ingestelde &irc;-netwerken. Een &irc;-netwerk is een verzameling samenwerkende servers. U hoeft maar bij één server een verbinding te maken om toegang te krijgen tot het hele &irc;-netwerk. Wanneer u eenmaal verbonden bent, zal &konversation; automatisch aan de kanalen onder Kanalen deelnemen. Wanneer &konversation; voor de eerste keer opgestart wordt, is het netwerk Freenode en het kanaal #kde al voor u ingevuld. Klik op een netwerk om daar een verbinding mee te maken. -Klik hier om een nieuw Netwerk inte stellen, inclusief de te verbinden server en de Kanalen die automatisch geopend moeten worden. Zie het onderdeel Het instellen van netwerken, servers en kanalen voor meer informatie. -Klik hier om een verbinding te maken met het geselecteerde &irc;-netwerk en kanaal. - - - - -Wanneer u op de knop Verbinden klikt nadat u &konversation; voor de eerste keer hebt opgestart, kunt u een melding krijgen dat uw Identiteit nog niet goed is ingesteld. - - - - Identiteiten controleren - - - - - - Identiteiten controleren - - - - - -Wanneer u &konversation; voor de eerste keer opstart zal het enkele gegevens van uw besturingssysteem ophalen zodat enkele identiteitsgegevens alvast ingevuld kunnen worden. Wanneer deze gegevens nog niet compleet zijn, bijvoorbeeld uw volledige naam, krijgt u het bovenstaande bericht in beeld. Om dit probleem te verhelpen klikt u op OK en kunt u uw identiteit instellen. - - -Het hoofdscherm bevat de berichten die door de server naar het programma verzonden zijn. (Wanneer &konversation; geen verbinding kon maken, raadpleeg dan Vraag en antwoord.) Wanneer de serverberichten allemaal binnengekomen zijn, zal &konversation; aan het geselecteerde kanaal deelnemen. - - - -Kanaal. - - - - - - - - - - - - - Kanaal - - - - - - - - -Dit is de zogenaamde invoerregel. Om een bericht naar iedereen in het kanaal te verzenden, typt u hier het bericht en drukt u op &Enter;. Uw bericht (en de berichten van anderen) is vervolgens te zien in het vak daarboven. Ieder bericht wordt vooraf gegaan met de tijd en de schermnaam van de gebruiker. - -U kunt aan verschillende servers en kanalen deelnemen. Iedere server, kanaal, kanaallijst en andere schermen krijgen een eigen tabblad. Om een lijst van verschillende kanalen te openen, raadpleeg dan de sectie De beschikbare kanalen tonen. Om aan een kanaal deel te nemen, typt u /join #kanaalnaam in de invoerregel. (Het teken # is vereist.) U kunt ook /j typen, wat de afkorting is van /join. Om een kanaal te verlaten typt u /part. Om van scherm te wisselen klikt u op het betreffende tabblad. - -Dit is de namenlijst. Het toont alle schermnamen van alle gebruikers die deelnemen aan het kanaal, inclusief uzelf. - - - - -Dit zijn de basisbeginselen. Lees verder voor meer informatie... - - - - - - -Uw identiteit instellen - -Voordat u &konversation; gaat gebruiken dient u uw identiteit in te stellen in de instellingen, zodat u geidentificeerd kunt worden op het netwerk. - -Ga naar in het hoofdmenu naar Instellingen Identiteiten. Het venster Identiteiten komt dan in beeld. U kunt dit venster ook openen door op de knop Bewerken te klikken in het venster Netwerk toevoegen. - - - -Identiteiten (tabblad Algemeen) - - - - - - - - - - - - - - - - - Identiteiten (tabblad Algemeen) - - - - - - - -Klik hier om een Identiteit te selecteren zodat u deze kunt bewerken. -Gebruik deze knoppen om een Identiteit toe te voegen, te hernoemen of te verwijderen. -Voer hier uw echte naam in. &irc; is niet bedoeld om u verborgen te houden van uw vrienden of vijanden. Houd hier rekening mee wanneer u de neiging hebt om helemaal los te gaan. Het invullen van een valse naam is een goede manier om uw geslacht te verbergen voor al die andere nerds op IRC, maar alles kan achteraf alsnog achterhaald worden zodat u nooit volledig anoniem kunt zijn. -Gebruik deze knoppen om een schermnaam te kunnen Toevoegen, te Bewerken of te Verwijderen. -Dit is de lijst met schermnamen. Uw schermnaam is de naam die andere gebruikers zullen zien en u ook leren kennen onder deze naam. U mag hier iedere naam invullen die u wilt. Het eerste teken moet een letter zijn, de overige tekens kunnen letters, cijfers of speciale tekens als -[]\`_^{}| zijn. - -Omdat een schermnaam uniek moet zijn voor de server die u gebruikt, kan de naam afgewezen worden omdat iemand anders deze schermnaam al gebruikt. Voer ook de alternatieve schermnamenn. Zodra de eerste keuze wordt afgewezen zal &konversation; de overige schermnamen proberen. - -Volgens RFC 2812 mag de maximale schermnaamlengte slechts 9 tekens omvatten, maar dit wordt in feite bepaald door de server. Om te bepalen wat het maximum van de server is dient u daarmee te verbinden. In het tabblad Serverberichten zoekt u naar een bericht met [Support ]. Bijvoorbeeld - - -[18:51] *bram85* [21:45] [Support] bram85 MODES=4 MAXCHANNELS=20 NICKLEN=16 USERLEN=10 HOSTLEN=63 TOPICLEN=450 KICKLEN=450 CHANNELLEN=30 KEYLEN=23 CHANTYPES=# PREFIX=@+ CASEMAPPING=ascii CAPAB IRCD=dancer - - -De parameter NICKLEN geeft de maximale schermnaamlengte aan. - - -Gebruik deze knoppen om de volgorde van de schermnamen te veranderen. -Wanneer u uw schermnaam geregistreerd hebt op het &irc;-netwerk, voert u de naam van de dienst in en het wachtwoord om uw schermnaam te authenticeren. Zodra &konversation; een verbinding maakt zal het automatisch /msg dienst IDENTIFY wachtwoord naar de server sturen. Wanneer u niet weet waar dit over gaat kunt u deze velden ook leeg laten. - - - - - -Klik op het tabblad Afwezig. - - - - Identiteiten (tabblad Afwezig) - - - - - - - - - - - - - Identiteiten (tabblad Afwezig) - - - - - - - -Voer een schermnaam in waaruit blijkt dat u afwezig bent. Wanneer u het commando /away bericht invoert op een willekeurig kanaal in combinatie met deze Identiteit, zal &konversation; automatisch uw schermnaam veranderen naar uw afwezigheidsschermnaam. Andere gebruikers kunnen dan zien dat u afwezig bent. Wanneer u zo'n /away-commando invoert terwijl u afwezig bent, zal &konversation; uw schermnaam automatisch weer veranderen naar uw oorspronkelijke schermnaam. Wanneer u deze schermnaamveranderingen niet wenst dient u dit veld gewoon leeg te laten. -Wanneer u dit vakje selecteert tijdens het uitvoeren van een /away-commando zal er een horizontale lijn in het kanaal verschijnen. Deze geeft aan op welk punt u weg ging. Andere &irc;-gebruikers kunnen deze lijn niet zien. -Wanneer u dit vakje selecteert zal &konversation; automatisch het afwezigheidsbericht sturen naar alle kanalen waarmee u met de betreffende Identiteit aan deelneemt. %s wordt vervangen door bericht. Wanneer u het commando /away uitvoert zal het Terugkomstbericht getoond worden in alle kanalen waarmee u met de betreffende Identiteit aan deelneemt. - -Afwezigheidsberichten worden over het algemeen als irritant ervaren door andere gebruikers. Gebruik deze optie met zorg, met oog op uw mede &irc;-gebruikers. - - - - - - -Klik op het tabblad Geavanceerd. - - - - Identiteiten (tabblad Geavanceerd) - - - - - - - - - - - - - - - - Identiteiten (tabblad Geavanceerd) - - - - - - - -U kunt hier een commando invoeren dat zal worden uitgevoerd voordat er verbinding wordt gemaakt met de server. Als deze identiteit op meer dan één server wordt gebruikt, dan zal het commando op elke server worden uitgevoerd. -Deze instelling bepaalt hoe lettertekens gecodeerd worden om ze naar de server te kunnen sturen. Het beïnvloedt ook de manier waarop berichten getoond worden. Wanneer u &konversation; voor het eerst opstart haalt het automatisch deze instellingen op van het besturingssysteem. Wanneer u problemen hebt om de berichten van anderen goed te kunnen zien kunt u proberen deze instelling te wijzigen. -Wanneer u een verbinding maakt, kunnen servers een IDENT-aanvraag doen. Wanneer uw computer geen IDENT-server heeft draaien zal &konversation; deze voor u beantwoorden. Er zijn geen spaties toegestaan. Het wordt aangeraden om hier gewoon uw voornaam in te vullen. -Wanneer u een server verlaat, zal dit bericht naar het kanaal verzonden worden. -Wanneer u van een kanaal getrapt wordt (meestal door een &irc;-operator), zal dit bericht naar de server verzonden worden. -Klik hier om uw instellingen toe te passen. Om te zorgen dat al deze instellingen van kracht zijn dient u de verbinding met de server te verbreken en opnieuw te verbinden. De eenvoudigste manier om dat te doen is door &konversation; af te sluiten en opnieuw te starten. - - - - - - - - - - -Het instellen van netwerken, servers en kanalen - -De Serverlijst komt in beeld zodra &konversation; is opgestart. U kunt deze ook opvragen door in het hoofdmenu voor Bestand Serverlijst te kiezen. De Serverlijst toont uw huidig ingestelde &irc;-netwerken, getoond per groep. Een &irc;-netwerk is een verzameling samenwerkende servers. Wanneer u verbinding maakt met één enkele server hebt u toegang tot alle kanalen op het netwerk. Voorbeelden van &irc;-netwerken zijn Freenode en Undernet. - - - - Serverlijst - - - - - - - - - - - - - - Serverlijst - - - - - - - -Uw huidig ingestelde netwerken worden getoond samen met de Identiteit waarmee u het netwerk gebruikt en de Kanalen die automatisch geopend worden bij een verbinding. Wanneer u een groep hebt opgegeven voor uw netwerken worden de items ingesprongen. Klik op een netwerk om die te selecteren. -Gebruik deze knoppen voor het Toevoegen van een netwerk, het Bewerken van het geselecteerde netwerk of om het geselecteerde netwerk te Verwijderen. -Klik op deze knop om een verbinding te maken met het geselecteerde Netwerk en om de Serverlijst te sluiten. U kunt meer dan één netwerk tegelijkertijd selecteren, zodat er een verbinding gemaakt zal worden naar meerdere servers tegelijk. -Wanneer u op deze knop drukt raken de gemaakte instellingen nog niet verloren. Het komt er meer op neer dat u op dit moment nog geen verbinding wilt maken. - - - - - -Wanneer u op de knop Toevoegen drukt zal het venster Netwerk toevoegen openen. - - - - Netwerk toevoegen - - - - - - - - - - - - - - - - - - - Netwerk toevoegen - - - - - - - -Voer de naam van het Netwerk hier in. U kunt zo hetzelfde netwerk zo vaak toevoegen als u wilt aan de Serverlijst. -Optioneel. Wanneer u hier iets invult worden alle netwerken onder dezelfde Groep gegroepeerd in de Serverlijst. -Selecteer een bestaande Identiteit of klik op Bewerken om een nieuwe identiteit toe te voegen of om er een te bewerken. De Identiteit is nodig om u te identificeren op het netwerk. -Optioneel. Dit commando zal naar de server verzonden worden nadat er een verbinding is gemaakt. Voorbeeld: /msg NickServ IDENTIFY konvirocks. Dit voorbeeld geldt voor het Freenode-netwerk, dat vereist dat gebruikers hun schermnaam registreren aan de hand van een wachtwoord bij het verbinden. -Selecteer deze optie wanneer u wilt dat &konversation; automatisch verbinding maakt met dit netwerk wanneer u &konversation; opstart. -Dit is de lijst met &irc;-servers in het netwerk. Wanneer u een verbinding maakt met het netwerk zal &konversation; eerst proberen om met de server te verbinden die bovenaan staat. Wanneer dat mislukt zal de tweede server geprobeerd worden. Als dat ook mislukt zal de derde geprobeerd worden enzovoorts. Er dient op z'n minst 'één server opgegeven te worden. Klik op een server om die te selecteren. -Gebruik deze knoppen om een server te kunnen Toevoegen, een geselecteerde server te Bewerken of te Verwijderen. U kunt ook de volgorde veranderen van de serverlijst, dus zal ook de volgorde van verbindingspogingen gewijzigd worden. -Optioneel. Dit is de lijst met kanalen die automatisch geopend worden zodra &konversation; een verbinding met de server heeft gelegd. U kunt dit veld ook leeg laten wanneer u dat niet wenst. -Gebruik deze knoppen om een kanaal te kunnen Toevoegen, een geselecteerd kanaal te kunnen Bewerken of te Verwijderen. U kunt ook de volgorde wijzigen waarin de kanalen geopend worden. - - - -Voorkom het door elkaar halen van servers op verschillende &irc;-netwerken onder hetzelfde Netwerk. Voorkom ook dat u dezelfde server onder twee verschillende Netwerken plaatst. Anders zal de integratie met uw adresboek en de functie om online schermnamen in de gaten te houden niet goed werken. - - - - -Wanneer u op de knop Toevoegen drukt in het vak Servers zal het venster Server toevoegen in beeld komen. - - - - Server toevoegen - - - - - - - - - - - - - - Server toevoegen - - - - - - - -De naam of het IP-adres van de server. irc.help.org houdt een lijst bij van servers. -Voer het poortnummer van deze server in. Voor de meeste servers zal dat 6667 zijn. -Wanneer de server een wachtwoord vereist kunt u dat hier invullen. In de andere gevallen dient u dit veld leeg te laten. -Selecteer deze optie om gebruik te maken van het SSL-protocol (Secure Socket Layer) met de server. Dit beschermt uw privacy door gesprekken tussen uw computer en de &irc;-server af te dekken. De server moet het SSL-protocol wel ondersteunen, anders werkt het niet. In de meeste gevallen zal de verbinding mislukken wanneer de server het niet ondersteunt. - - - - - -Wanneer u op de knop Toevoegen drukt in het vak Automatisch deelnemen aan kanalen, komt het venster Kanaal toevoegen in beeld. - - - - Kanaal toevoegen - - - - - - Kanaal toevoegen - - - - - -Voer een kanaalnaam in. Vergeet het teken # niet vooraf te plaatsen. Wanneer een kanaal een wachtwoord nodig heeft kunt u het invullen, anders kunt u dat veld gewoon leeg laten. - - - - - - -Het tonen van de beschikbare kanalen - -Om een lijst van beschikbare kanalen te tonen, kiest u in het hoofdmenu voor Venster Kanaallijst.Na een waarschuwingsvenster wordt er een nieuw tabblad aangemaakt met de Kanaallijst. - - - -Het tabblad Kanaallijst - - - - - - - - - - - - - - - - Het tabblad Kanaallijst. - - - - - - - - -Voer hier een filtertekst in. - -U kunt het aantal kanalen verminderen door een minimum en maximum aantal gebruikers als criteria op te geven voor een kanaal. Door een 0 in te vullen zal dat het betreffende criterium uitschakelen. - -Klik hier om een kanaallijst op te halen van de server en daar de filter op uit te voeren. - -De gefilterde lijst wordt hier getoond. Merk op dat als u hier geen reguliere expressies gebruikt, &konversation; ieder kanaal zal tonen dat de filtertekst bevat in zijn naam. De kanaalnaam hoeft niet te beginnen met de tekst die u hebt opgegeven. - -Selecteer een kanaal waaraan u wilt deelnemen door er op te klikken. Klik er met de rechter muisknop op om alle webadressen te zien die in het onderwerp van het kanaal staan. - -Klik hier om deel te nemen aan een kanaal. Er wordt een nieuw tabblad aangemaakt. - - - - -Klik niet al te vaak op de knop Lijst vernieuwen. De meeste servers hebben duizenden kanalen. Omdat alle gegevens van deze kanalen opgehaald moeten worden zal dat enorm veel dataverkeer teweeg brengen. Het kan daardoor ook een paar minuten duren voordat het hele proces voltooid is, afhankelijk van uw bandbreedte. Wanneer het programma de gegevens niet snel genoeg kan verwerken kan de server zelfs de verbinding verbreken. - -Er zijn soms "geheime" kanalen op servers. Deze kanalen worden niet getoond in de Kanaallijst. U kunt alsnog deelnemen aan deze kanalen wanneer u de naam weet. In iedere invoerregel kunt u /join #kanaalnaam typen. (De # is vereist.) Voor ieder kanaal wordt een nieuw tabblad aangemaakt. Wanneer u aan een kanaal deelneemt en u bent de enige in dat kanaal houdt dat in dat het kanaal voorheen nog niet bestond. De server heeft daarom het kanaal aangemaakt en u tot operator benoemd. In dat geval wilt u in de meeste gevallen het kanaal weer sluiten. Dat kunt u doen door /part te typen. - - - - - - -Een rondleiding door het hoofdscherm - -Laten we het hoofdscherm eens wat nader bekijken. Het scherm wordt hieronder getoond, waarbij er een kanaaltabblad actief is. - - - -Het hoofdscherm. - - - - - - - - - - - - - - - - - - - Het hoofdscherm - - - - - - - - -Dit is de zogenaamde invoerregel. Deze is alleen in beeld als het actieve kanaal een tabblad bevat. Om een bericht naar iedereen in het kanaal te verzenden typt u hier een bericht en drukt u op &Enter;. Uw bericht - net zoals de berichten van anderen - komen in het berichtvenster boven de invoerregel. Ieder bericht gaat vooraf aan de tijd en de schermnaam van de gebruiker. - - U kunt ook tekst van het klembord plakken. Wanneer de geplakte tekst meer dan één regel (einderegelteken) bevat komt er een dialoogvenster in beeld. Bewerk de tekst naar wens en druk vervolgens op OK. - - Wanneer de geplakte tekst langer is dan 256 lettertekens of meer dan één regel bevat komt er een waarschuwing in beeld waarin vermeld wordt dat grote berichten kunnen leiden tot het verbreken van de verbinding met de server. U kunt nog doorgaan met het plaatsen van het bericht, maar het wordt zeker niet aangeraden. Het overvloedig plaatsen van tekst zal andere gebruikers irriteren. Het is beter om berichten in kleinere gedeeltes op te splitsen. - - - - Het is een ongeschreven regel in veel kanalen dat de berichten die u aan een bepaald persoon wilt sturen vooraf gegaan worden diens betreffende schermnaam. &konversation; biedt daarom een handige schermnaamaanvulling. Typ de eerste letter(s) van de schermnaam en druk op Tab. &konversation; zal de rest van de schermnaam aanvullen en er een dubbele punt achter plaatsen. Om deze functie aan te passen, kies Instellingen Konversation instellen... in het hoofdvenster, ga naar Gedrag, klik op Algemeen en ga vervolgens naar het vak Aanvulmodus. - - U kunt ook een &irc;-commando invoeren door eerst / te typen gevolgd door een geldig &irc;-commando. Zie de sectie Vaakgebruikte &irc;-commando's. Op sommige servers kunt u ook /help typen voor een lijst met beschikbare commando's. U kunt ook /help commando typen om een helptekst te krijgen over een specifiek commando. - - - -U kunt deelnemen aan meerdere servers en kanalen. Iedere server en kanaal krijgt een eigen tabblad. Om een lijst met de beschikbare kanalen te tonen dient u de sectie Het tonen van de beschikbare kanalen te lezen. Om aan een kanaal deel te nemen typt u /join #kanaalnaam in de invoerregel. (Het teken # is vereist.) Om een kanaal te verlaten typt u /part. Er komt ook een tabblad bij zodra u een kanaallijst opent, een privégesprek (conversatie) aangaat, een URL-lijst of Konsole opent. Om naar een ander scherm te gaan klikt u op het bijbehorende tabblad of gebruikt u het muiswieltje om tussen de tabbladen te bladeren. - -Om andere opties voor tabbladen in te stellen, kies InstellingenKonversation instellen... in het hoofdvenster, ga naar Gedrag en klik op Algemeen. - - - -Deze &led;s zullen knipperen zodra er iets in een tabblad gebeurt wat u nog niet onder ogen hebt gehad. De &led; zal langzamer knipperen wanneer het gaat om join, part, quit of om schermnaamveranderingen. Ze zullen sneller knipperen wanneer het om gewone berichten gaat. De volgende kleuren worden gehanteerd: - - Kanaal - - - Serverberichten, Kanaallijst of URL-lijst - - - Konsole of DCC-status. - - - Privégesprek (conversatie). - - - - -Klik hier om het huidige tabblad te sluiten. Door een kanaaltabblad te sluiten zult u dat kanaal verlaten. Het sluiten van het tabblad met serverberichten zal alle kanalen verlaten waaraan u deelnam, alle open conversaties sluiten en de verbinding verbreken met de server. - -Klik op deze knop om uw eigen schermnaam te veranderen. Het verschijnt alleen als het huidige tabblad een kanaal is. Om deze knop te verbergen kies &nickname;InstellingenKonversation instellen... in het hoofdvenster, ga naar Uiterlijk, klik op Chatvenster en deselecteer het keuzevakje Vak voor wijzigen van eigen schermnaam tonen. - -Hier wordt het kanaalonderwerp getoond. Houd de muis boven het onderwerp om het volledige onderwerp te zien, indien nodig. U kunt het onderwerp veranderen door op de knop links van het onderwerp te klikken. Om de kanaalonderwerpen te verbergen, gaat u naar Instellingen Konversation instellen . Ga vervolgens naar Uiterlijk en kies voor Chatvenster. Deselecteer daar de optie Onderwerp tonen. - -Deze knoppen weergeven de status van alle kanaalmodi. Wanneer een knop is ingedrukt wil dat zeggen dat die bepaalde modus actief is. Wanneer je de juiste rechten hebt, kan je de kanaalmodi ook wijzigen door er simpelweg op te klikken. U kunt ook op de knop links van het onderwerp klikken. Om de knoppen voor de kanaalmodi te verbergen, gaat u in het hoofdmenu naar InstellingenKonversation instellen. Van daaruit, gaat u naar Uiterlijk en klikt u op Chatvenster. Deselecteer daar de optie Kanaalmodusknoppen tonen. - - -Dit is de namenlijst. Deze wordt getoond wanneer u zich in een kanaalvenster bevindt. Het toont alle mensen die ook deelnemen aan dat kanaal, inclusief uzelf. Wanneer u de muis op een schermnaam plaatst krijgt u extra informatie in beeld met betrekking tot die schermnaam. Het is ook mogelijk om de pictogrammen die naast de namen staan te wijzigen, door het thema te wijzigen. Zie Instellen van thema's voor meer informatie. Het thema Big Bullets, die u hierboven ziet, gebruikt de volgende pictogrammen: - - - normale gebruiker - - - - gebruiker met voice. Gebruiker mag in een beheerd kanaal praten. - - - - mede-operator van kanaal - - - - kanaaloperator - - - - kanaaleigenaar - - - - kanaalbeheerder - - - - - -Bovendien zal er een klein rood kruisje in het pictogram staanwanneer een gebruiker afwezig is. - -Klik met de rechtermuisknop op een willekeurige schermnaam om een contextmenu in beeld te krijgen, zodat u bepaalde acties kunt uitvoeren op die schermnaam. U kunt bijvoorbeeld een bestand verzenden naar die persoon. Met dit menu kunt u de schermnaam ook koppelen met iemand in uw adresboek. - -Om de namenlijst te verbergen gaat u naar VensterNamenlijst verbergen in het hoofdmenu. - - - -Dit zijn de zogenaamde snelknoppen. Deze worden standaard niet getoond. Om ze tevoorschijn te halen raadpleeg dan de sectie Snelknoppen instellen. U kunt de knoppen precies zo laten doen zoals u ze wilt hebben. - - - - -Opmerking: u kunt instellen hoe berichten worden getoond in bericht-, kanaa-l of conversatievensters. Zo kunt u bijvoorbeeld de kleur van de berichten wijzigen, een geluid laten afspelen wanneer er een bericht binnenkomt dat een bepaalde tekenreeks bevat of automatisch op berichten reageren. Zie het hoofdstuk Berichtaccentuering voor meer informatie. - -Opmerking: Kanaalnamen kunnen soms beginnen met &, + of met !. Het eerste teken van een kanaal bepaalt het type kanaal (RFC 2811) als volgt: # - Normaal kanaal. ! Normaal kanaal. & - Lokaal. Kanalen die alleen op een bepaalde server staan. U kunt aan alle andere kanalen deelnemen vanaf iedere andere server in het netwerk. + - Kanalen die de kanaalmodi niet ondersteunen. Dit betekent dat alle modi uit staan met uitzondering van de onderwerpsbescherming. Kanaalnamen mogen hooguit 50 lettertekens lang zijn en kunnen ieder teken bevatten behalve een spatie, komma en Ctrl-G. - - - - - - -Snelverbinden - -Soms wilt u een verbinding maken met een server zonder dat u de server hoeft aan te maken in de Serverlijst. - -Kies in het hoofdmenu voor de optie BestandSnelverbinden. Het venster Snelverbinden komt in beeld. - - - -Het venster Snelverbinden. - - - - - - Het venster Snelverbinden - - - - - -Voer het serveradres in in het veld Serverhost, uw schermnaam in het veld Schermnaam en klik op Verbinden. Wanneer &konversation; een verbinding met de server gemaakt heeft voert u het commando /join#kanaalnaam in om deel te nemen aan een kanaal. - - - - - - -Vaakgebruikte &irc;-commando's - -Hier volgt een korte lijst met veelgebruikte &irc;-commando's. Zie RFC 2812 voor een volledige lijst of kijk op irchelp.org. Voor de commando's die door &konversation; ondersteund worden kunt u kijken bij Commando's in Konversation. - - - - - -/help -Toont alle beschikbare commando's op de huidige server. Wordt niet door alle servers ondersteund. - - - -/help commando -Biedt hulp voor een bepaald commando. Wordt niet door alle servers ondersteund. - - - -/join #kanaal -Neemt deel aan een #kanaal. Wanneer het kanaal nog niet bestaat zal het aangemaakt worden en bent u de kanaaloperator. - - - -/part -Verlaat het huidige kanaal en sluit het bijbehorende kanaaltabblad. - - - -/part #kanaal -Verlaat een bepaald #kanaal en sluit het bijbehorende kanaaltabblad. Gelijkwaardig aan /leave. - - - -/me bericht -Verzendt het bericht naar het kanaal, voorafgegaan door uw schermnaam. Wanneer uw schermnaam bijvoorbeeld Tux is, zal het commando /me maakt een kopje thee. als volgt in beeld komen: Tux maakt een kopje thee. Tenzij u een filter hebt aangemaakt voor zulke berichten kunt u - en alle andere aanwezigen in het kanaal - dit bericht zien. Dit soort berichten worden doorgaans gebruikt om een emotie uit te drukken of om te laten merken waar u ondertussen allemaal mee bezig bent. Wanneer u uw computer even achterlaat, maak dan gebruik van het commando /away. - - - -/away bericht -Wanneer iemand u een privébericht verzendt of u uitnodigt voor een kanaal zullen ze een bericht krijgen waarin staat dat u nu even niet achter de computer zit. - - - -/away -Maakt het commando /away bericht ongedaan. - - - -/queryschermnaam -Maakt een nieuw tabblad aan met de schermnaam van de gebruiker voor een privégesprek. Dit heet officieel een Query. In de Nederlandstalige Konversation heet dit 'Conversatie'. Alles wat hier geschreven wordt is alleen voor u en uw gesprekspartner zichtbaar. - - - -/msg schermnaam bericht -Verzendt het bericht naar de opgegeven schermnaam. Alleen de gebruiker met die schermnaam zal het bericht kunnen zien. Gebruik /query voor langere privégesprekken. - - - -/invite schermnaam -Nodigt de gebruiker met een bepaalde schermnaam uit om aan een kanaal deel te nemen. Dit is vooral wanneer gebruikers alleen op uitnodiging in een kanaal kunnen komen. - - - - - - - - - - -Privégesprekken (conversaties) - -Een privégesprek is iets wat alleen u en uw gesprekspartner kunnen zien. Privégesprekken worden in &konversation; "conversaties" genoemd. Om een privégesprek te beginnen typt u /query schermnaam op een willekeurige invoerregel waarbij de schermnaam de schermnaam is van de persoon waarmee u een gesprek wilt aangaan. U kunt ook met de rechter muisknop op de schermnaam klikken in de namenlijst en kiezen voor Conversatie openen. Er wordt een nieuw tabblad aangemaakt. Kondig uzelf aan door een bericht te verzenden. - -Conversaties (queries) zijn hetzelfde als kanalen, behalve dan het feit dat alleen u en uw gesprekspartner aan het kanaal kunnen deelnemen. - -Om een conversatie te verlaten hoeft u alleen het tabblad te sluiten. Opmerking: Wanneer uw gesprekspartner weer een bericht verstuurt via de conversatie zal het tabblad weer geopend worden. - -Om alle conversaties te verlaten kiest u in het hoofdmenu voor VensterAlle open conversaties sluiten, of druk op F11. - -Wanneer iemand een conversatie met u start zal &konversation; een nieuw tabblad met de schermnaam van die persoon aanmaken. Wanneer u niet met die persoon wilt praten sluit u het tabblad. - - - - - - -Notificaties instellen - -Meldingen zijn acties die &konversation; kan ondernemen wanneer er iets gebeurt. U hebt bijvoorbeeld &konversation; draaien, maar is geminimaliseerd of verborgen achter andere vensters. Het zou dan fijn zijn dat &konversation; een signaal geeft wanneer iemand bijvoorbeeld met u probeert te praten of wanneer uw maatje net op een kanaal komt. - -Om de notificaties in te stellen kiest u in het hoofdmenu voor Instellingen Notificaties instellen.Het venster Notificatie-instellingen komt vervolgens in beeld. - -Klik daarna direct op de knop Meer opties. - - - -Het venster Notificatie-instellingen. - - - - - - - - - - - - - Het venster Notificatie-instellingen - - - - - - - - -Klik hier om een gebeurtenis te selecteren. - -Controleer het type notificaties die u wilt krijgen wanneer er iets gebeurt (De optie Taakbalkitem markeren zal er voor zorgen dat het taakbalkitem van &konversation; gaat knipperen wanneer er iets gebeurt.) - - - - -U kunt dit herhalen door een andere gebeurtenis te selecteren en de nodige notificaties te selecteren. Wanneer u klaar bent drukt u op de knop Toepassen. - - - - -Wanneer u eenmaal uw notificaties hebt ingesteld kunt u hier alle notificaties in één keer in- of uitschakelen. U kunt er bijvoorbeeld kiezen om een geluid af te laten spelen zodra uw schermnaam in een bericht wordt vermeld. Wanneer u achter uw computer zit kunt u deze geluiden uitschakelen, maar ze kunnen misschien makkelijk zijn wanneer u niet achter uw computer zit. - - - - -U kunt met deze optie ook een waarschuwing instellen voor het vermelden van uw schermnaam in een bericht. - - - - - - -Bijhouden wie er online is - -&konversation; kan u op de hoogte houden van de aanwezigheid van vrienden op het &irc;-netwerk. - -U kunt schermnamen die online zijn koppelen aan een adresboekingang. De schermnaam en het bijbehorende &irc;-netwerk worden dan in het adresboek geplaatst. Het &irc;-netwerk wordt vermeld omdat ieder netwerk unieke schermnamen kent. Achter de schermnaam op twee verschillende netwerken hoeft niet noodzakelijk dezelfde persoon te zitten, maar twee dezelfde schermnamen op twee verschillende servers binnen hetzelfde &irc;-netwerk horen over het algemeen bij dezelfde persoon. - -Daarom is het belangrijk om hetzelfde Netwerk te gebruiken voor alle servers die binnen dat &irc;-netwerk zitten, bij het instellen van netwerken, servers en kanalen. - -U kunt ook schermnamen markeren voor volgen die niet in uw adresboek staan. In dat geval wordt een schermnaam gekoppeld aan een &irc;-netwerk. Zie hieronder. - -Om het volgen van schermnamen in te schakelen, gaat u in het hoofdmenu naar Venster Gevolgde schermnamen online. Het venster Gevolgde schermnamen online komt in beeld. - - - - Gevolgde schermnamen online. - - - - - - - - - - - - - - - - Gevolgde schermnamen online - - - - - - - -De schermnamen die in uw volglijst staan en in uw adresboek worden hier getoond. Ze worden samen met het bijbehorende &irc;-netwerk getoond. Wanneer er geen schermnaam getoond wordt, kan het zijn dat u geen gevolgde schermnamen hebt of dat deze functie uit staat. U ziet hieronder hoe u dat aanzet. U kunt iedere schermnaam uitklappen om te zien aan welke kanalen deze deelneemt. De pictogrammen naast ieder kanaal zijn hetzelfde als de pictogrammen in de namenlijst in een kanaalscherm. -De informatie die bekend is over deze schermnaam wordt hier getoond. Wanneer het dialoogvenster Gevolgde schermnamen online in eerste instantie getoond wordt zal er weinig informatie zijn. Iedere acht seconden wordt er een WHOIS-commando verzonden naar de server om informatie op te vragen voor de schermnamen waarvan geen informatie bekend is. Dit zal doorgaan totdat alle schermnamen informatie bevatten. -Schermnamen die niet verbonden zijn met de &irc;-netwerken waarmee u verbonden bent, worden getoond in het Offline-gedeelte van de lijst. -Schermnamen die gekoppeld zijn aan een ingang van het adresboek krijgen dit blauwe pictogram naast hun gegevens. Wanneer de schermnaam niet in het adresboek voorkomt is de pictogram grijs, zoals in dit voorbeeld. -Gebruik deze knoppen om een schermnaam te koppelen aan een contactpersoon uit uw adresboek, deze te verwijderen of om het adresboek te openen om de contactgegevens te bewerken. Zie het handboek van &kaddressbook; voor meer informatie over hoe u het adresboek gebruikt. - - - -Om meerdere schermnamen toe te voegen aan de volglijst klikt u op de knop Volglijst bewerken. Het venster Gevolgde schermnamen komt in beeld. - - - -Gevolgde schermnamen - - - - - - - - - - - - - - - Gevolgde schermnamen - - - - - - - - -Selecteer dit vakje om het volgen van schermnamen aan te zetten. - -Wanneer u het venster Gevolgde schermnamen online in beeld wilt na het opstarten van &konversation; selecteert u deze optie. - -De schermnaam van de gebruikers die u in de gaten wilt houden worden hier genoemd. Iedere schermnaam wordt gekoppeld aan een &irc;-netwerk. - -Klik op deze knoppen om een schermnaam toe te voegen of te verwijderen uit de lijst. - -De optie Gevolgde schermnamen online kan alleen werken door regelmatig met de server te communiceren. Deze optie bepaalt hoe vaak dat moet gebeuren. Vul geen getal in dat kleiner is dan 20 seconden omdat het de server te zwaar zal belasten. - -In het venster Gevolgde schermnamen online hierboven kunt u dubbelklikken op iedere schermnaam zodat het volgende commando naar de server verzonden zal worden, waarbij %u vervangen wordt door de schermnaam. %n is altijd nodig aan het einde van een commando. - - - - -Klik op OK wanneer u klaar bent met het toevoegen of het verwijderen van schermnamen. - -Opmerking:Wanneer u het venster Gevolgde schermnamen online kiest kan het even duren voordat alle namen in beeld staan, omdat &konversation; het server nog moet raadplegen voor de gegevens. Normaal gesproken hoort u het venster in beeld te houden. - -&konversation; toont ook een melding in alle kanalen wanneer een gebruiker die in uw lijstje van gevolgde schermnamen staat verbinding maakt met de server of de verbinding verbreekt. Zo'n melding ziet er als volgt uit: - -[17:52] [Notify] psn is online (irc.kde.org). - - - - - - -Berichtaccentuering - -U kunt instellen hoe berichten worden getoond in kanaal- en conversatievensters. - -Om de accentuering te activeren gaat u in het hoofdmenu naar Instellingen&konversation; instellen. Het venster Instellingen wijzigen komt in beeld. - - - -Het venster Accentuering. - - - - - - - - - - - - - - - - - - - Het venster Accentuering - - - - - - - - -Klik hier om het venster Accentuering te openen. -Klik hier om een nieuw item toe te voegen aan de Accentueringslijst. Wanneer u een item in de lijst selecteert kunt u dat aanpassen in de onderste helft van het venster. -Voer hier een tekenreeks in. Op ieder bericht dat deze tekenreeks bevat zal de accentuering toegepast worden. Wanneer u de &kde;'s editor voor reguliere expressies hebt kunt u rechts op de knop drukken om deze editor te openen. Dit is een uitstekende hulp om op eenvoudige wijze complexe tekenreeksen samen te stellen. (&kde;'s reguliere expressie-editor zit in het pakket kdeutils.) -Wanneer de tekenreeks wordt gevonden in een bericht zal het hele bericht worden geaccentueerd in de opgegeven kleur. -U kunt eventueel ook een geluid laten afspelen wanneer een tekenreeks overeen kwam met een deel van een bericht. Klik op de knop om een geluidsbestand te selecteren. Door op de testknop te klikken wordt het geluid afgespeeld. -Wanneer u wilt dat er automatisch een reactie wordt teruggestuurd zodra een bepaalde tekenreeks overeenkomt met een deel van een bericht kunt u dat hier opgeven. Gebruik deze optie met mate. Wanneer u hier teveel gebruik van maakt zal dit irritatie opwekken bij de andere kanaalleden. U kunt in dit veld ook &irc;- of &konversation;-commando's opgeven. -Wanneer u geluiden hebt ingesteld voor de accentuering kunt u ze hier allemaal in één keer uitschakelen door deze optie te deselecteren. -Wanneer u deze optie selecteert zal ieder bericht waarin uw schermnaam voorkomt worden geaccentueerd met de kleur die u aan de rechterzijde opgeeft. -Normaal gesproken wordt er geen accentuering toegepast op de berichten die u typt. Wanneer u deze toch wilt accentueren selecteert u deze optie en kiest u aan de rechterzijde een kleur. - - - - - - - - - -Het On Screen Display instellen (&osd;) - -Het On Screen Display (&osd;) is een unieke functie van &konversation;. Wanneer het &osd; aan staat zullen kanaalberichten op uw bureaublad verschijnen, zelfs wanneer &konversation; geminimaliseerd is. Hier is een voorbeeld van zo'n &osd;. Het bericht dat u in de linker bovenhoek kunt zien is van &konversation;, die zelf in het systeemvak draait. - - - -Voorbeeld van het On Screen Display - - - - - - Voorbeeld van het On Screen Display - - - - - -Om het &osd; te activeren kiest u eerst Instellingen&konversation; instellen in het hoofdmenu. Het venster Instellingen wijzigen komt in beeld. - - - -Het venster On Screen Display. - - - - - - - - - - - - - - - Het venster On Screen Display - - - - - - - - -Klik hier om het item Notificatie uit te klappen. - -Klik hier om het venster On Screen Display te openen. - -Selecteer dit vakje om het &osd; te activeren. - -Klik hier om een lettertype voor het &osd; te kiezen. (Opmerking: Niet alle lettertypes werken. Luxi Sans 22 en Impact 22 werken zeker.) - -Selecteer deze vakjes om te bepalen wat voor soort berichten u in beeld wilt krijgen. Klik daarna op de knop Toepassen. - - - - - - - - - -Kleurberichten verzenden - -U kunt een kleur toevoegen aan de berichten in ieder kanaal. Voer uw bericht in in het invoerveld. Klik daarna op &irc;-kleurkiezer&irc;-kleurkiezer of kies voor menuoptie Invoegen&irc;-kleur. De &irc;-kleurenkiezer komt in beeld. - - - -De &irc;-kleurenkiezer. - - - - - - De &irc;-kleurenkiezer. - - - - - -Klik op een kleur en klik op OK. Ga verder met invoeren van uw bericht in de invoerregel. Om een kleur weer te veranderen klikt u op de knop &irc;-kleur invoegen. Kies een andere kleur uit en klik op OK. - - - - - - -Instellen van thema's - -U kunt de pictogrammen wijzigen die links van de schermnamen staan van de namenlijst. Om het thema te veranderen gaat u naar InstellingenKonversation instellen, zodat het venster Instellingen veranderen in beeld komt. Kies voor Uiterlijk en vervolgens voor Thema's. - - - -Het venster Thema's. - - - - - - - - - - - - - - Het venster Thema's - - - - - - - - -Klik hier om het venster Thema's te openen. -Selecteer een thema. -Hier worden voorbeeldpictogrammen van het gekozen thema getoond. -Wanneer u ergens anders een thema hebt gedownload kunt u het aanklikken om te installeren. - - - - - - - - - -Snelknoppen instellen - -Het is mogelijk om acht Snelknoppen te tonen in het hoofdvenster. Om de Snelknoppen in te schakelen gaat u in het hoofdmenu naar InstellingenKonversation instellen. Het venster Instellingen veranderen komt in beeld. Klik op Uiterlijk en vervolgens op Chatvenster. Klik op Snelknoppen tonen en druk op OK. - -De knoppen kunnen naar eigen wens aangepast worden voor veelgebruikte &irc;-commando's. Om de snelknoppen aan te passen gaat u in het hoofdmenu naar Instellingen Konversation instellen. Het venster Instellingen veranderen komt in beeld. Klik op Gedrag om het uit te klappen, klik daarna op Snelknoppen om het betreffende venster in beeld te krijgen. - - - -Het venster Snelknoppen - - - - - - Het venster Snelknoppen - - - - - -Er zijn 8 snelknoppen beschikbaar. Klik op een ingang om het te veranderen. De kolom Knopnaam bevat de tekst die in de knop in het hoofdscherm zal komen. Houd de namen kort. De kolom Knopactie bevat de actie die uitgevoerd zal worden zodra u op de snelknop drukt. Tips bij het maken van acties staan in het scherm. - -Klik op OK om de veranderingen door te voeren. - -Voorbeeld: - - - - - Knopnaam: Msg - - Knopactie: Msg %u (er is een spatie achter %u) - - - - - -Om deze knop in het hoofdscherm te gebruiken klikt u op een schermnaam in de namenlijst en drukt u op de knop. /MSG komt in de invoerregel gevolgd door de gekozen schermnaam. Typ een bericht dat u naar dat persoon wilt verzenden en druk op &Enter;. Het bericht wordt naar dat persoon verstuurd zonder dat anderen het kunnen zien. - -Opmerking: U kunt geen snelknoppen toevoegen of verwijderen. - - - - - - -Het verzenden en ontvangen van bestanden - -U kunt bestanden verzenden via &irc; naar andere online personen, of ze kunnen u bestanden toezenden. - - -WAARSCHUWING: Open nooit een bestand dat u toegezonden krijgt tenzij het om een vertrouwde bron gaat. Het kan namelijk een virus bevatten. - - -Om een bestand te verzenden naar iemand in het actieve kanaal, klikt u met de rechter muisknop op de schermnaam van die persoon en klikt u op Bestand verzenden. Er komt een dialoogvenster in beeld waarin u een bestand kunt selecteren. Daarna komt er een nieuw tabblad DCC-status tevoorschijn. - - - -Tabblad DCC-status - - - - - - - - - - - - - Tabblad DCC-status - - - - - - - - -De schermnaam van de ontvanger en de bestandsnaam komen hier in beeld. - - -De kolom Status geeft de status aan van de verzending of ontvangst als volgt aan: - - - - - - Aanbod - - - U probeert een bestand naar de ontvanger te verzenden. &konversation; wacht op de ontvanger voor acceptatie. - - - - - Verbinden - - - &konversation; probeert een verbinding op te zetten met de ontvanger. - - - - - Verzenden - - - &konversation; is bezig het bestand te verzenden. - - - - - Ontvangen - - - &konversation; ontvangt een bestand van de verzender. - - - - - Klaar - - - Het bestand was succesvol overgebracht. - - - - - Gestopt - - - De overdracht is begonnen, maar op het moment is er geen vooruitgang. - - - - - Afgebroken - - - U hebt of op de knop Afbreken gedrukt of degene aan de andere kant heeft de overdracht afgebroken. - - - - - Mislukt - - - Er deed zich een fout voor en de overdracht was daarom niet succesvol. - - - - - In wachtrij - - - De overdracht werd geaccepteerd en zal beginnen zodra de software aan de andere kant bevestigt. - - - - - Opzoeken - - - &konversation; probeert het IP-adres van de afzender op te vragen. - - - - - Hervatten - - - Wanneer een overdracht is begonnen maar het bestand bestaat al op uw systeem, zal de gebruiker de melding krijgen dat het bestand al bestaat. U kunt dan kiezen om de overdracht te hervatten. - - - - - - - - -Wanneer iemand u een bestand wil verzenden wordt het tabblad DCC-status aangemaakt (wanneer die nog niet bestond). Klik op het tabblad om de inhoud te kunnen zien. Klik op het bestand om het te selecteren, klik daarna op deze knop om het bestand te accepteren zodat de overdracht zal beginnen. Opmerking: U kunt er voor kiezen om bestanden van anderen automatisch te laten accepteren door &konversation;. Dit kunt u doen door naar InstellingenKonversation instellenDCC-instellingen te gaan. - - - - - -Wanneer u problemen ondervindt bij het verzenden of ontvangen van bestanden kan het zijn dat uw firewall de DCC-poorten blokkeert. Zie daarvoor Vraag en antwoord. - - - - - - -Integratie met &kaddressbook; - -U kunt een schermnaam koppelen aan een contactpersoon in uw adresboek. Wanneer u dat doet zal &konversation; de werkelijke naam tonen achter de schermnaam in de namenlijst. - -Om een schermnaam te koppelen aan een contactpersoon in &kaddressbook; klikt u met de rechter muisknop op de schermnaam in de namenlijst van het hoofdvenster. Kies voor Whois om de informatie over die schermnaam in beeld te krijgen. Klik daarna weer met de rechter muisknop op de schermnaam en kies dan voor Adresboekassociaties. Er komt een submenu. Wanneer de schermnaam nog niet in uw adresboek staat kiest u voor Nieuw contact aanmaken. Het venster Contact bewerken komt in beeld. - - - -Het venster Contact bewerken. - - - - - - - - - - - - - Het venster Contact bewerken. - - - - - - - - -De schermnaam is al automatisch aangevuld. Wanneer u de werkelijke naam weet van die persoon dient u deze in te vullen in plaats van de schermnaam. - - -Opmerking: de schermnaam komt hier niet in beeld. In plaats daarvan, .. - - - -Klik hier. De dialoog Instant messenger-adressen bewerken wordt geopend. - - - - - - - De dialoog Instant messenger-adres bewerken. - - - - - - De dialoog Instant messenger-adressen bewerken. - - - - - -Merk op dat &konversation; de schermnaam invult onder het protocol IRC. - -Raadpleeg het handboek van &kaddressbook; voor meer informatie over hoe u het &kde;-adresboek gebruikt. - -Vul de extra gegevens over de schermnaam die u weet in en klik op OK. De werkelijke naam wordt in de namenlijst van &konversation; achter de schermnaam getoond. De werkelijke naam komt ook in beeld wanneer de muis boven de schermnaam blijft stilstaan. - -Wanneer de schermnaam eenmaal gekoppeld is aan het adresboek kunt u met de rechter muisklik daarop klikken en de gegevens van het contactpersoon bewerken, de koppeling verwijderen of de koppeling ergens anders naar laten verwijzen. - -Wanneer u een schermnaam gekoppeld hebt aan een contactpersoon zullen schermnaamswijzigingen automatisch doorgegeven worden wanneer u &konversation; op dat moment draait. Het zal ook de oorspronkelijke koppeling behouden. - -Wanneer u een schermnaam koppelt aan het adresboek in &kopete; zal deze koppeling ook zichtbaar zijn in &konversation; en omgekeerd. - -Opmerking: Het is mogelijk om meer dan één schermnaam te selecteren in de namenlijst, er met de rechter muisknop op te klikken en zo meerdere koppelingen tegelijkertijd aanmaken. - - - - - - -Alle &URL;sen verzamelen en opslaan die in de berichten voorkomen - -In een kanaal kan het voorkomen dat een gebruiker een interessant &URL; doorgeeft. U kunt daarop dubbelklikken zodat &konversation; de juiste toepassing start voor dat &URL;. Welke toepassing gestart zal worden hangt af van het MIME-type van het &URL;. Een &URL; dat begint met http: zal de standaard webbrowser van KDE starten en de pagina tonen. (U kunt ook een andere webbrowser opgeven.) Wanneer het &URL; van het scherm afschuift is het wat lastiger om die weer terug te vinden. &konversation; houdt een lijst bij van alle URL-adressen die voorbij gekomen zijn. Om deze optie te bekijken gaat u in het hoofdmenu naar VensterURL-lijst. Er komt een nieuw tabblad in beeld met de URL-lijst. - - - -De URL-lijst. - - - - - - - - - - - - - - - - De URL-lijst. - - - - - - - - -Dit is de lijst met URL-adressen die &konversation; is tegengekomen sinds het gestart is. De kolom Schermnaam bevat de schermnaam die dat &URL; vermeldde. Wanneer de schermnaam leeg is, zal dat betekenen dat dit adres in de serverberichten staat. (URL-adressen die in deelname- en verlaatberichten staan worden hier niet vermeld.) Klik op een &URL; om het te selecteren. - -Klik hier om een toepassing te koppelen aan het geselecteerde &URL;-adres. De uitgevoerde toepassing hangt af van het &MIME;-type van het &URL;. Wanneer u bijvoorbeeld een &URL; hebt dat begint met http: zal het uw standaard webbrowser starten. U kunt bij webpagina's aangeven welke webbrowser u wilt gebruiken. - -Klik hier om het geselecteerde &URL; naar het &kde;-klembord te kopiëren. - -Klik hier om het geselecteerde &URL; uit de lijst te verwijderen. - -Klik hier om de lijst met de URL-adressen naar een bestand te schrijven. - -Klik hier om de lijst te wissen. - - - - - - - - - -Het instellen van uw voorkeursbrowser - -Wanneer u op het geselecteerde URL-adres klikt in &konversation; zal het de standaard &kde;-toepassing uitvoeren die gekoppeld is aan dat &MIME;-type. Wanneer u bijvoorbeeld klikt op een &URL; dat begint met http zal &konqueror; uitgevoerd worden zodat de webpagina getoond wordt. U kunt ook een andere toepassing kiezen, zoals Mozilla. - -Om een andere webbrowser te kiezen gaat u naar Instellingen&konversation; instellen. Het scherm Instellingen wizigen komt in beeld. - - - -Het venster Webbrowser - - - - - - - - - - - - - Het venster Webbrowser - - - - - - - - -Klik hier om het scherm Webbrowser te tonen. - -Klik hier om aan te geven dat u een andere webbrowser wilt gebruiken. - -Voer het commando in die uw gewenste webbrowser start. Wanneer u dan op een &URL; klikt, zal %u vervangen worden door het &URL;. - - - - -Tip: (alleen &UNIX;-systemen): Het standaard commando is mozilla '%u', dat een nieuwe sessie van Mozilla opstart wanneer u op het &URL; klikt. Wanneer u liever hebt dat Mozilla een pagina in een nieuw tabblad opent maakt u het volgende bestand aan: - - -#!/bin/sh -mozilla -remote "openURL($@, new-tab)" || exec mozilla "$@"; - - - -Noem het bestand moz, plaats het in uw PATH-variabele en zorg dat het uitvoerbaar is (chmod a+x moz). Voer dan moz '%u' in voor het webbrowsercommando dat in het scherm hier boven is afgebeeld. - -Opmerking: De instelling webbrowser is niet van toepassing op een &URL; dat begint met mailto:. Bij mailto: wordt namelijk het standaard ingestelde e-mailprogramma van &kde; gestart. - -Klik op Toepassen om uw instellingen te bewaren. U moet bij iedere server een nieuwe verbinding starten voordat de instellingen van kracht worden. De eenvoudigste manier om dat te doen is door &konversation; af te sluiten en opnieuw te starten. - - - - - - -Kanaal- en conversatielogs markeren - -U kunt een markering aanbrengen in een kanaal of conversatie zodat u snel bepaalde informatie kunt terugvinden. U gaat dan naar Invoegen Herinneringslijn in het hoofdmenu, of druk op &Ctrl;R. Er komt nu onderaan de berichtenlijst een horizontale lijn in beeld. Deze lijn zal meescrollen met de rest van de tekst. - -Om in ieder kanaal of conversatie een herinneringslijn aan te brengen, gaat u in het hoofdmenu naar Instellingen Konversation instellen, vervolgens kiest u voor Gedrag en klikt u op Chatvenster. Schakel daarna de optie Herinneringslijn tonen in alle kanalen/conversaties in. - -Om &konversation; automatisch een herinneringslijn in te laten voegen wanneer u het commando /away msg invoert kunt u de sectie Uw identiteit instellen raadplegen. - - - - - - -Loggen - -Wanneer het loggen aan staat, zal &konversation; een logboek bijhouden voor iedere server, kanaal en privégesprek (query). Iedere sessie wordt opgeslagen in een logbestand op de harde schijf. Wanneer u een bepaalde sessie opnieuw opent zal &konversation; deze gewoon toevoegen aan het logboek. Het logboek groeit totdat de maximale bestandsgrootte is bereikt (zie hieronder). Wanneer deze grens is bereikt zullen de oudste berichten verloren gaan. - -Wanneer u een sessie opnieuw opent zullen er ongeveer 1024 lettertekens van de vorige sessie in beeld komen. - -Tijdens zo'n sessie verdwijnen de berichten bovenaan het scherm. U kunt terugscrollen om deze berichten alsnog te zien. U kunt eventueel ook de oudste berichten verwijderen zodat er niet gescrolld kan worden, dit scheelt wat geheugen. Dit is de zogenaamde Terugloopgrens. Berichten die van het scherm zijn verdwenen door deze optie zijn nog steeds beschikbaar in het logbestand, wanneer het loggen aan staat. - -Om een logbestand van een sessie te bekijken, opent u het betreffende tabblad en gaat u naar Venster Logbestand openen. Er komt een nieuw tabblad in beeld waarin het logbestand is afgebeeld. - - - -Logbestand - - - - - - - - - - - - - - - Logbestand - - - - - - - -De berichten die in uw logbestand staan worden hier getoond. Het oudste bericht wordt bovenaan getoond en het laatste bericht onderaan. -Klik op deze knop om het logbestand op te slaan in een ander bestand. -Klik hier om de logbestandweergave te vernieuwen. Wanneer u een logbestand aan het bekijken bent zullen nieuwere berichten van de betreffende sessie niet automatisch toegevoegd worden aan de logbestandweergave. Klik op deze knop om de meest recente berichten te tonen. -Klik hier om het logbestand te wissen. -Gebruik dit vakje om de maximale grootte van een logbestand op te geven. Deze instelling heeft nog geen effect zolang u &konversation; niet opnieuw opstart. Ieder logbestand kan een eigen instelling hebben. - - - -De Terugloopgrens kunt u veranderen door naar InstellingenKonversation instellen te gaan. Ga daarna naar het onderdeel Gedrag en klik op Conversatievenster. Het vakje Terugloopgrens komt in beeld. Wanneer u dit op Onbeperkt zet zullen berichten niet verwijderd worden als ze uit beeld verdwijnen. - -U kunt de loginstellingen wijzigen door naar InstellingenKonversation instellen gaat, kiest voor Gedrag en vervolgens naar Loginstellingen te gaan. - - - - - - -Commando's in &konversation; - -De volgende commando's worden door &konversation; verwerkt en kunnen verschillen met de standaard &irc;-commando's. Items die tussen vierkante haken staan zijn optioneel. Items die worden gescheiden door een | zijn alternatieven voor het commando. Commando's die hier niet worden besproken zullen direct naar de server verzonden worden. - - - - - -/me bericht -Verzendt het bericht naar het kanaal, voorafgegaan door uw schermnaam. Wanneer uw schermnaam bijvoorbeeld Tux is, zal het commando /me maakt een kopje thee. als volgt in beeld komen: Tux maakt een kopje thee. Tenzij u een filter hebt aangemaakt voor zulke berichten kunt u - en alle andere aanwezigen in het kanaal - dit bericht zien. Dit soort berichten worden doorgaans gebruikt om een emotie uit te drukken of om te laten merken waar u ondertussen allemaal mee bezig bent. Wanneer u uw computer even achterlaat, maak dan gebruik van het commando /away. - - - -/ame msg -Gelijk aan het commando /me behalve dan dat het bericht naar alle open kanalen en conversaties van alle servers verzonden zal worden waarmee u in &konversation; verbonden bent. - - - -/join kanaal [wachtwoord] -Neemt deel aan een kanaal. Wanneer de server het toestaat en het kanaal nog niet bestaat, zal er een nieuw kanaal aangemaakt worden met u als operator. Wanneer een kanaal een wachtwoord vereist voor deelname, kunt u dat opgeven voor wachtwoord. De meeste kanaalnamen beginnen met # - - - -/j kanaal [wachtwoord] -Hetzelfde als het commando /join dat hierboven staat beschreven. - - - -/part [kanaal] [reden] -Verlaat een kanaal met een bepaalde reden en sluit het bijbehorende kanaaltabblad. U kunt in &konversation; in een kanaal- of conversatietabblad gewoon /part typen zodat u het betreffende tabblad kunt sluiten met de standaard reden die u in de instellingen hebt opgegeven. - - -/leave [kanaal] [reden] -Hetzelfde als het commando /part dat hierboven beschreven staat. - - -/quit -Wanneer dit opgegeven wordt in een willekeurig kanaal-, conversatie- of DCC-tabblad zal de verbinding met de bijbehorende server verbroken worden. - - -/notice schermnaam|kanaal bericht -Verzendt bericht naar de gebruiker met de schermnaam schermnaam of naar iedereen in het kanaal. Hier volgt een voorbeeld van wat er in het kanaaltabblad komt te staan - -[17:14] [Notice] Sending notice "Ik denk dat ik het begrijp" to #konversation - -Dit zullen de ontvangers zien - -[17:15] [Notice] -Eisfuchs- Ik denk dat ik het begrijp - - - - -/queryschermnaam -Maakt een nieuw tabblad met de schermnaam van de gebruiker zodat u een privégesprek kunt beginnen. In &irc;-termen wordt dit vaak een query genoemd. Alles wat hier wordt geschreven is alleen zichtbaar voor u en uw gesprekspartner. U kunt meer dan één schermnaam invoeren, gescheiden door spaties, zodat er een conversatietabblad geopend wordt voor iedere schermnaam. - - - -/msg schermnaam|kanaal bericht -Verzendt een privébericht naar de gebruiker met schermnaam schermnaam of naar alle gebruikers in een bepaaldkanaal. In tegenstelling tot /query wordt hier geen nieuw tabblad geopend. Wanneer bericht begint met /me zal het bericht op dezelfde manier in beeld komen als bij het commando /me is uitgelegd. - -Voorbeelden - -/msg Eisfuchs Ik wil wat meer weten over het commando msg - -/msg #konversation De nieuwe versie van Konversation is beschikbaar! - -/msg Eisfuchs /me is het handboek nu aan het compileren. - - - - - -/smsg schermnaam|kanaal bericht -Hetzelfde als /msg behalve dat het bericht niet getoond wordt in het scherm. Dit is handig om bijvoorbeeld wachtwoorden of andere gevoelige informatie uit te wisselen, zonder dat deze in beeld komen of gelogd worden. - - - -/amsg schermnaam|kanaal bericht -Net zoals het commando /msg van hierboven, alleen zal het bericht naar alle open kanalen en conversaties van alle servers verzonden worden waarmee u bent verbonden in &konversation;. - - - -/op schermnaam -Wanneer u een kanaaltabblad betreedt wordt geprobeerd de schermnaam operatorrechten te geven voor het kanaal. Dit kan mislukken wanneer u onvoldoende toegangsrechten hebt (u dient namelijk zelf kanaaloperator te zijn). U kunt meer dan één schermnaam opgeven, gescheiden door een spatie. - - - -/deop schermnaam -Wanneer dit wordt ingevoerd in een kanaaltabblad zal het de kanaaloperatorrechten afnemen van deze schermnaam. U kunt meer dan één schermnaam opgeven, gescheiden door spaties. - - - -/oper [schermnaam] -Geeft de gebruiker met een bepaalde schermnaam &irc;-operatorrechten. Dit werkt alleen wanneer de schermnaam wordt vermeld in de O-regel van de server. &irc;-operators hebben de rechten om /kill uit te voeren op een schermnaam, /connect te doen om servers aan het netwerk te koppelen en nog wat meer. Wanneer de schermnaam niet is opgegeven wordt geprobeerd om uzelf deze rechten te geven. In beide gevallen zal gevraagd worden om uw &irc;-operator gebruikersnaam en wachtwoord. - - - -/voice schermnaam -In sommige kanalen (met een +m-vlag) kunnen alleen de mensen spreken met voice. Dit commando probeert een schermnaam voicerechten te geven. U dient hievoor kanaaloperator te zijn om dit commando uit te kunnen voeren. Dit wordt vooral gebruikt door operators in een gemodereerd kanaal. - - - -/unvoice schermnaam -Neemt de voicerechten van een bepaalde schermnaam af in een kanaal. - - - -/topic [kanaal] [bericht] -Probeert het onderwerp van een kanaal te veranderen in bericht. Wanneer dit in een kanaaltabblad wordt opgegeven kan de parameter kanaal weggelaten worden, zodat het van toepassing is op het kanaal van het huidige tabblad. Wanneer bericht wordt weggelaten wordt het huidige onderwerp van het kanaal getoond. Dit hoeft niet altijd goed te gaan, bijvoorbeeld wanneer u onvoldoende toegangsrechten hebt. - - - -/away reden -Wanneer iemand u een privébericht of uitnodiging verzendt, zal diegene een melding krijgen dat u afwezig bent van uw computer met de volgende reden. Om uzelf weer als aanwezig naar buiten te brengen, voert u het commando /away uit zonder een reden op te geven. - - - -/aaway reden -Zoals het commando /away dat hierboven is beschreven, behalve dan dat het naar alle servers verzonden zal worden waarmee u in &konversation; verbonden bent. - - - -/invite schermnaam [kanaal] -Nodigt de gebruiker met een bepaalde schermnaam uit om deel te nemen aan een kanaal. Dit commando is vooral handig bij kanalen waarbij je alleen naar binnen komt op uitnodiging. Wanneer dit in een kanaaltabblad opgegeven wordt, kan de parameter kanaal weggelaten worden. - - - -/exec script [parameters] -Voert het voor &konversation; geschikte shellscript genaamd script uit met de (optionele) parameters. Zie Script-functionaliteit voor meer informatie over het gebruiken en schrijven van scripts. -Voorbeelden: - -/exec kdeversion - -Verzendt uw &kde;- en &Qt;-versienummers naar het kanaal. - -/exec cmd uname -a - -Hiermee wordt uw &Linux;-versie naar het kanaal verzonden. - - - - - -/notify [schermnaam] -Voegt of verwijdert schermnaam van uw lijst van gevolgde online schermnamen. Wanneer de schermnaam zich al in de lijst bevindt zal het uit de lijst verwijderd worden, anders wordt deze toegevoegd. Wanneer de schermnaam weggelaten wordt, wordt de huidige lijst van schermnamen getoond. - - - - -/prefs [lijst|groep] [lijst|optie] [waarde] -Toont of wijzigt instellingen van &konversation; zonder dat u naar het instellingenvenster hoeft te gaan. Wanneer een parameter spaties bevat dient u deze te met aanhalingstekens eromheen in te voeren. - -Voorbeelden: - -/prefs lijst - -toont de beschikbare optiegroepen. - -Lijst van /prefs "General Options" - -Toont de opties die bij General Options (algemene opties) horen met de bijgehorende waardes. - -/prefs "General Options" ShowTrayIcon - -Toont de huidige waarde van de instelling voor het tonen van het &konversation;-pictogram in het systeemvak. - -/prefs "General Options" ShowTrayIcon false - -Schakelt de weergave van het &konversation;-pictogram in het systeemvak uit. - - - - -/kick schermnaam reden -Wanneer dit in een kanaaltabblad wordt gebruikt zal de gebruiker met een schermnaam uit het kanaal getrapt worden met de volgende reden. Wanneer de reden niet wordt opgegeven zal de standaard reden ingevuld worden die ingevuld is in de Instellingen. Dit commando kan alleen uitgevoerd worden in een kanaaltabblad. - - - -/ban [-host|-domain|-userhost|-userdomain] [kanaal] gebruiker|masker -Probeert een gebruiker of masker uit een kanaal te bannen. Wanneer dit in een kanaaltabblad wordt uitgevoerd, kan het kanaal worden weggelaten. Voor meer informatie over hosts, domeinen en maskers kunt u de documentatie op irchelp.org raadplegen. Om een huidige banlijst te krijgen van een kanaal, voert u /mode kanaal b in. - - - -/unban [kanaal] patroon -Draait een ban-actie in een kanaal terug. Wanneer het in een kanaaltabblad ingevoerd wordt, kan de parameter kanaal weggelaten worden. - - - -/ignore [-all] schermnaam -Voegt een schermnaam toe aan uw negeerlijst. U kunt meer dan één schermnaam opgeven, gescheiden door spaties. Kanaalberichten van gebruikers op de negeerlijst zullen niet getoond worden. Wanneer u bovendien de parameter -all meegeeft zullen alle berichttypes (queries, meldingen, &CTCP;, DCC en uitzonderingen) van deze gebruiker ook genegeerd worden. - - - -/quote commando -Verzendt de uitvoer van het commando naar de server. - - - -/say bericht -Wanneer dit in een kanaaltabblad wordt opgegeven, wordt dit bericht naar het kanaal verzonden. Dit is hetzelfde als het invoeren van bericht in de invoerregel van het kanaal. Dit is handig voor het verzenden van &irc;-commando's wanneer u geen commando wilt uitvoeren. Twee commandotekens achter elkaar (//) zijn equivalent aan /say. Wordt ook gebruikt door scripts om berichten te verzenden. - - - -/raw [open|close] -Zet de logmodus van de server op pure modus (open) of zet deze modus weer uit (close). Wanneer geen van beide opties is gegeven zal open gebruikt worden. In de pure modus zal iedere bericht van de server in de serverlog komen in &irc;-formaat. - - - -/konsole -Opent een nieuw tabblad met &kde; &konsole;. - - - -/server [url-adres] [wachtwoord] -Verbindt met de server op een bepaald url-adres. Wanneer het url-adres wordt weggelaten wordt er een verbinding met de server gemaakt dat bij het huidige tabblad hoort. Dit is handig bij het opnieuw verbinden met de server wanneer de verbinding is verbroken. Wanneer de server een wachtwoord nodig heeft om te kunnen verbinden, kunt u dat ook eventueel opgeven. Wanneer de server een ander poortnummer nodig heeft dan 6667 kunt u dat op de volgende manier achter het url-adres plaatsen: irc.kde.org:6665. - - - -/dcc SEND schermnaam [bestandsnaam] -Verzendt een bestand aan de hand van een bestandsnaam naar de gebruiker die een zekere schermnaam heeft. Wanneer u de bestandsnaam niet invult zal er een dialoogvenster in beeld komen waarin u dit kunt opgeven. - - - -/dcc -Opent een nieuw tabblad met een DCC-statusvenster. - - - -/ctcp schermnaam|kanaal ping -Een PING-verzoek wordt naar de schermnaam of het kanaal verzonden. Dit is handig om te bepalen hoeveel vertraging er zit tussen u en degene waarmee u praat. Wanneer u een PING-verzoek naar een kanaal stuurt kunt u zien hoeveel vertraging er is tussen u en de server. - - - -/ctcp schermnaam|kanaal bericht -Verzendt een bericht naar een bepaalde schermnaam of naar alle gebruikers in een kanaal. Dit is gelijkwaardig aan het commando /msg dat hierboven staat beschreven, behalve dan dat het bericht via het CTCP-protocol wordt verzonden. Het antwoord van de andere kant hangt af van het &irc;-programma dat die gebruiker gebruikt. Wanneer u bijvoorbeeld praat met een andere &konversation;-gebruiker, zal het commando /ctcp Eisfuchs TIME de systeemtijd teruggeven van Eisfuchs' computer. Een andere mogelijkheid is /ctcp bram85 VERSION, welke het versienummer van &konversation; zal teruggeven die bram85 op dat moment aan het draaien is. - - - - - - - - - - -Scripten - -Bij &konversation; wordt een aantal handige scripts meegeleverd die u vanuit het programma kunt aanroepen. Om een script uit te voeren in een kanaal-, conversatie- of servertabblad dient u het commando in de volgende vorm te typen: - -/exec script [parameters] - -welke het script genaamd script uitvoert met (optionele) parameters. - -Wanneer u bijvoorbeeld het volgende commando in een kanaal typt - -/exec kdeversion - -om uw &kde;- en &Qt;-versienummer naar het kanaal te sturen. - -/exec cmd uname -a - -voert het script cmd uit met de parameter uname -a. Hiermee zendt u uw &Linux;-versienummer naar het kanaal. - -Om een lijst te krijgen van alle beschikbare scripts typt u het volgende commando in een &konsole;-scherm. - -ls $KDEDIR/share/apps/konversation/scripts - -U kunt ook uw eigen scripts schrijven. Scripts zijn shellscripts en kunnen in iedere shelltaal geschreven worden, zoals bash, perl of python. Wanneer &konversation; een script uitvoert, zijn de eerste drie parameters aan het script als volgt: - - - -Het poortnummer van de &irc;-server van het tabblad waarin het commando /exec werd aangeroepen. - - -Het adres van de server. - -De kanaalnaam. - - - -Hier is een voorbeeldscript (cmd). - - -#!/bin/sh - -# Voert een commando uit en zendt de uitvoer naar Konversation. - -PORT=$1; -SERVER=$2; -TARGET=$3; -shift;shift;shift; - -$@ | while read line; do dcop $PORT Konversation say $SERVER "$TARGET" "$@: $line"; done - - - -Merk op dat het script &DCOP; gebruikt om te kunnen communiceren met &konversation;. Het commando say zorgt ervoor dat de uitvoer als een normaal bericht in het kanaal belandt. Om een bepaalde bericht in een tabblad te krijgen zonder dat de andere gebruikers het krijgen te zien, gebruikt u info. Neem eens een kijkje in de bestaande scripts om te kijken hoe u deze kunt schrijven. - -Om een zelfgeschreven script uit te voeren dient u het te installeren door het in de map $KDEDIR/share/apps/konversation/scripts of in $HOME/.kde/share/apps/konversation/scripts te plaatsen. U dient het bestand ook uitvoeringsrechten te geven, bijvoorbeeld met chmod a+x mijnscript. - - - - - - - - -Menu's - - - - - - -Het hoofdvenster van &konversation; - - -Het menu Bestand - - - - F2BestandServerlijst - Toont de lijst met servers en kanalen. - - - F7BestandSnel verbinden - Toont het venster Snelverbinden om een verbinding met een server te maken. - - - Bestand Opnieuw verbinden - Verbindt opnieuw met alle servers waarvan de verbinding is verbroken. - - - &Ctrl;J Bestand Deelnemen aan kanaal - Toont een dialoogvenster waarin u de naam van het kanaal kunt invoeren waaraan u wilt deelnemen. Dit is equivalent aan het typen van /join#kanaalnaam in een kanaal- of servervenster. - - - &Alt;&Ctrl;QBestand Globaal op afwezig zetten - Verandert uw status naar afwezig in alle kanalen. - - - &Ctrl;Q Bestand Afsluiten - Sluit &konversation; af. - - - - - - -Het menu <guimenu ->Bewerken</guimenu -> - - - - &Ctrl;F Bewerken Zoeken - - Zoekt naar een bepaald tekstgedeelte in het huidige scherm. - - - - F3 BewerkenVolgende zoeken - - Zoekt opnieuw naar het vorig gevraagde tekstgedeelte in het huidige scherm. - - - - &Ctrl;L Bewerken Venster wissen - - Wist het huidige scherm. - - - - &Ctrl;&Shift;L BewerkenAlle vensters wissen - - Leegt de inhoud van alle vensters. - - - - - - - -Het menu <guimenu ->Invoegen</guimenu -> - - - - &Ctrl;K Invoegen &irc;-kleur - - Zie Kleurberichten verzenden. - - - - &Ctrl;R InvoegenHerinneringslijn - - Zie Kanaal- en conversatielogs markeren. - - - - &Alt;&Shift;CInvoegenSpeciaal teken - - Dit kunt u gebruiken om speciale tekens in te voeren, zoals buitenlandse tekens. - - - - - - - -Het menu <guimenu ->Bladwijzers</guimenu -> - - - - &Ctrl;BBladwijzersBladwijzer toevoegen - - Maakt een bladwijzer aan voor het huidige netwerk en kanaal - - - - BladwijzersBladwijzers bewerken - - Opent de bladwijzerbewerker - - - - BladwijzersNieuwe bladwijzermap - - Maakt een nieuwe bladwijzermap aan - - - - - - - -Het menu <guimenu ->Instellingen</guimenu -> - - - - &Ctrl;M Instellingen Menubalk verbergen - - Verbergt het hoofdmenu. Gebruik de sneltoets &Ctrl;M om deze weer in beeld te krijgen. - - - - Instellingen Werkbalk verbergen - - Verbergt de werkbalk. - - - - Instellingen Statusbalk verbergen - - Verbergt de statusbalk die onderaan het hoofdvenster staat. - - - - Instellingen Identiteiten - Toont het venster Identiteiten waarin u uw indentiteit kunt instellen. - - - Instellingen Sneltoetsen instellen - - Maakt het mogelijk om sneltoetsen voor &konversation; in te stellen. - - - - Instellingen Werkbalken instellen - - Maakt het mogelijk om knoppen aan de werkbalk van &konversation; toe te voegen of te verwijderen. - - - - Instellingen Notificaties instellen - - Toont het venster Notificatie-instellingen. - - - - Instellingen &konversation; instellen - - Toont het venster Instellingen veranderen. - - - - - - - -Het menu <guimenu ->Venster</guimenu -> - - - - &Ctrl;. Venster Vorige tabblad - - Toont het scherm dat hoort bij het vorige tabblad. - - - - &Ctrl;, Venster Volgende tabblad - - Toont het scherm dat hoort bij het volgende tabblad. - - - - &Ctrl;W Venster Tabblad sluiten - - Sluit het huidige scherm. Wanneer een kanaaltabblad gesloten wordt, verlaat u ook het bijbehorende kanaal. Wanneer u een tabblad met serverberichten sluit, worden alle open kanalen op die server afgesloten en wordt de verbinding met de server verbroken. - - - - F11 Venster Alle open conversaties sluiten - - Sluit alle privégesprekken (conversaties). - - - - &Ctrl;HVensterNamenlijst verbergen - - Verbergt (of toont) de namenlijst in kanaalvensters. - - - - F4VensterGevolgde schermnamen online - - Toont het venster Gevolgde schermnamen online. Zie Bijhouden wie er online is. - - - - F5VensterKanaallijst - - Toont een lijst met kanalen die op de server beschikbaar zijn. - - - - F6VensterURL-lijst - - Toont de URL-lijst. - - - - Venster Nieuwe Konsole - - Toont een nieuw terminalvenster. U kunt zoveel Konsole-tabbladen openen als u wilt. - - - - &Ctrl;OVensterLogbestand openen - - Toont een scherm met logberichten van het huidige tabblad. Werkt alleen in een kanaaltabblad, servertabblad en een conversatietabblad. Het loggen moet wel ingeschakeld zijn in het hoofdmenu onder InstellingenKonversation instellenGedragLoginstellingen. - - - - - - - -Het menu <guimenu ->Help</guimenu -> -&help.menu.documentation; - - - - - - - -Vraag en antwoord -&reporting.bugs; &updating.documentation; - - - -Wanneer ik &konversation; opstart wil ik verbinding maken met een server zonder dat ik daarna een kanaal open. Hoe doe ik dat? - - -In het venster Server bewerken dient u het tekstvak Kanaalnaam leeg te laten. - - - - - -&konversation; kan nergens een verbinding mee maken. Wat is er aan de hand? - - -Dit kan verschillende oorzaken hebben. - - -Controleer of u de Servernaam goed ingevuld hebt met de juiste Poort in de Serverlijst. - - -Controleer de uitvoer van de Serverberichten of er foutmeldingen in voorkomen. Wees de server de verbinding af vanwege een verkeerd wachtwoord? Of was het omdat de server een IDENTD nodig heeft en uw computer die niet voorzien heeft? Of heeft u gekozen om het SSL-protocol te gebruiken terwijl dat niet ondersteund wordt door de server? - - -Wanneer u achter een firewall zit, controleer of de juiste poorten zijn geopend. Om &konversation; te kunnen gebruiken moeten de volgende poorten geopend zijn: - - - -Uitgaand TCP 6667 (of de poort van de server waarmee u wilt verbinden) -Incoming TCP 113 (if the server requires IDENTD) - - - - -Voor meer informatie over verbindingsproblemen met &irc;-servers, zie irchelp.org. - - - - - - - - - -Wanneer ik naar Venster Kanaallijst ga, kan ik deze niet selecteren. Waarom is dat? - - -De optie Venster Kanaallijst wordt inactief wanneer het huidig geselecteerde tabblad geen kanaaltabblad is, bijvoorbeeld wanneer Gevolgde schermnamen online actief is. Om het weer op te laten lichten dient u terug te gaan naar een kanaal- of servertabblad. - - - - - - - - - - -Dankbetuigingen en licentie - -&konversation; -Programma copyright 2002-2005 door het &konversation;-team. -&konviwebsite; - -Medewerkers: -Dario Abatianni eisfuchs@tigress.com -Peter Simonsson psn@linux.se -Christian Muehlhaeuser chris@chris.de -John Tapsel john@geola.geo.uk -Ismail Donmez ismail.donmez@boun.edu.tr -Shintaro Matsuoka shin@shoegazed.org -Gary Cramblitt garycramblitt@comcast.net -Matthias Gierlings gismore@users.sourceforge.net -&Alex.Zepeda; garbanzo@hooked.net -Stanislav Karchebny berkus@users.sourceforge.net -Mickael Marchand marchand@kde.org - - - -Met dank aan: -Michael Goettsche michael.goettsche@kdemail.net -Benjamin Meyer ben+konversation@kdemail.net -Jacub Stachowski qbast@go2.pl -Sabastian Sariego segfault@kde.cl -Olivier Bedard www.konversation.org hosting -Frauke Oster frauke@frsv.de -Lucijan Busch lucijan@kde.org -Sascha Cunz mail@sacu.de -Steve Wollkind steve@njord.org -Thomas Nagy thomas.nagy@eleve.emn.fr -Tobias Olry tobias.olry@web.de -Ruud Nabben r.nabben@gawab.com - - - -Documentatie copyright © 2003-2005 Gary R. Cramblitt garycramblitt@comcast.net - -&vertaling.bram; -&underFDL; &underGPL; - - -Installatie - - - - -Hoe &konversation; te verkrijgen -&install.intro.documentation; De laatste versies van &konversation; (inclusief broncode en instructies voor installatie) kunnen verkregen worden op de website van &konversation;. - - - - - - -Vereisten - - - -Om &konversation; te kunnen gebruiken hebt u &kde; 3.2 of later nodig en een netwerkverbinding. Bij eerdere &kde;-versies kunnen sommige mogelijkheden niet gebruikt worden. Wanneer u &konversation; gebruikt achter een firewall, zie dan Vraag en antwoord Wanneer u gebruik wilt maken van het SSL-protocol hebt u ook OpenSSL nodig. - - - - -&documentation.index; - - - Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/kimproxy_create_screen2.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/kimproxy_create_screen2.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/kimproxy_create_screen_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/kimproxy_create_screen_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/logviewer_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/logviewer_co.png differ diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/Makefile.am /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/Makefile.am --- konversation-1.0.1/doc/nl/Makefile.am 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/doc/nl/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -KDE_LANG = nl -KDE_DOCS = konversation diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/Makefile.in --- konversation-1.0.1/doc/nl/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/doc/nl/Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,606 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# KDE tags expanded automatically by am_edit - $Revision: 483858 $ -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -subdir = doc/nl -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -#>+ 1 -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -ARTSCCONFIG = @ARTSCCONFIG@ -AUTOCONF = @AUTOCONF@ -AUTODIRS = @AUTODIRS@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CONF_FILES = @CONF_FILES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DCOPIDL = @DCOPIDL@ -DCOPIDL2CPP = @DCOPIDL2CPP@ -DCOPIDLNG = @DCOPIDLNG@ -DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DOXYGEN = @DOXYGEN@ -DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ -DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ -GMSGFMT = @GMSGFMT@ -HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ -KCONFIG_COMPILER = @KCONFIG_COMPILER@ -KDECONFIG = @KDECONFIG@ -KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ -KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ -KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ -KDE_HAVE_DOT = @KDE_HAVE_DOT@ -KDE_INCLUDES = @KDE_INCLUDES@ -KDE_LDFLAGS = @KDE_LDFLAGS@ -KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ -KDE_MT_LIBS = @KDE_MT_LIBS@ -KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ -KDE_PLUGIN = @KDE_PLUGIN@ -KDE_RPATH = @KDE_RPATH@ -KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ -KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ -KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ -KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ -KDE_USE_FPIE = @KDE_USE_FPIE@ -KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ -KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ -KDE_USE_PIE = @KDE_USE_PIE@ -KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ -LDFLAGS = @LDFLAGS@ -LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ -LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ -LIBCOMPAT = @LIBCOMPAT@ -LIBCRYPT = @LIBCRYPT@ -LIBDL = @LIBDL@ -LIBJPEG = @LIBJPEG@ -LIBOBJS = @LIBOBJS@ -LIBPNG = @LIBPNG@ -LIBPTHREAD = @LIBPTHREAD@ -LIBRESOLV = @LIBRESOLV@ -LIBS = @LIBS@ -LIBSM = @LIBSM@ -LIBSOCKET = @LIBSOCKET@ -LIBTOOL = @LIBTOOL@ -LIBUCB = @LIBUCB@ -LIBUTIL = @LIBUTIL@ -LIBZ = @LIBZ@ -LIB_ARTS = @LIB_ARTS@ -LIB_KAB = @LIB_KAB@ -LIB_KABC = @LIB_KABC@ -LIB_KDECORE = @LIB_KDECORE@ -LIB_KDED = @LIB_KDED@ -LIB_KDEPIM = @LIB_KDEPIM@ -LIB_KDEPRINT = @LIB_KDEPRINT@ -LIB_KDEUI = @LIB_KDEUI@ -LIB_KDNSSD = @LIB_KDNSSD@ -LIB_KFILE = @LIB_KFILE@ -LIB_KFM = @LIB_KFM@ -LIB_KHTML = @LIB_KHTML@ -LIB_KIMIFACE = @LIB_KIMIFACE@ -LIB_KIMPROXY = @LIB_KIMPROXY@ -LIB_KIO = @LIB_KIO@ -LIB_KJS = @LIB_KJS@ -LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ -LIB_KPARTS = @LIB_KPARTS@ -LIB_KSPELL = @LIB_KSPELL@ -LIB_KSYCOCA = @LIB_KSYCOCA@ -LIB_KUNITTEST = @LIB_KUNITTEST@ -LIB_KUTILS = @LIB_KUTILS@ -LIB_POLL = @LIB_POLL@ -LIB_QPE = @LIB_QPE@ -LIB_QT = @LIB_QT@ -LIB_SMB = @LIB_SMB@ -LIB_X11 = @LIB_X11@ -LIB_XEXT = @LIB_XEXT@ -LIB_XRENDER = @LIB_XRENDER@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ -MCOPIDL = @MCOPIDL@ -MEINPROC = @MEINPROC@ -MOC = @MOC@ -MSGFMT = @MSGFMT@ -NOOPT_CFLAGS = @NOOPT_CFLAGS@ -NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -QTDOCDIR = @QTDOCDIR@ -QTE_NORTTI = @QTE_NORTTI@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LDFLAGS = @QT_LDFLAGS@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -TOPSUBDIRS = @TOPSUBDIRS@ -UIC = @UIC@ -UIC_TR = @UIC_TR@ -USER_INCLUDES = @USER_INCLUDES@ -USER_LDFLAGS = @USER_LDFLAGS@ -USE_EXCEPTIONS = @USE_EXCEPTIONS@ -USE_RTTI = @USE_RTTI@ -USE_THREADS = @USE_THREADS@ -VERSION = @VERSION@ -WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ -XGETTEXT = @XGETTEXT@ -XMLLINT = @XMLLINT@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_INCLUDES = @X_INCLUDES@ -X_LDFLAGS = @X_LDFLAGS@ -X_PRE_LIBS = @X_PRE_LIBS@ -X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -all_includes = @all_includes@ -all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -kde_appsdir = @kde_appsdir@ -kde_bindir = @kde_bindir@ -kde_confdir = @kde_confdir@ -kde_datadir = @kde_datadir@ -kde_htmldir = @kde_htmldir@ -kde_icondir = @kde_icondir@ -kde_includes = @kde_includes@ -kde_kcfgdir = @kde_kcfgdir@ -kde_libraries = @kde_libraries@ -kde_libs_htmldir = @kde_libs_htmldir@ -kde_libs_prefix = @kde_libs_prefix@ -kde_locale = @kde_locale@ -kde_mimedir = @kde_mimedir@ -kde_moduledir = @kde_moduledir@ -kde_qtver = @kde_qtver@ -kde_servicesdir = @kde_servicesdir@ -kde_servicetypesdir = @kde_servicetypesdir@ -kde_sounddir = @kde_sounddir@ -kde_styledir = @kde_styledir@ -kde_templatesdir = @kde_templatesdir@ -kde_wallpaperdir = @kde_wallpaperdir@ -kde_widgetdir = @kde_widgetdir@ -kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -qt_includes = @qt_includes@ -qt_libraries = @qt_libraries@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ -x_includes = @x_includes@ -x_libraries = @x_libraries@ -xdg_appsdir = @xdg_appsdir@ -xdg_directorydir = @xdg_directorydir@ -xdg_menudir = @xdg_menudir@ -KDE_LANG = nl -KDE_DOCS = konversation -#>- all: all-am -#>+ 1 -all: docs-am all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) -#>- @for dep in $?; do \ -#>- case '$(am__configure_deps)' in \ -#>- *$$dep*) \ -#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -#>- && exit 0; \ -#>- exit 1;; \ -#>- esac; \ -#>- done; \ -#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl/Makefile'; \ -#>- cd $(top_srcdir) && \ -#>- $(AUTOMAKE) --gnu doc/nl/Makefile -#>+ 12 - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/nl/Makefile - cd $(top_srcdir) && perl admin/am_edit doc/nl/Makefile.in -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -#>- distdir: $(DISTFILES) -#>+ 1 -distdir: distdir-nls $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -#>- uninstall: uninstall-am -#>+ 1 -uninstall: uninstall-docs uninstall-nls uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -#>- clean: clean-am -#>+ 1 -clean: kde-rpo-clean clean-am - -#>- clean-am: clean-generic clean-libtool mostlyclean-am -#>+ 1 -clean-am: clean-docs clean-bcheck clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -#>- install-data-am: -#>+ 1 -install-data-am: install-docs install-nls - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: - -#>+ 2 -KDE_DIST=identities_gen_co.png channellist_screen_co.png notification_screen_co.png identities_away_co.png quickbuttons_screen.png quickconnect_screen.png notifylist_screen_co.png index.docbook kimproxy_create_screen_co.png webbrowser_screen_co.png colorchooser_screen.png nicksonline_co.png logviewer_co.png dccstatus_screen_co.png identities_adv_co.png Makefile.in urlcatcher_screen_co.png osd_screen_co.png channel_screen_tour_co.png kimproxy_create_screen2.png checkidentities.png first_channel_co.png addserver_co.png serverlist_co.png addnetwork_co.png Makefile.am first_serverlist_co.png addchannel.png - -#>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) addchannel.png kimproxy_create_screen2.png identities_away_co.png notification_screen_co.png urlcatcher_screen_co.png channel_screen_tour_co.png channellist_screen_co.png kimproxy_create_screen_co.png notifylist_screen_co.png logviewer_co.png addnetwork_co.png first_serverlist_co.png nicksonline_co.png webbrowser_screen_co.png osd_screen_co.png colorchooser_screen.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png dccstatus_screen_co.png quickbuttons_screen.png identities_gen_co.png index.docbook first_channel_co.png addserver_co.png - @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi - -docs-am: index.cache.bz2 - -install-docs: docs-am install-nls - $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation - @if test -f index.cache.bz2; then \ - echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/; \ - $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/; \ - elif test -f $(srcdir)/index.cache.bz2; then \ - echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/; \ - $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/; \ - fi - -rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/common - $(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/common - -uninstall-docs: - -rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation - -clean-docs: - -rm -f index.cache.bz2 - - -#>+ 13 -install-nls: - $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation - @for base in addchannel.png kimproxy_create_screen2.png identities_away_co.png notification_screen_co.png urlcatcher_screen_co.png channel_screen_tour_co.png channellist_screen_co.png kimproxy_create_screen_co.png notifylist_screen_co.png logviewer_co.png addnetwork_co.png first_serverlist_co.png nicksonline_co.png webbrowser_screen_co.png osd_screen_co.png colorchooser_screen.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png dccstatus_screen_co.png quickbuttons_screen.png identities_gen_co.png index.docbook first_channel_co.png addserver_co.png ; do \ - echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ - $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ - done - -uninstall-nls: - for base in addchannel.png kimproxy_create_screen2.png identities_away_co.png notification_screen_co.png urlcatcher_screen_co.png channel_screen_tour_co.png channellist_screen_co.png kimproxy_create_screen_co.png notifylist_screen_co.png logviewer_co.png addnetwork_co.png first_serverlist_co.png nicksonline_co.png webbrowser_screen_co.png osd_screen_co.png colorchooser_screen.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png dccstatus_screen_co.png quickbuttons_screen.png identities_gen_co.png index.docbook first_channel_co.png addserver_co.png ; do \ - rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ - done - - -#>+ 5 -distdir-nls: - for file in addchannel.png kimproxy_create_screen2.png identities_away_co.png notification_screen_co.png urlcatcher_screen_co.png channel_screen_tour_co.png channellist_screen_co.png kimproxy_create_screen_co.png notifylist_screen_co.png logviewer_co.png addnetwork_co.png first_serverlist_co.png nicksonline_co.png webbrowser_screen_co.png osd_screen_co.png colorchooser_screen.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png dccstatus_screen_co.png quickbuttons_screen.png identities_gen_co.png index.docbook first_channel_co.png addserver_co.png ; do \ - cp $(srcdir)/$$file $(distdir); \ - done - -#>+ 15 -force-reedit: - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu doc/nl/Makefile - cd $(top_srcdir) && perl admin/am_edit doc/nl/Makefile.in - - -#>+ 21 -clean-bcheck: - rm -f *.bchecktest.cc *.bchecktest.cc.class a.out - -bcheck: bcheck-am - -bcheck-am: - @for i in ; do \ - if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ - echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ - echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ - echo "$$i"; \ - if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ - rm -f $$i.bchecktest.cc; exit 1; \ - fi ; \ - echo "" >> $$i.bchecktest.cc.class; \ - perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ - rm -f a.out; \ - fi ; \ - done - - -#>+ 3 -final: - $(MAKE) all-am - -#>+ 3 -final-install: - $(MAKE) install-am - -#>+ 3 -no-final: - $(MAKE) all-am - -#>+ 3 -no-final-install: - $(MAKE) install-am - -#>+ 3 -kde-rpo-clean: - -rm -f *.rpo - -#>+ 3 -nmcheck: -nmcheck-am: nmcheck Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/nicksonline_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/nicksonline_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/notification_screen_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/notification_screen_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/notifylist_screen_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/notifylist_screen_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/osd_screen_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/osd_screen_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/quickbuttons_screen.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/quickbuttons_screen.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/quickconnect_screen.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/quickconnect_screen.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/serverlist_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/serverlist_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/urlcatcher_screen_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/urlcatcher_screen_co.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/doc/nl/webbrowser_screen_co.png and /tmp/ZeUXpSU1gs/konversation-1.1/doc/nl/webbrowser_screen_co.png differ diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/pt/index.docbook /tmp/ZeUXpSU1gs/konversation-1.1/doc/pt/index.docbook --- konversation-1.0.1/doc/pt/index.docbook 2006-10-06 17:44:59.000000000 +0100 +++ konversation-1.1/doc/pt/index.docbook 2006-12-19 13:20:42.000000000 +0000 @@ -2,7 +2,6 @@ - Konversation"> Editar Procurar PróximoProcurar Seguinte + 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -94,7 +88,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -169,12 +165,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -188,6 +186,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -207,24 +206,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -236,19 +233,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -275,30 +271,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -359,10 +355,6 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -373,22 +365,21 @@ #>- distdir: $(DISTFILES) #>+ 1 distdir: distdir-nls $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -439,7 +430,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -455,12 +446,20 @@ #>+ 1 install-data-am: install-docs install-nls +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -479,17 +478,20 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/ru/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/doc/ru/Makefile.in --- konversation-1.0.1/doc/ru/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/doc/ru/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,8 +49,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -94,7 +88,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -169,12 +165,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -188,6 +186,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -207,24 +206,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -236,19 +233,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -275,30 +271,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -359,10 +355,6 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -373,22 +365,21 @@ #>- distdir: $(DISTFILES) #>+ 1 distdir: distdir-nls $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -439,7 +430,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -455,12 +446,20 @@ #>+ 1 install-data-am: install-docs install-nls +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -479,17 +478,20 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/doc/sv/index.docbook /tmp/ZeUXpSU1gs/konversation-1.1/doc/sv/index.docbook --- konversation-1.0.1/doc/sv/index.docbook 2006-10-06 17:45:10.000000000 +0100 +++ konversation-1.1/doc/sv/index.docbook 2006-10-04 20:09:19.000000000 +0100 @@ -2,7 +2,6 @@ - Konversation"> + 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -94,7 +88,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -169,12 +165,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -188,6 +186,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -207,24 +206,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -236,19 +233,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -275,30 +271,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -359,10 +355,6 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -373,22 +365,21 @@ #>- distdir: $(DISTFILES) #>+ 1 distdir: distdir-nls $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -439,7 +430,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -455,12 +446,20 @@ #>+ 1 install-data-am: install-docs install-nls +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -479,27 +478,30 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: #>+ 2 -KDE_DIST=identities_gen_co.png channellist_screen_co.png notification_screen_co.png identities_away_co.png quickbuttons_screen.png quickconnect_screen.png notifylist_screen_co.png index.docbook nickthemes_screen_co.png kimproxy_create_screen_co.png webbrowser_screen_co.png colorchooser_screen.png nicksonline_co.png highlighting_screen_co.png logviewer_co.png dccstatus_screen_co.png identities_adv_co.png Makefile.in urlcatcher_screen_co.png osd_demo.png osd_screen_co.png channel_screen_tour_co.png kimproxy_create_screen2.png checkidentities.png first_channel_co.png addserver_co.png serverlist_co.png addnetwork_co.png Makefile.am first_serverlist_co.png addchannel.png +KDE_DIST=identities_gen_co.png channellist_screen_co.png identities_away_co.png notification_screen_co.png quickbuttons_screen.png quickconnect_screen.png notifylist_screen_co.png index.docbook nickthemes_screen_co.png kimproxy_create_screen_co.png webbrowser_screen_co.png nicksonline_co.png colorchooser_screen.png highlighting_screen_co.png logviewer_co.png dccstatus_screen_co.png identities_adv_co.png Makefile.in urlcatcher_screen_co.png osd_screen_co.png osd_demo.png channel_screen_tour_co.png kimproxy_create_screen2.png checkidentities.png first_channel_co.png addserver_co.png serverlist_co.png addnetwork_co.png Makefile.am first_serverlist_co.png addchannel.png #>+ 24 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) addchannel.png kimproxy_create_screen2.png identities_away_co.png notification_screen_co.png urlcatcher_screen_co.png channel_screen_tour_co.png channellist_screen_co.png kimproxy_create_screen_co.png notifylist_screen_co.png logviewer_co.png addnetwork_co.png highlighting_screen_co.png first_serverlist_co.png nickthemes_screen_co.png nicksonline_co.png webbrowser_screen_co.png osd_screen_co.png osd_demo.png colorchooser_screen.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png dccstatus_screen_co.png quickbuttons_screen.png identities_gen_co.png index.docbook first_channel_co.png addserver_co.png +index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook addnetwork_co.png notifylist_screen_co.png highlighting_screen_co.png quickbuttons_screen.png urlcatcher_screen_co.png addchannel.png notification_screen_co.png webbrowser_screen_co.png kimproxy_create_screen2.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png identities_adv_co.png colorchooser_screen.png first_serverlist_co.png identities_gen_co.png dccstatus_screen_co.png logviewer_co.png addserver_co.png kimproxy_create_screen_co.png identities_away_co.png osd_demo.png nicksonline_co.png nickthemes_screen_co.png osd_screen_co.png checkidentities.png channellist_screen_co.png serverlist_co.png @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi docs-am: index.cache.bz2 @@ -526,20 +528,20 @@ #>+ 13 install-nls: $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation - @for base in addchannel.png kimproxy_create_screen2.png identities_away_co.png notification_screen_co.png urlcatcher_screen_co.png channel_screen_tour_co.png channellist_screen_co.png kimproxy_create_screen_co.png notifylist_screen_co.png logviewer_co.png addnetwork_co.png highlighting_screen_co.png first_serverlist_co.png nickthemes_screen_co.png nicksonline_co.png webbrowser_screen_co.png osd_screen_co.png osd_demo.png colorchooser_screen.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png dccstatus_screen_co.png quickbuttons_screen.png identities_gen_co.png index.docbook first_channel_co.png addserver_co.png ; do \ + @for base in index.docbook addnetwork_co.png notifylist_screen_co.png highlighting_screen_co.png quickbuttons_screen.png urlcatcher_screen_co.png addchannel.png notification_screen_co.png webbrowser_screen_co.png kimproxy_create_screen2.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png identities_adv_co.png colorchooser_screen.png first_serverlist_co.png identities_gen_co.png dccstatus_screen_co.png logviewer_co.png addserver_co.png kimproxy_create_screen_co.png identities_away_co.png osd_demo.png nicksonline_co.png nickthemes_screen_co.png osd_screen_co.png checkidentities.png channellist_screen_co.png serverlist_co.png ; do \ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ done uninstall-nls: - for base in addchannel.png kimproxy_create_screen2.png identities_away_co.png notification_screen_co.png urlcatcher_screen_co.png channel_screen_tour_co.png channellist_screen_co.png kimproxy_create_screen_co.png notifylist_screen_co.png logviewer_co.png addnetwork_co.png highlighting_screen_co.png first_serverlist_co.png nickthemes_screen_co.png nicksonline_co.png webbrowser_screen_co.png osd_screen_co.png osd_demo.png colorchooser_screen.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png dccstatus_screen_co.png quickbuttons_screen.png identities_gen_co.png index.docbook first_channel_co.png addserver_co.png ; do \ + for base in index.docbook addnetwork_co.png notifylist_screen_co.png highlighting_screen_co.png quickbuttons_screen.png urlcatcher_screen_co.png addchannel.png notification_screen_co.png webbrowser_screen_co.png kimproxy_create_screen2.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png identities_adv_co.png colorchooser_screen.png first_serverlist_co.png identities_gen_co.png dccstatus_screen_co.png logviewer_co.png addserver_co.png kimproxy_create_screen_co.png identities_away_co.png osd_demo.png nicksonline_co.png nickthemes_screen_co.png osd_screen_co.png checkidentities.png channellist_screen_co.png serverlist_co.png ; do \ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konversation/$$base ;\ done #>+ 5 distdir-nls: - for file in addchannel.png kimproxy_create_screen2.png identities_away_co.png notification_screen_co.png urlcatcher_screen_co.png channel_screen_tour_co.png channellist_screen_co.png kimproxy_create_screen_co.png notifylist_screen_co.png logviewer_co.png addnetwork_co.png highlighting_screen_co.png first_serverlist_co.png nickthemes_screen_co.png nicksonline_co.png webbrowser_screen_co.png osd_screen_co.png osd_demo.png colorchooser_screen.png checkidentities.png serverlist_co.png identities_adv_co.png quickconnect_screen.png dccstatus_screen_co.png quickbuttons_screen.png identities_gen_co.png index.docbook first_channel_co.png addserver_co.png ; do \ + for file in index.docbook addnetwork_co.png notifylist_screen_co.png highlighting_screen_co.png quickbuttons_screen.png urlcatcher_screen_co.png addchannel.png notification_screen_co.png webbrowser_screen_co.png kimproxy_create_screen2.png first_channel_co.png quickconnect_screen.png channel_screen_tour_co.png identities_adv_co.png colorchooser_screen.png first_serverlist_co.png identities_gen_co.png dccstatus_screen_co.png logviewer_co.png addserver_co.png kimproxy_create_screen_co.png identities_away_co.png osd_demo.png nicksonline_co.png nickthemes_screen_co.png osd_screen_co.png checkidentities.png channellist_screen_co.png serverlist_co.png ; do \ cp $(srcdir)/$$file $(distdir); \ done diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/configure.in.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/configure.in.in --- konversation-1.0.1/konversation/configure.in.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/configure.in.in 2008-08-06 16:56:27.000000000 +0100 @@ -1,3 +1,6 @@ +#MIN_CONFIG(3.2) +CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" + KDE_CHECK_HEADER(knotifyclient.h, [ AC_DEFINE(USE_KNOTIFY, 1, [Define if you have KNotify] ) @@ -10,3 +13,36 @@ LIB_KIMIFACE="-lkimproxy" AC_SUBST(LIB_KIMIFACE) ]) + +# Check for XScreenSaver +AC_CHECK_HEADERS(tgmath.h)xss_save_ldflags="$LDFLAGS" +LDFLAGS="$X_LDFLAGS" + +LIB_XSS= + +KDE_CHECK_HEADER(X11/extensions/scrnsaver.h, + [ + AC_CHECK_LIB(Xext,XScreenSaverQueryInfo, + [ + AC_DEFINE(HAVE_XSCREENSAVER, 1, [Define if you have the XScreenSaver extension]) + LIB_XSS="-lXext" + ], + [ + ld_shared_flag= + KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"]) + AC_CHECK_LIB(Xss,XScreenSaverQueryInfo, + [ + AC_DEFINE(HAVE_XSCREENSAVER, 1, [Define if you have the XScreenSaver extension]) + LIB_XSS="-lXss" + ], + [], + [ $ld_shared_flag $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS ]) + ], + [ $X_PRE_LIBS -lX11 $X_EXTRA_LIBS ]) + ], [], + [ + #include + ] ) + +AC_SUBST(LIB_XSS) +LDFLAGS="$xss_save_ldflags" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/icons/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/icons/Makefile.in --- konversation-1.0.1/konversation/images/icons/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/icons/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,8 +49,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -94,7 +88,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -169,12 +165,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -188,6 +186,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -207,24 +206,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -236,19 +233,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -275,30 +271,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -358,10 +354,6 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -370,22 +362,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -434,7 +425,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -450,12 +441,20 @@ #>+ 1 install-data-am: install-kde-icons +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -474,89 +473,92 @@ ps-am: -#>- uninstall-am: uninstall-info-am +#>- uninstall-am: #>+ 1 -uninstall-am: uninstall-kde-icons uninstall-info-am +uninstall-am: uninstall-kde-icons + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: #>+ 2 -KDE_DIST=README-kimproxy hi64-app-konversation.png hi128-app-konversation.png cr22-action-char.png cr16-action-kimproxyonline.png cr16-action-kimproxyaway.png hi16-app-konversation.png cr32-action-kimproxyaway.png hi32-app-konversation.png cr16-action-kimproxyoffline.png cr32-action-kimproxyoffline.png crsc-action-kimproxyonline.svgz hisc-app-konversation.svgz cr32-action-kimproxyonline.png hi22-app-konversation.png cr22-action-kimproxyonline.png crsc-action-konv_message.svgz cr22-action-kimproxyaway.png Makefile.in hi48-app-konversation.png cr22-action-kimproxyoffline.png Makefile.am crsc-action-kimproxyoffline.svgz cr22-action-konv_message.png crsc-action-kimproxyaway.svgz +KDE_DIST=README-kimproxy hi64-app-konversation.png hi128-app-konversation.png cr22-action-char.png cr16-action-kimproxyonline.png cr16-action-kimproxyaway.png hi16-app-konversation.png cr32-action-kimproxyaway.png hi32-app-konversation.png cr32-action-kimproxyoffline.png cr16-action-kimproxyoffline.png hisc-app-konversation.svgz crsc-action-kimproxyonline.svgz cr32-action-kimproxyonline.png cr22-action-kimproxyonline.png hi22-app-konversation.png crsc-action-konv_message.svgz Makefile.in cr22-action-kimproxyaway.png hi48-app-konversation.png cr22-action-kimproxyoffline.png Makefile.am crsc-action-kimproxyoffline.svgz cr22-action-konv_message.png crsc-action-kimproxyaway.svgz #>+ 2 docs-am: #>+ 59 install-kde-icons: - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions - $(INSTALL_DATA) $(srcdir)/cr16-action-kimproxyonline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kimproxyonline.png $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions - $(INSTALL_DATA) $(srcdir)/crsc-action-kimproxyaway.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/kimproxyaway.svgz - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions - $(INSTALL_DATA) $(srcdir)/cr32-action-kimproxyoffline.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kimproxyoffline.png - $(INSTALL_DATA) $(srcdir)/cr16-action-kimproxyoffline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kimproxyoffline.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps - $(INSTALL_DATA) $(srcdir)/hisc-app-konversation.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konversation.svgz - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions - $(INSTALL_DATA) $(srcdir)/cr22-action-kimproxyonline.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kimproxyonline.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps - $(INSTALL_DATA) $(srcdir)/hi48-app-konversation.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konversation.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps - $(INSTALL_DATA) $(srcdir)/hi16-app-konversation.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konversation.png - $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps - $(INSTALL_DATA) $(srcdir)/hi128-app-konversation.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konversation.png - $(INSTALL_DATA) $(srcdir)/cr22-action-char.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/char.png - $(INSTALL_DATA) $(srcdir)/cr22-action-kimproxyoffline.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kimproxyoffline.png - $(INSTALL_DATA) $(srcdir)/cr22-action-kimproxyaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kimproxyaway.png $(INSTALL_DATA) $(srcdir)/crsc-action-kimproxyonline.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/kimproxyonline.svgz - $(INSTALL_DATA) $(srcdir)/cr16-action-kimproxyaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kimproxyaway.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions $(INSTALL_DATA) $(srcdir)/cr22-action-konv_message.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/konv_message.png - $(INSTALL_DATA) $(srcdir)/crsc-action-kimproxyoffline.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/kimproxyoffline.svgz - $(INSTALL_DATA) $(srcdir)/cr32-action-kimproxyonline.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kimproxyonline.png - $(INSTALL_DATA) $(srcdir)/crsc-action-konv_message.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/konv_message.svgz $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps $(INSTALL_DATA) $(srcdir)/hi22-app-konversation.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konversation.png + $(INSTALL_DATA) $(srcdir)/cr22-action-char.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/char.png + $(INSTALL_DATA) $(srcdir)/cr22-action-kimproxyaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kimproxyaway.png $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps $(INSTALL_DATA) $(srcdir)/hi64-app-konversation.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konversation.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps + $(INSTALL_DATA) $(srcdir)/hi16-app-konversation.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konversation.png + $(INSTALL_DATA) $(srcdir)/crsc-action-konv_message.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/konv_message.svgz + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions + $(INSTALL_DATA) $(srcdir)/cr32-action-kimproxyaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kimproxyaway.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions + $(INSTALL_DATA) $(srcdir)/cr16-action-kimproxyoffline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kimproxyoffline.png + $(INSTALL_DATA) $(srcdir)/cr32-action-kimproxyonline.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kimproxyonline.png + $(INSTALL_DATA) $(srcdir)/cr16-action-kimproxyaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kimproxyaway.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps + $(INSTALL_DATA) $(srcdir)/hi128-app-konversation.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konversation.png + $(INSTALL_DATA) $(srcdir)/cr32-action-kimproxyoffline.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kimproxyoffline.png + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps + $(INSTALL_DATA) $(srcdir)/hi48-app-konversation.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konversation.png + $(INSTALL_DATA) $(srcdir)/crsc-action-kimproxyaway.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/kimproxyaway.svgz + $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps + $(INSTALL_DATA) $(srcdir)/hisc-app-konversation.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konversation.svgz + $(INSTALL_DATA) $(srcdir)/cr22-action-kimproxyonline.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kimproxyonline.png $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps $(INSTALL_DATA) $(srcdir)/hi32-app-konversation.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konversation.png - $(INSTALL_DATA) $(srcdir)/cr32-action-kimproxyaway.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kimproxyaway.png + $(INSTALL_DATA) $(srcdir)/cr22-action-kimproxyoffline.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kimproxyoffline.png + $(INSTALL_DATA) $(srcdir)/cr16-action-kimproxyonline.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kimproxyonline.png + $(INSTALL_DATA) $(srcdir)/crsc-action-kimproxyoffline.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/kimproxyoffline.svgz uninstall-kde-icons: - -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kimproxyonline.png - -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/kimproxyaway.svgz - -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kimproxyoffline.png - -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kimproxyoffline.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konversation.svgz - -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kimproxyonline.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konversation.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konversation.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konversation.png - -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/char.png - -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kimproxyoffline.png - -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kimproxyaway.png -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/kimproxyonline.svgz - -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kimproxyaway.png -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/konv_message.png - -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/kimproxyoffline.svgz - -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kimproxyonline.png - -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/konv_message.svgz -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konversation.png + -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/char.png + -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kimproxyaway.png -rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konversation.png - -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konversation.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konversation.png + -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/konv_message.svgz -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kimproxyaway.png + -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kimproxyoffline.png + -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kimproxyonline.png + -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kimproxyaway.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konversation.png + -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/kimproxyoffline.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konversation.png + -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/kimproxyaway.svgz + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konversation.svgz + -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kimproxyonline.png + -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konversation.png + -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/kimproxyoffline.png + -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kimproxyonline.png + -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/kimproxyoffline.svgz #>+ 15 force-reedit: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/Makefile.in --- konversation-1.0.1/konversation/images/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -51,17 +47,21 @@ DIST_SOURCES = #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ #>- html-recursive info-recursive install-data-recursive \ -#>- install-exec-recursive install-info-recursive \ -#>- install-recursive installcheck-recursive installdirs-recursive \ -#>- pdf-recursive ps-recursive uninstall-info-recursive \ -#>- uninstall-recursive -#>+ 6 +#>- install-dvi-recursive install-exec-recursive \ +#>- install-html-recursive install-info-recursive \ +#>- install-pdf-recursive install-ps-recursive install-recursive \ +#>- installcheck-recursive installdirs-recursive pdf-recursive \ +#>- ps-recursive uninstall-recursive +#>+ 7 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive nmcheck-recursive bcheck-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -69,8 +69,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -110,7 +108,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -185,12 +185,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -204,6 +206,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -223,24 +226,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -252,19 +253,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -291,30 +291,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -375,10 +375,6 @@ clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -410,8 +406,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -455,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -481,8 +476,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -492,13 +487,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -512,22 +506,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -541,7 +534,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -549,6 +542,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -592,8 +587,7 @@ distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -607,12 +601,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -631,22 +633,24 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/alternative/index.desktop /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/alternative/index.desktop --- konversation-1.0.1/konversation/images/nickicons/alternative/index.desktop 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/alternative/index.desktop 2008-08-06 16:56:27.000000000 +0100 @@ -4,11 +4,13 @@ Name[bg]=Големи орнаменти Name[br]=Melloù bras Name[cs]=Velké odrážky +Name[de]=Große Kugeln Name[el]=Μεγάλα Bullet Name[fi]=Isot luettelomerkit Name[fr]=Grosse balles Name[he]=עיגולים גדולים Name[hi]=बिग बुलेट्स +Name[ja]=ビュレット Name[ka]=დიდი ტყვიები Name[lt]=Dideli ženkliukai Name[pa]=ਵੱਡੀਆਂ ਬਿੰਦੀਆਂ @@ -20,6 +22,7 @@ Name[tr]=Büyük Mermiler Name[uk]=Великі крапки Name[xx]=xxBig Bulletsxx +Name[zh_CN]=圆点 Comment="Big Bullets" by Dario Abatianni Comment[ar]="Big Bullets" من Dario Abatianni Comment[bg]="Големи орнаменти" от Dario Abatianni @@ -36,7 +39,8 @@ Comment[gl]="Big Bullets" por Dario Abatianni Comment[he]="עיגולים גדולים" של Dario Abatianni Comment[hi]="बिग बुलेट्स" दारियो अबातिआनी द्वारा -Comment[it]="Big Bullets" di Dario Abatianni +Comment[it]=«Big Bullets» di Dario Abatianni +Comment[ja]=Dario Abatianni 作のビュレットテーマ Comment[ka]="დიდი ტყვიები" დარიო აბატიანის მიერ Comment[lt]=„Dideli ženkliukai“, sukurti Dario Abatianni Comment[nl]="Big Bullets", door Dario Abatianni @@ -49,6 +53,5 @@ Comment[tr]=Dario Abatianni tarafından "Büyük Mermiler" Comment[uk]="Великі крапки" - Dario Abatianni Comment[xx]=xx"Big Bullets" by Dario Abatiannixx +Comment[zh_CN]=“圆点”，由 Dario Abatianni 设计 Comment[zh_TW]="Big Bullets"，由 Dario Abatianni 撰寫 -Encoding=UTF-8 - diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/alternative/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/alternative/Makefile.in --- konversation-1.0.1/konversation/images/nickicons/alternative/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/alternative/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -63,8 +59,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -104,7 +98,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -179,12 +175,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -198,6 +196,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -217,24 +216,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -246,19 +243,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -285,30 +281,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -371,13 +367,9 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-konversationiconDATA: $(konversationicon_DATA) @$(NORMAL_INSTALL) - test -z "$(konversationicondir)" || $(mkdir_p) "$(DESTDIR)$(konversationicondir)" + test -z "$(konversationicondir)" || $(MKDIR_P) "$(DESTDIR)$(konversationicondir)" @list='$(konversationicon_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -400,22 +392,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -431,7 +422,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(konversationicondir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -467,7 +458,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -481,12 +472,20 @@ install-data-am: install-konversationiconDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -505,25 +504,28 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-konversationiconDATA +uninstall-am: uninstall-konversationiconDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-konversationiconDATA \ - install-man install-strip installcheck installcheck-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-konversationiconDATA + ps ps-am uninstall uninstall-am uninstall-konversationiconDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: #>+ 2 -KDE_DIST=irc_owner.png irc_away.png index.desktop irc_halfop.png irc_normal.png irc_voice.png Makefile.in irc_op.png irc_admin.png Makefile.am +KDE_DIST=irc_away.png irc_owner.png index.desktop irc_halfop.png irc_normal.png irc_voice.png Makefile.in irc_op.png irc_admin.png Makefile.am #>+ 2 docs-am: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/christmas/index.desktop /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/christmas/index.desktop --- konversation-1.0.1/konversation/images/nickicons/christmas/index.desktop 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/christmas/index.desktop 2008-08-06 16:56:27.000000000 +0100 @@ -7,6 +7,7 @@ Name[ca]=Tema nadalenc Name[cs]=Vánoční téma Name[da]=Juletema +Name[de]=Weihnachtsdesign Name[el]=Χριστουγεννιάτικο θέμα Name[es]=Tema navideño Name[et]=Jõuluteema @@ -15,6 +16,7 @@ Name[gl]=Tema de Nadal Name[he]=ערכת חג מולד Name[it]=Tema natalizio +Name[ja]=クリスマス Name[ka]=საშობაო გაფორმება Name[lt]=Kalėdinė tema Name[nl]=Kerstthema @@ -29,6 +31,7 @@ Name[tr]=Noel Teması Name[uk]=Різдвяна тема Name[xx]=xxChristmas Themexx +Name[zh_CN]=耶诞节主题 Name[zh_TW]=聖誕主題 Comment="Christmas Theme" by Kenichiro Takahashi Comment[ar]=سمة "Christmas Theme" من Kenichiro Takahashi @@ -46,7 +49,8 @@ Comment[ga]="Christmas Theme" le Kenichiro Takahashi Comment[gl]="Tema de Nadal" por Kenichiro Takahashi Comment[he]="ערכת חג מולד " של Kenichiro Takahashi -Comment[it]="Tema natalizio" di Kenichiro Takahashi +Comment[it]=«Tema natalizio» di Kenichiro Takahashi +Comment[ja]=Kenichiro Takahashi 作のクリスマステーマ Comment[ka]="საშობაო გაფორმება" კენიჩირო ტაკაჰაშის მიერ Comment[lt]=„Kalėdinė tema“, sukurta Kenichiro Takahashi Comment[nl]="Christmas Theme" door Kenichiro Takahashi @@ -60,6 +64,5 @@ Comment[tr]=Kenichiro Takahashi tarafından "Noel Teması" Comment[uk]="Різдвяна тема" - Kenichiro Takahashi Comment[xx]=xx"Christmas Theme" by Kenichiro Takahashixx +Comment[zh_CN]=“耶诞节主题”，由 Kenichiro Takahashi 设计 Comment[zh_TW]="聖誕"主題，由 Kenichiro Takahashi 撰寫 -Encoding=UTF-8 - diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/christmas/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/christmas/Makefile.in --- konversation-1.0.1/konversation/images/nickicons/christmas/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/christmas/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -63,8 +59,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -104,7 +98,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -179,12 +175,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -198,6 +196,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -217,24 +216,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -246,19 +243,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -285,30 +281,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -371,13 +367,9 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-konversationiconDATA: $(konversationicon_DATA) @$(NORMAL_INSTALL) - test -z "$(konversationicondir)" || $(mkdir_p) "$(DESTDIR)$(konversationicondir)" + test -z "$(konversationicondir)" || $(MKDIR_P) "$(DESTDIR)$(konversationicondir)" @list='$(konversationicon_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -400,22 +392,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -431,7 +422,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(konversationicondir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -467,7 +458,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -481,12 +472,20 @@ install-data-am: install-konversationiconDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -505,25 +504,28 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-konversationiconDATA +uninstall-am: uninstall-konversationiconDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-konversationiconDATA \ - install-man install-strip installcheck installcheck-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-konversationiconDATA + ps ps-am uninstall uninstall-am uninstall-konversationiconDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: #>+ 2 -KDE_DIST=irc_owner.png irc_away.png index.desktop irc_halfop.png irc_normal.png irc_voice.png Makefile.in irc_op.png irc_admin.png Makefile.am +KDE_DIST=irc_away.png irc_owner.png index.desktop irc_halfop.png irc_normal.png irc_voice.png Makefile.in irc_op.png irc_admin.png Makefile.am #>+ 2 docs-am: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/classic/index.desktop /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/classic/index.desktop --- konversation-1.0.1/konversation/images/nickicons/classic/index.desktop 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/classic/index.desktop 2008-08-06 16:56:27.000000000 +0100 @@ -13,10 +13,12 @@ Name[et]=Klassikaline teema Name[fi]=Klassinen teema Name[fr]=Thème classique +Name[ga]=Téama Clasaiceach Name[gl]=Tema Clásico Name[he]=הערכה הישנה והטובה Name[hi]=क्लासिक प्रसंग Name[it]=Tema classico +Name[ja]=クラシック Name[ka]=კლასიკური გაფორმება Name[lt]=Klasikinė tema Name[nl]=Klassiek thema @@ -31,6 +33,7 @@ Name[tr]=Klasik tema Name[uk]=Класична тема Name[xx]=xxClassic Themexx +Name[zh_CN]=经典主题 Name[zh_TW]=傳統式主題 Comment="LED" by Dario Abatianni Comment[ar]="LED" من Dario Abatianni @@ -49,7 +52,8 @@ Comment[gl]="LED" led Dario Abatianni Comment[he]="LED" של Dario Abatianni Comment[hi]="एलईडी" दारियो अबातिआनी द्वारा -Comment[it]="LED" di Dario Abatianni +Comment[it]=«LED» di Dario Abatianni +Comment[ja]=Dario Abatianni 作の LED テーマ Comment[ka]="LED" დარიო აბატიანის მიერ Comment[lt]=„LED“, sukurta Dario Abatianni Comment[nl]="LED", door Dario Abatianni @@ -62,5 +66,5 @@ Comment[tr]=Dario Abatianni tarafından "LED" Comment[uk]="LED" - Dario Abatianni Comment[xx]=xx"LED" by Dario Abatiannixx +Comment[zh_CN]=“指示灯”，由 Dario Abatianni 设计 Comment[zh_TW]="LED" 由 Dario Abatianni 撰寫 -Encoding=UTF-8 diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/classic/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/classic/Makefile.in --- konversation-1.0.1/konversation/images/nickicons/classic/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/classic/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -63,8 +59,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -104,7 +98,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -179,12 +175,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -198,6 +196,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -217,24 +216,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -246,19 +243,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -285,30 +281,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -371,13 +367,9 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-konversationiconDATA: $(konversationicon_DATA) @$(NORMAL_INSTALL) - test -z "$(konversationicondir)" || $(mkdir_p) "$(DESTDIR)$(konversationicondir)" + test -z "$(konversationicondir)" || $(MKDIR_P) "$(DESTDIR)$(konversationicondir)" @list='$(konversationicon_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -400,22 +392,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -431,7 +422,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(konversationicondir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -467,7 +458,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -481,12 +472,20 @@ install-data-am: install-konversationiconDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -505,25 +504,28 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-konversationiconDATA +uninstall-am: uninstall-konversationiconDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-konversationiconDATA \ - install-man install-strip installcheck installcheck-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-konversationiconDATA + ps ps-am uninstall uninstall-am uninstall-konversationiconDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: #>+ 2 -KDE_DIST=irc_owner.png irc_away.png index.desktop irc_halfop.png irc_normal.png irc_voice.png Makefile.in irc_op.png irc_admin.png Makefile.am +KDE_DIST=irc_away.png irc_owner.png index.desktop irc_halfop.png irc_normal.png irc_voice.png Makefile.in irc_op.png irc_admin.png Makefile.am #>+ 2 docs-am: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/default/index.desktop /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/default/index.desktop --- konversation-1.0.1/konversation/images/nickicons/default/index.desktop 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/default/index.desktop 2008-08-06 16:56:27.000000000 +0100 @@ -33,6 +33,7 @@ Name[tr]=Öntanımlı tema Name[uk]=Типова тема Name[xx]=xxDefault Themexx +Name[zh_CN]=默认页面 Name[zh_TW]=預設主題 Comment="Simplistic" by Shintaro Matsuoka Comment[ar]="Simplistic" من Shintaro Matsuoka @@ -50,7 +51,8 @@ Comment[gl]="Simples" por Shintaro Matsuoka Comment[he]="מראה פשוט" של Shintaro Matsuoka Comment[hi]="सिम्प्लिस्टिक" शिनतारो मात्सुओका द्वारा -Comment[it]="Simplistic" di Shintaro Matsuoka +Comment[it]=«Simplistic» di Shintaro Matsuoka +Comment[ja]=Shintaro Matsuoka 作のシンプルなテーマ Comment[ka]="Simplistic" შინტარო მაცუოკას მიერ Comment[lt]=„Supaprastinta“, sukurta Shintaro Matsuoka Comment[nl]="Simplistic", door Shintaro Matsuoka @@ -63,6 +65,5 @@ Comment[tr]=Shintaro Matsuoka tarafından "Basitlik" Comment[uk]="Проста" - Shintaro Matsuoka Comment[xx]=xx"Simplistic" by Shintaro Matsuokaxx +Comment[zh_CN]=“简洁”，由 Shintaro Matsuoka 设计 Comment[zh_TW]="Simplistic" 由 Shintaro Matsuoka 撰寫 -Encoding=UTF-8 - diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/default/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/default/Makefile.in --- konversation-1.0.1/konversation/images/nickicons/default/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/default/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -63,8 +59,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -104,7 +98,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -179,12 +175,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -198,6 +196,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -217,24 +216,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -246,19 +243,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -285,30 +281,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -371,13 +367,9 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-konversationiconDATA: $(konversationicon_DATA) @$(NORMAL_INSTALL) - test -z "$(konversationicondir)" || $(mkdir_p) "$(DESTDIR)$(konversationicondir)" + test -z "$(konversationicondir)" || $(MKDIR_P) "$(DESTDIR)$(konversationicondir)" @list='$(konversationicon_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -400,22 +392,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -431,7 +422,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(konversationicondir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -467,7 +458,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -481,12 +472,20 @@ install-data-am: install-konversationiconDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -505,25 +504,28 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-konversationiconDATA +uninstall-am: uninstall-konversationiconDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-konversationiconDATA \ - install-man install-strip installcheck installcheck-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-konversationiconDATA + ps ps-am uninstall uninstall-am uninstall-konversationiconDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: #>+ 2 -KDE_DIST=irc_owner.png irc_away.png index.desktop irc_halfop.png irc_normal.png irc_voice.png Makefile.in irc_op.png irc_admin.png Makefile.am +KDE_DIST=irc_away.png irc_owner.png index.desktop irc_halfop.png irc_normal.png irc_voice.png Makefile.in irc_op.png irc_admin.png Makefile.am #>+ 2 docs-am: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/Makefile.am /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/Makefile.am --- konversation-1.0.1/konversation/images/nickicons/Makefile.am 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/Makefile.am 2008-08-06 16:56:27.000000000 +0100 @@ -1 +1 @@ -SUBDIRS = alternative christmas classic default smiling square +SUBDIRS = alternative christmas classic default smiling square oxygen diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/Makefile.in --- konversation-1.0.1/konversation/images/nickicons/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -51,17 +47,21 @@ DIST_SOURCES = #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ #>- html-recursive info-recursive install-data-recursive \ -#>- install-exec-recursive install-info-recursive \ -#>- install-recursive installcheck-recursive installdirs-recursive \ -#>- pdf-recursive ps-recursive uninstall-info-recursive \ -#>- uninstall-recursive -#>+ 6 +#>- install-dvi-recursive install-exec-recursive \ +#>- install-html-recursive install-info-recursive \ +#>- install-pdf-recursive install-ps-recursive install-recursive \ +#>- installcheck-recursive installdirs-recursive pdf-recursive \ +#>- ps-recursive uninstall-recursive +#>+ 7 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive nmcheck-recursive bcheck-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -69,8 +69,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -110,7 +108,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -185,12 +185,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -204,6 +206,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -223,24 +226,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -252,19 +253,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -291,36 +291,36 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ -SUBDIRS = alternative christmas classic default smiling square +SUBDIRS = alternative christmas classic default smiling square oxygen #>- all: all-recursive #>+ 1 all: docs-am all-recursive @@ -375,10 +375,6 @@ clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -410,8 +406,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -455,8 +450,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -481,8 +476,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -492,13 +487,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -512,22 +506,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -541,7 +534,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -549,6 +542,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -592,8 +587,7 @@ distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -607,12 +601,20 @@ install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -631,22 +633,24 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/oxygen/index.desktop /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/oxygen/index.desktop --- konversation-1.0.1/konversation/images/nickicons/oxygen/index.desktop 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/oxygen/index.desktop 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,22 @@ +[Desktop Entry] +Type=Theme +Name=Oxygen Theme +Name[da]=Oxygen-tema +Name[de]=Oxygen-Design +Name[et]=Oxygeni teema +Name[it]=Tema Oxygen +Name[ja]=Oxygen テーマ +Name[sr]=Кисеоник тема +Name[sr@Latn]=Kiseonik tema +Name[sv]=Oxygen-tema +Name[zh_TW]=Oxygen 主題 +Comment="Oxygen" by Nuno Pinheiro +Comment[da]="Oxygen" af Nuno Pinheiro +Comment[de]="Oxygen" von Nuno Pinheiro +Comment[et]="Oxygen" (autor Nuno Pinheiro) +Comment[it]=«Oxygen» di Nuno Pinheiro +Comment[ja]=Nuno Pinheiro 作の Oxygen テーマ +Comment[sr]=„Кисеоник“ од Нуна Пињеира +Comment[sr@Latn]=„Kiseonik“ od Nuna Pinjeira +Comment[sv]="Oxygen" av Nuno Pinheiro +Comment[zh_TW]="Oxygen"，由 Nuno Pinheiro 提供 Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/oxygen/irc_admin.png and /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/oxygen/irc_admin.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/oxygen/irc_away.png and /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/oxygen/irc_away.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/oxygen/irc_halfop.png and /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/oxygen/irc_halfop.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/oxygen/irc_normal.png and /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/oxygen/irc_normal.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/oxygen/irc_op.png and /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/oxygen/irc_op.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/oxygen/irc_owner.png and /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/oxygen/irc_owner.png differ Binary files /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/oxygen/irc_voice.png and /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/oxygen/irc_voice.png differ diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/oxygen/Makefile.am /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/oxygen/Makefile.am --- konversation-1.0.1/konversation/images/nickicons/oxygen/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/oxygen/Makefile.am 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,3 @@ +konversationicondir = $(kde_datadir)/konversation/themes/oxygen +konversationicon_DATA = irc_admin.png irc_away.png irc_halfop.png irc_normal.png irc_op.png \ + irc_owner.png irc_voice.png index.desktop diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/oxygen/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/oxygen/Makefile.in --- konversation-1.0.1/konversation/images/nickicons/oxygen/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/oxygen/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -0,0 +1,593 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# KDE tags expanded automatically by am_edit - $Revision: 483858 $ +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = konversation/images/nickicons/oxygen +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(konversationicondir)" +konversationiconDATA_INSTALL = $(INSTALL_DATA) +DATA = $(konversationicon_DATA) +#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +#>+ 1 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AR = @AR@ +ARTSCCONFIG = @ARTSCCONFIG@ +AUTOCONF = @AUTOCONF@ +AUTODIRS = @AUTODIRS@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CONF_FILES = @CONF_FILES@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DCOPIDL = @DCOPIDL@ +DCOPIDL2CPP = @DCOPIDL2CPP@ +DCOPIDLNG = @DCOPIDLNG@ +DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DOXYGEN = @DOXYGEN@ +DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ +DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ +KCONFIG_COMPILER = @KCONFIG_COMPILER@ +KDECONFIG = @KDECONFIG@ +KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ +KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ +KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ +KDE_HAVE_DOT = @KDE_HAVE_DOT@ +KDE_INCLUDES = @KDE_INCLUDES@ +KDE_LDFLAGS = @KDE_LDFLAGS@ +KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ +KDE_MT_LIBS = @KDE_MT_LIBS@ +KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ +KDE_PLUGIN = @KDE_PLUGIN@ +KDE_RPATH = @KDE_RPATH@ +KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ +KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ +KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ +KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ +KDE_USE_FPIE = @KDE_USE_FPIE@ +KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ +KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ +KDE_USE_PIE = @KDE_USE_PIE@ +KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ +LDFLAGS = @LDFLAGS@ +LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ +LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ +LIBCOMPAT = @LIBCOMPAT@ +LIBCRYPT = @LIBCRYPT@ +LIBDL = @LIBDL@ +LIBJPEG = @LIBJPEG@ +LIBOBJS = @LIBOBJS@ +LIBPNG = @LIBPNG@ +LIBPTHREAD = @LIBPTHREAD@ +LIBRESOLV = @LIBRESOLV@ +LIBS = @LIBS@ +LIBSM = @LIBSM@ +LIBSOCKET = @LIBSOCKET@ +LIBTOOL = @LIBTOOL@ +LIBUCB = @LIBUCB@ +LIBUTIL = @LIBUTIL@ +LIBZ = @LIBZ@ +LIB_ARTS = @LIB_ARTS@ +LIB_KAB = @LIB_KAB@ +LIB_KABC = @LIB_KABC@ +LIB_KDECORE = @LIB_KDECORE@ +LIB_KDED = @LIB_KDED@ +LIB_KDEPIM = @LIB_KDEPIM@ +LIB_KDEPRINT = @LIB_KDEPRINT@ +LIB_KDEUI = @LIB_KDEUI@ +LIB_KDNSSD = @LIB_KDNSSD@ +LIB_KFILE = @LIB_KFILE@ +LIB_KFM = @LIB_KFM@ +LIB_KHTML = @LIB_KHTML@ +LIB_KIMIFACE = @LIB_KIMIFACE@ +LIB_KIMPROXY = @LIB_KIMPROXY@ +LIB_KIO = @LIB_KIO@ +LIB_KJS = @LIB_KJS@ +LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ +LIB_KPARTS = @LIB_KPARTS@ +LIB_KSPELL = @LIB_KSPELL@ +LIB_KSYCOCA = @LIB_KSYCOCA@ +LIB_KUNITTEST = @LIB_KUNITTEST@ +LIB_KUTILS = @LIB_KUTILS@ +LIB_POLL = @LIB_POLL@ +LIB_QPE = @LIB_QPE@ +LIB_QT = @LIB_QT@ +LIB_SMB = @LIB_SMB@ +LIB_X11 = @LIB_X11@ +LIB_XEXT = @LIB_XEXT@ +LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +MCOPIDL = @MCOPIDL@ +MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ +MOC = @MOC@ +MSGFMT = @MSGFMT@ +NOOPT_CFLAGS = @NOOPT_CFLAGS@ +NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ +QTDOCDIR = @QTDOCDIR@ +QTE_NORTTI = @QTE_NORTTI@ +QT_INCLUDES = @QT_INCLUDES@ +QT_LDFLAGS = @QT_LDFLAGS@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TOPSUBDIRS = @TOPSUBDIRS@ +UIC = @UIC@ +UIC_TR = @UIC_TR@ +USER_INCLUDES = @USER_INCLUDES@ +USER_LDFLAGS = @USER_LDFLAGS@ +USE_EXCEPTIONS = @USE_EXCEPTIONS@ +USE_RTTI = @USE_RTTI@ +USE_THREADS = @USE_THREADS@ +VERSION = @VERSION@ +WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ +XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ +XMLLINT = @XMLLINT@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_INCLUDES = @X_INCLUDES@ +X_LDFLAGS = @X_LDFLAGS@ +X_PRE_LIBS = @X_PRE_LIBS@ +X_RPATH = @X_RPATH@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +all_includes = @all_includes@ +all_libraries = @all_libraries@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +kde_appsdir = @kde_appsdir@ +kde_bindir = @kde_bindir@ +kde_confdir = @kde_confdir@ +kde_datadir = @kde_datadir@ +kde_htmldir = @kde_htmldir@ +kde_icondir = @kde_icondir@ +kde_includes = @kde_includes@ +kde_kcfgdir = @kde_kcfgdir@ +kde_libraries = @kde_libraries@ +kde_libs_htmldir = @kde_libs_htmldir@ +kde_libs_prefix = @kde_libs_prefix@ +kde_locale = @kde_locale@ +kde_mimedir = @kde_mimedir@ +kde_moduledir = @kde_moduledir@ +kde_qtver = @kde_qtver@ +kde_servicesdir = @kde_servicesdir@ +kde_servicetypesdir = @kde_servicetypesdir@ +kde_sounddir = @kde_sounddir@ +kde_styledir = @kde_styledir@ +kde_templatesdir = @kde_templatesdir@ +kde_wallpaperdir = @kde_wallpaperdir@ +kde_widgetdir = @kde_widgetdir@ +kdeinitdir = @kdeinitdir@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +qt_includes = @qt_includes@ +qt_libraries = @qt_libraries@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +x_includes = @x_includes@ +x_libraries = @x_libraries@ +xdg_appsdir = @xdg_appsdir@ +xdg_directorydir = @xdg_directorydir@ +xdg_menudir = @xdg_menudir@ +konversationicondir = $(kde_datadir)/konversation/themes/oxygen +konversationicon_DATA = irc_admin.png irc_away.png irc_halfop.png irc_normal.png irc_op.png \ + irc_owner.png irc_voice.png index.desktop + +#>- all: all-am +#>+ 1 +all: docs-am all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +#>- @for dep in $?; do \ +#>- case '$(am__configure_deps)' in \ +#>- *$$dep*) \ +#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +#>- && exit 0; \ +#>- exit 1;; \ +#>- esac; \ +#>- done; \ +#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konversation/images/nickicons/oxygen/Makefile'; \ +#>- cd $(top_srcdir) && \ +#>- $(AUTOMAKE) --gnu konversation/images/nickicons/oxygen/Makefile +#>+ 12 + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konversation/images/nickicons/oxygen/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu konversation/images/nickicons/oxygen/Makefile + cd $(top_srcdir) && perl admin/am_edit konversation/images/nickicons/oxygen/Makefile.in +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-konversationiconDATA: $(konversationicon_DATA) + @$(NORMAL_INSTALL) + test -z "$(konversationicondir)" || $(MKDIR_P) "$(DESTDIR)$(konversationicondir)" + @list='$(konversationicon_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(konversationiconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(konversationicondir)/$$f'"; \ + $(konversationiconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(konversationicondir)/$$f"; \ + done + +uninstall-konversationiconDATA: + @$(NORMAL_UNINSTALL) + @list='$(konversationicon_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(konversationicondir)/$$f'"; \ + rm -f "$(DESTDIR)$(konversationicondir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(konversationicondir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +#>- clean: clean-am +#>+ 1 +clean: kde-rpo-clean clean-am + +#>- clean-am: clean-generic clean-libtool mostlyclean-am +#>+ 1 +clean-am: clean-bcheck clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-konversationiconDATA + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-konversationiconDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-konversationiconDATA \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-konversationiconDATA + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: + +#>+ 2 +KDE_DIST=irc_away.png irc_owner.png index.desktop irc_halfop.png irc_normal.png irc_voice.png Makefile.in irc_op.png irc_admin.png Makefile.am + +#>+ 2 +docs-am: + +#>+ 15 +force-reedit: + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu konversation/images/nickicons/oxygen/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu konversation/images/nickicons/oxygen/Makefile + cd $(top_srcdir) && perl admin/am_edit konversation/images/nickicons/oxygen/Makefile.in + + +#>+ 21 +clean-bcheck: + rm -f *.bchecktest.cc *.bchecktest.cc.class a.out + +bcheck: bcheck-am + +bcheck-am: + @for i in ; do \ + if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ + echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ + echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ + echo "$$i"; \ + if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ + rm -f $$i.bchecktest.cc; exit 1; \ + fi ; \ + echo "" >> $$i.bchecktest.cc.class; \ + perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ + rm -f a.out; \ + fi ; \ + done + + +#>+ 3 +final: + $(MAKE) all-am + +#>+ 3 +final-install: + $(MAKE) install-am + +#>+ 3 +no-final: + $(MAKE) all-am + +#>+ 3 +no-final-install: + $(MAKE) install-am + +#>+ 3 +kde-rpo-clean: + -rm -f *.rpo + +#>+ 3 +nmcheck: +nmcheck-am: nmcheck diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/smiling/index.desktop /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/smiling/index.desktop --- konversation-1.0.1/konversation/images/nickicons/smiling/index.desktop 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/smiling/index.desktop 2008-08-06 16:56:27.000000000 +0100 @@ -7,15 +7,18 @@ Name[ca]=Tema Smiling Name[cs]=Smajlíkové téma Name[da]=Smilende tema +Name[de]=Smiley-Design Name[el]=Θέμα χαμόγελου Name[es]=Tema «Smiling» Name[et]=Naerusuuteema Name[fi]=Hymiöteema Name[fr]=Thème sourire +Name[ga]=Téama "Smiling" Name[gl]=Tema Sorrinte Name[he]=ערכה מחייכת Name[hi]=मुस्कुराता प्रसंग Name[it]=Tema sorridente +Name[ja]=スマイリー Name[ka]=მომღიმარი გაფორმება Name[lt]=Besišypsanti tema Name[nl]=Smiling-thema @@ -30,6 +33,7 @@ Name[tr]=Gülümseyen Tema Name[uk]=Тема посмішок Name[xx]=xxSmiling Themexx +Name[zh_CN]=微笑主题 Name[zh_TW]=微笑主題 Comment="Smiling" stolen from Kopete by John Tapsell Comment[ar]=أخِذ "Smiling" من Kopete من قِبل John Tapsell @@ -43,10 +47,12 @@ Comment[et]="Smiling" (Kopetest hiivas John Tapsell) Comment[fi]="Hymiöteema" Kopetesta (John Tapsell) Comment[fr]=« Sourire » volé à Kopete par John Tapsell +Comment[ga]="Smiling", goidte ó Kopete ag John Tapsell Comment[gl]="Sorriso" roubado de Kopete por John Tapsell Comment[he]="ערכה מחייכת" נגנבה מ־Kopete על ידי John Tapsell Comment[hi]="मुस्कान" को के-ऑप्टी से जॉन तापसेल द्वारा चुराया गया -Comment[it]="Sorridente" rubato a Kopete da John Tapsell +Comment[it]=«Sorridente» rubato a Kopete da John Tapsell +Comment[ja]=John Tapsell 作の Kopete のテーマを借用 Comment[ka]="მომღიმარი" მოპარულია Kopete-დან ჯონ ტაპსელის მიერ Comment[lt]=„Besišypsanti tema“, John Tapsell pavogta iš Kopete programos Comment[nl]="Smiling", overgenomen van Kopete, door John Tapsell @@ -60,5 +66,5 @@ Comment[tr]=John Tapsell tarafından Kopete'in "Gülümseyen"i Comment[uk]="Посмішки" взято з Kopete - John Tapsell Comment[xx]=xx"Smiling" stolen from Kopete by John Tapsellxx +Comment[zh_CN]=“微笑”，借鉴自 John Tapsell 为 Kopete 设计的造型 Comment[zh_TW]="微笑"主題，從 Kopete 偷來的，由 John Tapsell 撰寫 -Encoding=UTF-8 diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/smiling/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/smiling/Makefile.in --- konversation-1.0.1/konversation/images/nickicons/smiling/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/smiling/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -63,8 +59,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -104,7 +98,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -179,12 +175,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -198,6 +196,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -217,24 +216,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -246,19 +243,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -285,30 +281,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -371,13 +367,9 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-konversationiconDATA: $(konversationicon_DATA) @$(NORMAL_INSTALL) - test -z "$(konversationicondir)" || $(mkdir_p) "$(DESTDIR)$(konversationicondir)" + test -z "$(konversationicondir)" || $(MKDIR_P) "$(DESTDIR)$(konversationicondir)" @list='$(konversationicon_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -400,22 +392,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -431,7 +422,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(konversationicondir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -467,7 +458,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -481,12 +472,20 @@ install-data-am: install-konversationiconDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -505,25 +504,28 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-konversationiconDATA +uninstall-am: uninstall-konversationiconDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-konversationiconDATA \ - install-man install-strip installcheck installcheck-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-konversationiconDATA + ps ps-am uninstall uninstall-am uninstall-konversationiconDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: #>+ 2 -KDE_DIST=irc_owner.png irc_away.png index.desktop irc_halfop.png irc_normal.png irc_voice.png Makefile.in irc_op.png irc_admin.png Makefile.am +KDE_DIST=irc_away.png irc_owner.png index.desktop irc_halfop.png irc_normal.png irc_voice.png Makefile.in irc_op.png irc_admin.png Makefile.am #>+ 2 docs-am: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/square/index.desktop /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/square/index.desktop --- konversation-1.0.1/konversation/images/nickicons/square/index.desktop 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/square/index.desktop 2008-08-06 16:56:27.000000000 +0100 @@ -7,15 +7,17 @@ Name[ca]=Tema Square Name[cs]=Square téma Name[da]=Square tema -Name[de]=SQUARE-Design +Name[de]=Rechteck-Design Name[el]=Τετράγωνο θέμα Name[es]=Tema «Square» Name[et]=Kandiline teema Name[fi]=Neliöteema Name[fr]=Thème carré +Name[ga]=Téama "Square" Name[gl]=Tema Cadrado Name[he]=ערכה מרובעת Name[it]=Tema quadrato +Name[ja]=四角 Name[ka]=კვადრატული გაფორმება Name[lt]=Kvadratinė tema Name[nl]=Vierkant thema @@ -30,6 +32,7 @@ Name[tr]=Kare Teması Name[uk]=Квадратна тема Name[xx]=xxSquare Themexx +Name[zh_CN]=方块主题 Name[zh_TW]=方塊主題 Comment="SQUARE" by Kenichiro Takahashi Comment[ar]="SQUARE" تأليف Kenichiro Takahashi @@ -47,7 +50,8 @@ Comment[ga]="SQUARE" le Kenichiro Takahashi Comment[gl]="Cadrado" por Kenichiro Takahashi Comment[he]="ערכה מרובעת" של Kenichiro Takahashi -Comment[it]="Quadrato" di Kenichiro Takahashi +Comment[it]=«Quadrato» di Kenichiro Takahashi +Comment[ja]=Kenichiro Takahashi 作の四角いテーマ Comment[ka]="კვადრატული" კენიჩირო ტაკაჰაშის მიერ Comment[lt]=„Kvadratinė tema“, sukurta Kenichiro Takahashi Comment[nl]="SQUARE" door Kenichiro Takahashi @@ -61,5 +65,5 @@ Comment[tr]=Kenichiro Takahashi tarafından "KARE" Comment[uk]="КВАДРАТ" - Kenichiro Takahashi Comment[xx]=xx"SQUARE" by Kenichiro Takahashixx +Comment[zh_CN]=“方块”，由 Kenichiro Takahashi 设计 Comment[zh_TW]="方塊"主題，由 Kenichiro Takahashi 撰寫 -Encoding=UTF-8 diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/images/nickicons/square/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/images/nickicons/square/Makefile.in --- konversation-1.0.1/konversation/images/nickicons/square/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/images/nickicons/square/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -63,8 +59,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -104,7 +98,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -179,12 +175,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -198,6 +196,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -217,24 +216,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -246,19 +243,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -285,30 +281,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -371,13 +367,9 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-konversationiconDATA: $(konversationicon_DATA) @$(NORMAL_INSTALL) - test -z "$(konversationicondir)" || $(mkdir_p) "$(DESTDIR)$(konversationicondir)" + test -z "$(konversationicondir)" || $(MKDIR_P) "$(DESTDIR)$(konversationicondir)" @list='$(konversationicon_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -400,22 +392,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -431,7 +422,7 @@ all-am: Makefile $(DATA) installdirs: for dir in "$(DESTDIR)$(konversationicondir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -467,7 +458,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -481,12 +472,20 @@ install-data-am: install-konversationiconDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -505,25 +504,28 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-konversationiconDATA +uninstall-am: uninstall-konversationiconDATA + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-konversationiconDATA \ - install-man install-strip installcheck installcheck-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-info-am \ - uninstall-konversationiconDATA + ps ps-am uninstall uninstall-am uninstall-konversationiconDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: #>+ 2 -KDE_DIST=irc_owner.png irc_away.png index.desktop irc_halfop.png irc_normal.png irc_voice.png Makefile.in irc_op.png irc_admin.png Makefile.am +KDE_DIST=irc_away.png irc_owner.png index.desktop irc_halfop.png irc_normal.png irc_voice.png Makefile.in irc_op.png irc_admin.png Makefile.am #>+ 2 docs-am: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/Makefile.in --- konversation-1.0.1/konversation/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -52,17 +48,21 @@ DIST_SOURCES = #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ #>- html-recursive info-recursive install-data-recursive \ -#>- install-exec-recursive install-info-recursive \ -#>- install-recursive installcheck-recursive installdirs-recursive \ -#>- pdf-recursive ps-recursive uninstall-info-recursive \ -#>- uninstall-recursive -#>+ 6 +#>- install-dvi-recursive install-exec-recursive \ +#>- install-html-recursive install-info-recursive \ +#>- install-pdf-recursive install-ps-recursive install-recursive \ +#>- installcheck-recursive installdirs-recursive pdf-recursive \ +#>- ps-recursive uninstall-recursive +#>+ 7 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive nmcheck-recursive bcheck-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -70,8 +70,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -111,7 +109,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -186,12 +186,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -205,6 +207,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -224,24 +227,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -253,19 +254,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -292,30 +292,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -377,10 +377,6 @@ clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -412,8 +408,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -457,8 +452,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -483,8 +478,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -494,13 +489,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -514,23 +508,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../admin - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -544,7 +536,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -552,6 +544,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -595,8 +589,7 @@ distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags +distclean-am: clean-am distclean-generic distclean-tags dvi: dvi-recursive @@ -610,12 +603,20 @@ install-data-am: install-data-local +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -634,23 +635,24 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-local +uninstall-am: uninstall-local -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local install-exec \ - install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am \ - uninstall-local + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-local messages: rc.cpp @@ -732,11 +734,11 @@ uninstall-apidox: @if test "$(subdir)" != "."; then \ if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \ - rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \ + rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \ fi \ else \ if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \ - rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ + rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ fi \ fi diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/NEWS /tmp/ZeUXpSU1gs/konversation-1.1/konversation/NEWS --- konversation-1.0.1/konversation/NEWS 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/NEWS 2008-08-06 16:56:27.000000000 +0100 @@ -1,2 +1,5 @@ +Mon Jul 14 08:40:00 CEST 2008 +- Konversation now depends on KDE 3.5 + Tue Jan 17 16:11:00 CEST 2006 - Konversation now depends on KDE 3.4 diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/scripts/cmd /tmp/ZeUXpSU1gs/konversation-1.1/konversation/scripts/cmd --- konversation-1.0.1/konversation/scripts/cmd 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/scripts/cmd 2008-08-06 16:56:27.000000000 +0100 @@ -7,12 +7,17 @@ $TARGET= shift; my $i; +my $command; if( $ARGV[0] eq "yes" ){ exec 'dcop', $PORT, 'default', 'error', 'Requested command is not executed!'; } -$ARG_MESSAGE = `@ARGV`; +foreach $word (@ARGV) { + $command = $command." ".$word; +} + +$ARG_MESSAGE = `exec $command`; foreach $entry (split(/\n/, $ARG_MESSAGE)) { chomp $entry; @@ -22,5 +27,5 @@ } unless($i) { - exec 'dcop', $PORT, 'default', 'error', 'Command @ARGV doesn\'t exist!'; + exec 'dcop', $PORT, 'default', 'error', "Command @ARGV doesn't exist"; } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/scripts/fortune /tmp/ZeUXpSU1gs/konversation-1.1/konversation/scripts/fortune --- konversation-1.0.1/konversation/scripts/fortune 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/scripts/fortune 2008-08-06 16:56:27.000000000 +0100 @@ -25,7 +25,7 @@ srand; $LINE = RANDOM_INT(0,$TOTAL_LINES - 5); -$MESSAGE = "%B%C4Random Fortune:%C%B "; +$MESSAGE = "4Random Fortune: "; while () { $LINE_COUNT++; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/scripts/google /tmp/ZeUXpSU1gs/konversation-1.1/konversation/scripts/google --- konversation-1.0.1/konversation/scripts/google 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/scripts/google 1970-01-01 01:00:00.000000000 +0100 @@ -1,149 +0,0 @@ -#!/usr/bin/env perl -# Copyright (C) 2005 by İsmail Dönmez ( Resistence is futile, turn on god damn Unicode! ) -# Licensed under GPL v2 or later at your option -# -# A simple google search script using Google's SOAP api - -use warnings; -use strict; -use Getopt::Long; - -my $port=shift; -my $server=shift; -my $target=shift; -my $key; -my $googleSearch; -my $result; -my $print; -my $spell; -my $search; -my $search_escape; -my $spellcheck; -my $browser; -my $error; -my $url; -my $info; -my $query; -my $limit=5; - - -GetOptions('search=s' => \$search, - 'spell=s' => \$spellcheck, - 'browser' => \$browser, - 'limit|max|maxresults=i' => \$limit); - -if(!$browser && !$search && !$spellcheck && !@ARGV) -{ - system 'dcop', $port, 'default', 'info', "\x02Google Search Script Usage:\x02"; - system 'dcop', $port, 'default', 'info', '/google (--max ) (--search) : Search for keyword at Google'; - system 'dcop', $port, 'default', 'info', '/google --spell : Spellcheck word using Google'; - exec 'dcop', $port, 'default', 'info', '/google -b : Show results in konqueror'; -} -elsif($browser) -{ - $query = join(" ",@ARGV); - $query = CGI::escape($query); - - if(@ARGV) - { - $url="http://www.google.com/search?q=$query"; - } - else - { - $url="http://www.google.com/"; - } - exec 'kfmclient','openURL',$url; -} - -eval { require SOAP::Lite; }; - -if($@) -{ - exec 'dcop', $port, 'default', 'error', "You need the perl SOAP::Lite module installed."; -} - -eval { require HTML::Entities; }; - -if($@) -{ - exec 'dcop', $port, 'default', 'error', "You need the perl HTML::Entities module installed."; -} - -use CGI qw(:standard); - -if(!open(KEY, "$ENV{'HOME'}/.googlekey")) -{ - system 'dcop', $port, 'default', 'error', "~/.googlekey doesn't exist!"; - system 'dcop', $port, 'default', 'error', "Get a key from http://api.google.com/createkey and put the key in ~/.googlekey"; -} -else -{ - while() - { - chomp; - $key = $_; - } - - close(KEY); - - if($search || !$spellcheck) - { - $search = join(" ",$search,@ARGV); - system 'dcop', $port, 'default', 'info', "Searching Google for \x02$search\x02 ..."; - - $googleSearch = SOAP::Lite->service("http://api.google.com/GoogleSearch.wsdl")-> - on_fault(sub { - my $res = $_[0]; - $error = $res->call->faultstring; - exec 'dcop', $port, 'default', 'error', "$error"; - }); - - if(utf8::valid($search)) - { - utf8::decode($search); - } - - $search_escape = $search; - # Encode "&", "<", ">", and "'" . See http://groups.yahoo.com/group/soaplite/message/3037 - HTML::Entities::encode_entities($search_escape, "&<>'"); - if($limit > 10) { $limit=10; } - $result = $googleSearch->doGoogleSearch($key, $search_escape, 0, $limit, "false", "", "false", "", "UTF-8", "UTF-8"); - - if($result->{estimatedTotalResultsCount} > 0) - { - system 'dcop', $port, 'default', 'info', "Results \x021-$limit\x02 of about \x02$result->{estimatedTotalResultsCount}\x02 for \x02$search\x02 (\x02$result->{searchTime}\x02 seconds)"; - } - else - { - exec 'dcop', $port, 'default', 'error', 'Google search returned zero results'; - } - - foreach $result (@{$result->{resultElements}}) - { - $print = $result->{URL}." (".$result->{title}.")"; - $print =~ s/\/\x02/g; - $print =~ s/\<\/b\>/\x02/g; - HTML::Entities::decode_entities($print); - system 'dcop', $port, 'default', 'info', $print; - } - } - elsif($spellcheck) - { - $spellcheck = join(" ",$spellcheck,@ARGV); - - system 'dcop', $port, 'default', 'info', "Spellchecking \x02$spellcheck\x02 ..."; - $googleSearch = SOAP::Lite->service("http://api.google.com/GoogleSearch.wsdl"); - $spell = $googleSearch->doSpellingSuggestion($key, $spellcheck); - - if($spell) - { - $spell = "Spelling suggestion: \x02$spell\x02"; - } - else - { - exec 'dcop', $port, 'default', 'error','No alternative spelling found'; - } - - system 'dcop', $port, 'default', 'info', $spell; - } -} diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/scripts/Makefile.am /tmp/ZeUXpSU1gs/konversation-1.1/konversation/scripts/Makefile.am --- konversation-1.0.1/konversation/scripts/Makefile.am 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/scripts/Makefile.am 2008-08-06 16:56:27.000000000 +0100 @@ -1,4 +1,4 @@ scriptsdir=$(kde_datadir)/konversation/scripts -scripts_SCRIPTS=bug fortune gauge uptime kdeversion cmd sayclip weather sysinfo media mail google qurl +scripts_SCRIPTS=bug fortune gauge uptime kdeversion cmd sayclip weather sysinfo media mail tinyurl scripts_DATA=fortunes.dat diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/scripts/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/scripts/Makefile.in --- konversation-1.0.1/konversation/scripts/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/scripts/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,15 +16,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -66,8 +62,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -107,7 +101,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -182,12 +178,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -201,6 +199,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -220,24 +219,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -249,19 +246,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -288,37 +284,37 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ scriptsdir = $(kde_datadir)/konversation/scripts -scripts_SCRIPTS = bug fortune gauge uptime kdeversion cmd sayclip weather sysinfo media mail google qurl +scripts_SCRIPTS = bug fortune gauge uptime kdeversion cmd sayclip weather sysinfo media mail tinyurl scripts_DATA = fortunes.dat #>- all: all-am #>+ 1 @@ -369,7 +365,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-scriptsSCRIPTS: $(scripts_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(scriptsdir)" || $(mkdir_p) "$(DESTDIR)$(scriptsdir)" + test -z "$(scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptsdir)" @list='$(scripts_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -392,13 +388,9 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-scriptsDATA: $(scripts_DATA) @$(NORMAL_INSTALL) - test -z "$(scriptsdir)" || $(mkdir_p) "$(DESTDIR)$(scriptsdir)" + test -z "$(scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptsdir)" @list='$(scripts_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -421,22 +413,21 @@ distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -452,7 +443,7 @@ all-am: Makefile $(SCRIPTS) $(DATA) installdirs: for dir in "$(DESTDIR)$(scriptsdir)" "$(DESTDIR)$(scriptsdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -488,7 +479,7 @@ distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -502,12 +493,20 @@ install-data-am: install-scriptsDATA install-scriptsSCRIPTS +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -526,27 +525,29 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-scriptsDATA \ - uninstall-scriptsSCRIPTS +uninstall-am: uninstall-scriptsDATA uninstall-scriptsSCRIPTS + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-scriptsDATA \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-scriptsDATA \ install-scriptsSCRIPTS install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am uninstall-scriptsDATA \ - uninstall-scriptsSCRIPTS + uninstall-scriptsDATA uninstall-scriptsSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: #>+ 2 -KDE_DIST=google fortune media uptime cmd sayclip Makefile.in sysinfo bug fortunes.dat qurl weather mail kdeversion gauge Makefile.am +KDE_DIST=fortune media uptime cmd sayclip Makefile.in bug sysinfo fortunes.dat weather mail kdeversion tinyurl gauge Makefile.am #>+ 2 docs-am: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/scripts/media /tmp/ZeUXpSU1gs/konversation-1.1/konversation/scripts/media --- konversation-1.0.1/konversation/scripts/media 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/scripts/media 2008-08-06 16:56:27.000000000 +0100 @@ -43,8 +43,8 @@ ## Static player ranking list ## If you add a new player, you must add it here or it won't get checked when in audio-only or video-only modes. playerRankings= { - 'video' :['kaffeine', 'noatun', 'kdetv'], - 'audio' :['Amarok', 'JuK', 'Noatun', 'Kaffeine', 'kscd', 'XMMS', 'Yammi'] + 'video' :['kaffeine','kmplayer', 'kplayer', 'noatun', 'kdetv'], + 'audio' :['amarok', 'MPD' 'juk', 'noatun', 'kscd', 'kaffeine', 'kmplayer', 'Audacious', 'xmms', 'yammi'] } ## Title, album and artist fields to be quoted depending on contents @@ -244,6 +244,94 @@ return '' return data +#class Amarok2Player(Player): +# def __init__(self): +# Player.__init__(self, 'Amarok2', 'audio') +# self.isRunning() +# +# def getData(self): +# playing=os.popen("qdbus org.mpris.amarok /Player PositionGet").readline().strip() != "0" +# if playing and self.isRunning(): +# for line in os.popen("qdbus org.mpris.amarok /Player GetMetadata").readlines(): +# if re.match("^title", line): +# title=self.reEncodeString(line.strip().split(None,1)[1]) +# if re.match("^artist", line): +# artist=self.reEncodeString(line.strip().split(None,1)[1]) +# if re.match("^album", line): +# album=self.reEncodeString(line.strip().split(None,1)[1]) +# return (title, artist, album) +# else: +# return '' +# +# def isRunning(self): +# qdbus_items=subprocess.Popen(['qdbus'], stdout=subprocess.PIPE).communicate()[0] +# running=re.findall('^ org.mpris.amarok$', qdbus_items, re.M) +# if type(running) is list: +# try: +# running=running[0] +# except IndexError: +# running='' +# self.running=bool(running.strip()) +# return self.running + +import socket + +class MPD(Player): + def __init__(self, display_name): + Player.__init__(self, display_name) + + self.host = "localhost" + self.port = 6600 + self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.sock.settimeout(0.5) + + try: + self.sock.connect((self.host, self.port)) + # just welcome message, we don't need it + self.sock.recv(1024) + self.running = True + except socket.error: + self.running = False + + def getData(self): + if not self.running: + return '' + try: + self.sock.send("currentsong\n") + data = self.sock.recv(1024) + except socket.error: + return '' + + # mpd sends OK always, so if nothing to show, we should seek for at least 3 chars + if len(data) < 4: + return '' + else: + # if there is Artist, Title and Album, get it + data=data.splitlines() + d={} + for i in data: + if ':' not in i: + continue + k,v=i.split(':',1) + d[k.lower()]=self.reEncodeString(v.strip()) + data=(d.get('title',''),d.get('artist',''),d.get('album','')) + if not any(data): + return d.get('file','') + return data + +class StupidPlayer(DCOPPlayer): + def getData(self): + data=DCOPPlayer.getData(self)[0] + if data: + if data.startswith('URL'): + # KMPlayer window titles in the form of "URL - file:///path/to/ - KMPlayer" + data=data.split(None,2)[2].rsplit(None,2)[0].rsplit('/')[-1] + else: + # KPlayer window titles in the form of " - KPlayer" + data=data.rsplit(None,2)[0] + return (data,'','') + return '' + try: import xmms.common class XmmsPlayer(Player): @@ -265,6 +353,30 @@ except ImportError: XmmsPlayer=Player +class AudaciousPlayer(Player): + def __init__(self, display_name): + Player.__init__(self, display_name) + + def isRunning(self): + self.running = not os.system('audtool current-song') + return self.running + + def getData(self): + if self.isRunning() and not os.system('audtool playback-playing'): + # get the title of the currently playing track + data = os.popen('audtool current-song').read().strip() + data_list = data.split(' - ') + list_length = len(data_list) + if list_length == 1: + return (self.reEncodeString(data_list[0]),'','') + elif list_length == 3: + return (self.reEncodeString(data_list[-1]),data_list[0],data_list[1]) + else: + return (self.reEncodeString(data),'','') + else: + return '' + + def playing(playerList, mode=None): for i in playerList: s=i.get(mode) @@ -296,7 +408,7 @@ unsorted=dict([(i.displayName.lower(),i) for i in PLAYERS if kind in i.type]) play=[unsorted.pop(i.lower(),Player("ImproperlySupported")) for i in playerRankings[kind]] if len(unsorted): - play.extend(unsorted.values) + play.extend(unsorted.values()) else: play=[i for i in PLAYERS if i.displayName.lower() == kind] try: @@ -323,10 +435,13 @@ DCOPPlayer("JuK","juk","Player trackProperty Title","Player trackProperty Artist","Player trackProperty Album"), DCOPPlayer("Noatun",'noatun',"Noatun title",playerType='audio, video'), DCOPPlayer("Kaffeine","kaffeine","KaffeineIface title","KaffeineIface artist","KaffeineIface album",playerType='video, audio'), +StupidPlayer("KMPlayer","kmplayer","kmplayer-mainwindow#1 caption",playerType="video audio"), +StupidPlayer("KPlayer","kplayer","kplayer-mainwindow#1 caption",playerType="video audio"), DCOPPlayer("KsCD","kscd","CDPlayer currentTrackTitle","CDPlayer currentArtist","CDPlayer currentAlbum"), -XmmsPlayer('XMMS'), -DCOPPlayer("Yammi","yammi","YammiPlayer songTitle","YammiPlayer songArtist","YammiPlayer songAlbum"), DCOPPlayer("kdetv","kdetv","KdetvIface channelName",playerType='video'), +AudaciousPlayer('Audacious'), XmmsPlayer('XMMS'), +DCOPPlayer("Yammi","yammi","YammiPlayer songTitle","YammiPlayer songArtist","YammiPlayer songAlbum"), +MPD('MPD') ] # Get rid of players that didn't get subclassed so they don't appear in the available players list @@ -345,13 +460,13 @@ if __name__=="__main__": if not TARGET: - s="""media v2.0 for Konversation 1.0. One media command to rule them all, inspired from Kopete's now listening plugin. + s="""media v2.0.1 for Konversation 1.0. One media command to rule them all, inspired from Kopete's now listening plugin. Usage: "\00312/media\017" - report what the first player found is playing "\00312/media\017 [ '\00312audio\017' | '\00312video\017' ]" - report what is playing in a supported audio or video player "\00312/media\017 { \00312Player\017 }" - report what is playing in \00312Player\017 if it is supported - Available players are, in the order they will be checked: + Available players are: """ + ', '.join([("%s (%s)"%(i.displayName,i.type)) for i in PLAYERS]) for i in s.splitlines(): diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/scripts/qurl /tmp/ZeUXpSU1gs/konversation-1.1/konversation/scripts/qurl --- konversation-1.0.1/konversation/scripts/qurl 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/scripts/qurl 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -#!/usr/bin/env ruby -# Copyright (c) 2005 Stanislav Karchenny -# Licensed under MIT License. - -require 'net/http' -require 'cgi' - -$port = ARGV[0] -$server = ARGV[1] -$target = ARGV[2] -url = ARGV[3] - -def dcoperr msg - `dcop #{$port} default error #{msg}` -end - -def dcopsay msg - `dcop #{$port} default say #{$server} #{$target} #{msg}` -end - - -unless $target - dcoperr "Can't write into status view." - exit -end - -unless url - dcoperr "Please provide url to shorten" - exit -end - -Net::HTTP.start('qurl.net',80) do |http| - response = http.post("/", "action=#{CGI::escape("Create qURL")}&url=#{CGI::escape(url)}", {'User-Agent'=>'konversation'}) - if response.code != "200" - dcoperr "Request to qurl.net failed, #{response.code} #{response.message}" - exit - else - if response.body =~ /([^>]+)<\/p>/ - dcoperr "qurl returned error: #{$1}" - dcoperr "Maybe your URL was not well-formed?" - else - dcoperr "nothing parsable found in qurl reply" - end - end -end diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/scripts/sysinfo /tmp/ZeUXpSU1gs/konversation-1.1/konversation/scripts/sysinfo --- konversation-1.0.1/konversation/scripts/sysinfo 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/scripts/sysinfo 2008-08-06 16:56:27.000000000 +0100 @@ -16,7 +16,13 @@ HN="$(hostname)" OSKERN="$(uname -s) $(uname -r)" -KDE="$(kde-config --version | sed -n '2p' | sed 's/://;s/ *$//')" +if [ "$KDE_FULL_SESSION" = "true" ]; then + if [ "$KDE_SESSION_VERSION" = 4 ]; then + KDE="$(kde4-config --version | sed -n '2p' | sed 's/://;s/ *$//')" + else + KDE="$(kde-config --version | sed -n '2p' | sed 's/://;s/ *$//')" + fi +fi CPU=$(awk -F':' '/model name/{name=$2} /cpu MHz/{mhz=int($2)} @@ -32,9 +38,9 @@ } ' /proc/cpuinfo ) -HDD=$(df -l| awk '($1~/dev/){ - use+=$3/1024**2; - tot+=$2/1024**2; +HDD=$(df -lP| awk '($1~/\/dev/){ + use+=$3/1024^2; + tot+=$2/1024^2; } END{print "HD: " int(use) "/" int(tot) "GB"}') @@ -69,10 +75,10 @@ out="Sysinfo for '$HN': $OSKERN running $KDE, $CPU, $HDD, $MEM, $PROC proc's, ${UPT}" -if [ "x$PORT" == "x" ] ; then +if [ "x$PORT" = "x" ] ; then echo "$out" else - if [ "x$TARGET" == "x" ] ; then + if [ "x$TARGET" = "x" ] ; then dcop $PORT default error "$out" else dcop $PORT default say $SERVER "$TARGET" "$out" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/scripts/tinyurl /tmp/ZeUXpSU1gs/konversation-1.1/konversation/scripts/tinyurl --- konversation-1.0.1/konversation/scripts/tinyurl 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/scripts/tinyurl 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,31 @@ +#!/usr/bin/env bash +# +# Creates a TinyURL from a long URL +# Licensed under GPL v2 or later at your option +# Copyright 2007 Terence Simpson + +PORT=$1 +SERVER=$2 +TARGET=$3 +export URL="$4" +NICK="$5" + +if test ! -z $URL; then + if test $(which curl); then + TINYURL="$(curl -s -i http://tinyurl.com/create.php?url=$URL|grep "The following URL" -A3|tail -1|awk -F\> '{print $3}'|sed 's, '{print $3}'|sed 's, +# +# Copyright 2005,2007 by İsmail Dönmez # Licensed under GPL v2 or later at your option -import os import sys -import re from subprocess import * -if __name__ == "__main__": - - port = sys.argv[1] - server = sys.argv[2] - target = sys.argv[3] +port = sys.argv[1] +server = sys.argv[2] +target = sys.argv[3] + +msg_template = "Current weather for %%B%s%%B : Temperature: %%B%s%%B, Pressure: %%B%s%%B, Wind: %%B%s%%B" +msg_detailed_template = "Current weather for %%B%s%%B : %%B%s%%B, Temperature: %%B%s%%B, Pressure: %%B%s%%B, Wind: %%B%s%%B" + +def printMessage(message=None): + Popen(['dcop', port, 'default', 'say', server, target, message]).communicate() + +def printError(message=None): + Popen(['dcop', port, 'default', 'error', message]).communicate() + +def getData(section, station=None): + if station: + data = Popen(['dcop','KWeatherService','WeatherService', section, station], stdout=PIPE).communicate()[0].rstrip("\n") + else: + data = Popen(['dcop','KWeatherService','WeatherService', section], stdout=PIPE).communicate()[0].rstrip("\n") + + return data + +def stationMessage(station): + city = getData("stationName", station) + temperature = getData("temperature", station) + pressure = getData("pressure", station) + wind = getData("wind", station) + detail = getData("weather", station) + detail2 = getData("cover", station) + + if detail2: + if detail: + detail = detail+', '+detail2 + else: + detail = detail2 + + if detail: + return msg_detailed_template % (city,detail,temperature,pressure,wind) + else: + return msg_template % (city,temperature,pressure,wind) + +def printWeather(index): + stations = getData("listStations").split("\n") + + if index != None: + if index <= 0: + printError("Station index should be bigger than zero!") + elif index > len(stations): + printError("Station index is out of range") + else: + printMessage(stationMessage(stations[index-1])) + else: + for station in stations: + printMessage(stationMessage(station)) +if __name__ == "__main__": try: - option = int(sys.argv[4]) + index = int(sys.argv[4]) except IndexError: - pass - - stations = os.popen('dcop KWeatherService WeatherService listStations').readlines() - - if not stations: - os.popen('dcop %s default error KWeather is not installed or not running!'%(port)) - - try: - if option and stations[option-1]: - stations = stations[option-1] - except NameError: - pass - - for station in stations: - - city = os.popen('dcop KWeatherService WeatherService stationName %s'%(station)).readline().rstrip('\n') - temperature = os.popen('dcop KWeatherService WeatherService temperature %s'%(station)).readline().rstrip('\n') - pressure = os.popen('dcop KWeatherService WeatherService pressure %s'%(station)).readline() .rstrip('\n') - wind = os.popen('dcop KWeatherService WeatherService wind %s'%(station)).readline().rstrip('\n') - detail = os.popen('dcop KWeatherService WeatherService weather %s'%(station)).readline().rstrip('\n') - detail2 = os.popen('dcop KWeatherService WeatherService cover %s'%(station)).readline().rstrip('\n') - - detail = ', '.join(re.split('\n',detail)) - detail2 = ', '.join(re.split('\n',detail2)) - - if detail2: - if detail: - detail = detail+', '+detail2 - else: - detail = detail2 - else: - pass - - if detail: - message = 'Current weather for %%B%s%%B : %%B%s%%B, Temperature: %%B%s%%B, Pressure: %%B%s%%B, Wind: %%B%s%%B'%(city,detail,temperature,pressure,wind) - else: - message = 'Current weather for %s : Temperature: %%B%s%%B, Pressure: %%B%s%%B, Wind: %%B%s%%B'%(city,temperature,pressure,wind) + index = None - Popen(['dcop', port, 'default', 'say', server, target, message]).communicate() + printWeather(index) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/alias_preferences.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/alias_preferences.cpp --- konversation-1.0.1/konversation/src/alias_preferences.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/alias_preferences.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -10,6 +10,9 @@ Copyright (C) 2006 John Tapsell */ +#include "alias_preferences.h" +#include "config/preferences.h" + #include #include #include @@ -21,9 +24,6 @@ #include #include -#include "config/preferences.h" - -#include "alias_preferences.h" Alias_Config::Alias_Config(QWidget* parent, const char* name) : Alias_ConfigUI(parent, name) @@ -170,7 +170,7 @@ void Alias_Config::addEntry() { // add new item at the bottom of list view - KListViewItem* newItem = new KListViewItem(aliasListView,aliasListView->lastChild(),i18n("New"),QString::null); + KListViewItem* newItem = new KListViewItem(aliasListView,aliasListView->lastChild(),i18n("New"),QString()); // if successful ... if (newItem) { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/alias_preferencesui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/alias_preferencesui.ui --- konversation-1.0.1/konversation/src/alias_preferencesui.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/alias_preferencesui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -27,39 +27,39 @@ unnamed - + - replacementLabel + aliasLabel false - Replacement: + Alias: - + - aliasLabel + replacementLabel false - Alias: + Replacement: - + - replacementInput + aliasInput false - + - aliasInput + replacementInput false @@ -157,6 +157,13 @@ + + aliasListView + aliasInput + replacementInput + newButton + removeButton + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/autoreplace_preferences.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/autoreplace_preferences.cpp --- konversation-1.0.1/konversation/src/autoreplace_preferences.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/autoreplace_preferences.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -7,12 +7,18 @@ /* Copyright (C) 2006 Dario Abatianni + Copyright (C) 2006 Eike Hein */ +#include "autoreplace_preferences.h" +#include "config/preferences.h" + #include #include #include #include +#include +#include #include #include @@ -20,21 +26,34 @@ #include #include #include - -#include "config/preferences.h" - -#include "autoreplace_preferences.h" +#include +#include #define DIRECTION_OUTPUT 0 #define DIRECTION_INPUT 1 #define DIRECTION_BOTH 2 + Autoreplace_Config::Autoreplace_Config(QWidget* parent, const char* name) : Autoreplace_ConfigUI(parent, name) { // reset flag to defined state (used to block signals when just selecting a new item) m_newItemSelected=false; + //Check if the regexp editor is installed + bool installed = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); + + if(installed) + { + regExpEditorButton->setEnabled(true); + QToolTip::add(regExpEditorButton, i18n("Click to run Regular Expression Editor (KRegExpEditor)")); + } + else + { + regExpEditorButton->setEnabled(false); + QToolTip::add(regExpEditorButton, i18n("The Regular Expression Editor (KRegExpEditor) is not installed")); + } + // populate combobox directionCombo->insertItem(i18n("Outgoing"),DIRECTION_OUTPUT); directionCombo->insertItem(i18n("Incoming"),DIRECTION_INPUT); @@ -59,6 +78,7 @@ connect(directionCombo, SIGNAL(activated(int)), this, SLOT(directionChanged(int))); connect(patternInput, SIGNAL(textChanged(const QString&)), this, SLOT(patternChanged(const QString&))); + connect(regExpEditorButton, SIGNAL(clicked()), this, SLOT(showRegExpEditor())); connect(replacementInput, SIGNAL(textChanged(const QString&)), this, SLOT(replacementChanged(const QString&))); connect(newButton, SIGNAL(clicked()), this, SLOT(addEntry())); @@ -88,7 +108,7 @@ // get autoreplace definition QString definition=autoreplaceList[index-1]; // cut definition apart in name and action, and create a new listview item - QCheckListItem* newItem=new QCheckListItem(patternListView,QString::null,QCheckListItem::CheckBox); + QCheckListItem* newItem=new QCheckListItem(patternListView,QString(),QCheckListItem::CheckBox); // Regular expression? if(definition.section(',',0,0)=="1") newItem->setOn(true); // direction input/output/both @@ -132,7 +152,7 @@ // if there were no entries at all, write a dummy entry to prevent KConfigXT from "optimizing" // the group out, which would in turn make konvi restore the default entries else - config->writeEntry("Empty List",QString::null); + config->writeEntry("Empty List",QString()); // set internal autoreplace list Preferences::setAutoreplaceList(newList); @@ -212,6 +232,12 @@ patternInput->setEnabled(enabled); replacementLabel->setEnabled(enabled); replacementInput->setEnabled(enabled); + + if(!KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) + { + regExpEditorButton->setEnabled(enabled); + } + // make checkboxes work emit modified(); } @@ -277,7 +303,7 @@ disableSort(); // add new item at the bottom of list view - QCheckListItem* newItem=new QCheckListItem(patternListView,QString::null,QCheckListItem::CheckBox); + QCheckListItem* newItem=new QCheckListItem(patternListView,QString(),QCheckListItem::CheckBox); // if successful ... if(newItem) { @@ -350,4 +376,28 @@ patternListView->setSorting(-1); } +void Autoreplace_Config::showRegExpEditor() +{ + QDialog *editorDialog = + KParts::ComponentFactory::createInstanceFromQuery( "KRegExpEditor/KRegExpEditor" ); + + if(editorDialog) + { + // kdeutils was installed, so the dialog was found. Fetch the editor interface. + KRegExpEditorInterface *reEditor = + static_cast(editorDialog->qt_cast( "KRegExpEditorInterface" ) ); + Q_ASSERT(reEditor); // This should not fail! + reEditor->setRegExp(patternInput->text()); + int dlgResult = editorDialog->exec(); + + if(dlgResult == QDialog::Accepted) + { + QString re = reEditor->regExp(); + patternInput->setText(re); + } + + delete editorDialog; + } +} + #include "autoreplace_preferences.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/autoreplace_preferences.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/autoreplace_preferences.h --- konversation-1.0.1/konversation/src/autoreplace_preferences.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/autoreplace_preferences.h 2008-08-06 16:56:27.000000000 +0100 @@ -7,6 +7,7 @@ /* Copyright (C) 2006 Dario Abatianni + Copyright (C) 2006 Eike Hein */ #ifndef AUTOREPLACECONFIG_H @@ -15,9 +16,6 @@ #include "autoreplace_preferencesui.h" #include "konvisettingspage.h" -/** - @author Dario Abatianni -*/ class Autoreplace_Config : public Autoreplace_ConfigUI, public KonviSettingsPage { @@ -45,6 +43,7 @@ void removeEntry(); void sort(int column); void disableSort(); + void showRegExpEditor(); protected: void setAutoreplaceListView(const QStringList &autoreplaceList); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/autoreplace_preferencesui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/autoreplace_preferencesui.ui --- konversation-1.0.1/konversation/src/autoreplace_preferencesui.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/autoreplace_preferencesui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -9,8 +9,8 @@ 0 0 - 430 - 380 + 586 + 576 @@ -20,124 +20,9 @@ 0 - - - layout16 - - - - unnamed - - - - replacementInput - - - false - - - - 7 - 0 - 0 - 0 - - - - - - directionLabel - - - false - - - - 0 - 5 - 0 - 0 - - - - Replace in: - - - - - patternInput - - - false - - - - 7 - 0 - 0 - 0 - - - - - - replacementLabel - - - false - - - - 0 - 5 - 0 - 0 - - - - Replace with: - - - - - directionCombo - - - false - - - - 4 - 0 - 0 - 0 - - - - - - patternLabel - - - false - - - - 0 - 5 - 0 - 0 - - - - Find: - - - - - layout10 + layout6 @@ -148,7 +33,7 @@ newButton - New + Ne&w @@ -156,7 +41,7 @@ removeButton - Remove + R&emove @@ -172,7 +57,7 @@ 20 - 165 + 506 @@ -231,7 +116,7 @@ 7 7 0 - 0 + 1 @@ -250,12 +135,158 @@ true + + + layout16 + + + + unnamed + + + + regExpEditorButton + + + false + + + + 0 + 0 + 0 + 0 + + + + ... + + + + + + + + directionLabel + + + false + + + + 5 + 5 + 0 + 0 + + + + Replace in: + + + + + patternInput + + + false + + + + 7 + 0 + 0 + 0 + + + + + + replacementInput + + + false + + + + 7 + 0 + 0 + 0 + + + + + + patternLabel + + + false + + + + 5 + 5 + 0 + 0 + + + + Find: + + + + + replacementLabel + + + false + + + + 5 + 5 + 0 + 0 + + + + Replace with: + + + + + directionCombo + + + false + + + + 5 + 0 + 1 + 0 + + + + + + + patternListView + directionCombo + patternInput + regExpEditorButton + replacementInput + newButton + removeButton + + klistview.h klineedit.h klineedit.h - klistview.h diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/awaymanager.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/awaymanager.cpp --- konversation-1.0.1/konversation/src/awaymanager.cpp 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/awaymanager.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,372 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + Copyright (c) 1999 Martin R. Jones + Copyright (C) 2008 Eike Hein +*/ + +#include "awaymanager.h" +#include "konversationapplication.h" +#include "konversationmainwindow.h" +#include "connectionmanager.h" +#include "server.h" +#include "preferences.h" + +#include + +#include +#include +#include + +#include + +#ifdef Q_WS_X11 +#include +#include +#include +#include +#ifdef HAVE_XSCREENSAVER +#define HasScreenSaver +#include +#endif +#endif + +// Don't use XIdle for now, it's experimental. +#undef HAVE_XIDLE +#undef HasXidle + + +struct AwayManagerPrivate +{ + int mouseX; + int mouseY; + unsigned int mouseMask; +#ifdef Q_WS_X11 + Window root; + Screen* screen; + Time xIdleTime; +#endif + bool useXidle; + bool useMit; +}; + +AwayManager::AwayManager(QObject* parent) : QObject(parent) +{ + int dummy = 0; + dummy = dummy; + + d = new AwayManagerPrivate; + + d->mouseX = d->mouseY = 0; + d->mouseMask = 0; + d->useXidle = false; + d->useMit = false; + + m_connectionManager = static_cast(kapp)->getConnectionManager(); + +#ifdef Q_WS_X11 + Display* display = qt_xdisplay(); + d->root = DefaultRootWindow(display); + d->screen = ScreenOfDisplay(display, DefaultScreen (display)); + + d->xIdleTime = 0; +#endif + +#ifdef HasXidle + d->useXidle = XidleQueryExtension(qt_xdisplay(), &dummy, &dummy); +#endif + +#ifdef HasScreenSaver + if (!d->useXidle) + d->useMit = XScreenSaverQueryExtension(qt_xdisplay(), &dummy, &dummy); +#endif + + m_activityTimer = new QTimer(this, "AwayTimer"); + connect(m_activityTimer, SIGNAL(timeout()), this, SLOT(checkActivity())); + + m_idleTime.start(); +} + +AwayManager::~AwayManager() +{ + delete d; +} + +void AwayManager::identitiesChanged() +{ + QValueList newIdentityList; + + QPtrList serverList = m_connectionManager->getServerList(); + Server* server = 0; + + for (server = serverList.first(); server; server = serverList.next()) + { + IdentityPtr identity = server->getIdentity(); + + if (identity && identity->getAutomaticAway() && server->isConnected()) + newIdentityList.append(identity->id()); + } + + m_identitiesOnAutoAway = newIdentityList; + + toggleTimer(); +} + +void AwayManager::identityOnline(int identityId) +{ + IdentityPtr identity = Preferences::identityById(identityId); + + if (identity && identity->getAutomaticAway() && + !m_identitiesOnAutoAway.contains(identityId)) + { + m_identitiesOnAutoAway.append(identityId); + + toggleTimer(); + } +} + +void AwayManager::identityOffline(int identityId) +{ + if (m_identitiesOnAutoAway.contains(identityId)) + { + m_identitiesOnAutoAway.remove(identityId); + + toggleTimer(); + } +} + +void AwayManager::toggleTimer() +{ + if (m_identitiesOnAutoAway.count() > 0) + { + if (!m_activityTimer->isActive()) + m_activityTimer->start(Preferences::autoAwayPollInterval() * 1000); + } + else if (m_activityTimer->isActive()) + m_activityTimer->stop(); +} + +void AwayManager::checkActivity() +{ + // Allow the event loop to be called, to avoid deadlock. + static bool rentrencyProtection = false; + if (rentrencyProtection) return; + + rentrencyProtection = true; + + DCOPRef screenSaver("kdesktop", "KScreensaverIface"); + DCOPReply isBlanked = screenSaver.callExt("isBlanked", DCOPRef::UseEventLoop, 10); + + rentrencyProtection = false; + + if (!(isBlanked.isValid() && isBlanked.type == "bool" && ((bool)isBlanked))) + implementIdleAutoAway(Xactivity()); +} + +bool AwayManager::Xactivity() +{ + bool activity = false; + +#ifdef Q_WS_X11 + Display* display = qt_xdisplay(); + Window dummyW; + int dummyC; + unsigned int mask; + int rootX; + int rootY; + + if (!XQueryPointer (display, d->root, &(d->root), &dummyW, &rootX, &rootY, + &dummyC, &dummyC, &mask)) + { + // Figure out which screen the pointer has moved to. + for (int i = 0; i < ScreenCount(display); i++) + { + if (d->root == RootWindow(display, i)) + { + d->screen = ScreenOfDisplay (display, i); + + break; + } + } + } + + Time xIdleTime = 0; + + #ifdef HasXidle + if (d->useXidle) + XGetIdleTime(display, &xIdleTime); + else + #endif + { + #ifdef HasScreenSaver + if (d->useMit) + { + static XScreenSaverInfo* mitInfo = 0; + if (!mitInfo) mitInfo = XScreenSaverAllocInfo(); + XScreenSaverQueryInfo (display, d->root, mitInfo); + xIdleTime = mitInfo->idle; + } + #endif + } + + if (rootX != d->mouseX || rootY != d->mouseY || mask != d->mouseMask + || ((d->useXidle || d->useMit) && xIdleTime < d->xIdleTime + 2000)) + { + // Set by setManagedIdentitiesAway() to skip X-based activity checking for one + // round, to avoid jumping on residual mouse activity after manual screensaver + // activation. + if (d->mouseX != -1) activity = true; + + d->mouseX = rootX; + d->mouseY = rootY; + d->mouseMask = mask; + d->xIdleTime = xIdleTime; + } +#endif + + return activity; +} + +void AwayManager::implementIdleAutoAway(bool activity) +{ + if (activity) + { + m_idleTime.start(); + + QPtrList serverList = m_connectionManager->getServerList(); + Server* server = 0; + + for (server = serverList.first(); server; server = serverList.next()) + { + IdentityPtr identity = server->getIdentity(); + + if (m_identitiesOnAutoAway.contains(identity->id()) && identity->getAutomaticUnaway() + && server->isConnected() && server->isAway()) + { + server->requestUnaway(); + } + } + } + else + { + long int idleTime = m_idleTime.elapsed() / 1000; + + QValueList identitiesIdleTimeExceeded; + QValueList::ConstIterator it; + + for (it = m_identitiesOnAutoAway.begin(); it != m_identitiesOnAutoAway.end(); ++it) + { + if (idleTime >= Preferences::identityById((*it))->getAwayInactivity() * 60) + identitiesIdleTimeExceeded.append((*it)); + } + + QPtrList serverList = m_connectionManager->getServerList(); + Server* server = 0; + + for (server = serverList.first(); server; server = serverList.next()) + { + int identityId = server->getIdentity()->id(); + + if (identitiesIdleTimeExceeded.contains(identityId) && server->isConnected() && !server->isAway()) + server->requestAway(); + } + } +} + +void AwayManager::setManagedIdentitiesAway() +{ + // Used to skip X-based activity checking for one round, to avoid jumping + // on residual mouse activity after manual screensaver activation. + d->mouseX = -1; + + QPtrList serverList = m_connectionManager->getServerList(); + Server* server = 0; + + for (server = serverList.first(); server; server = serverList.next()) + { + if (m_identitiesOnAutoAway.contains(server->getIdentity()->id()) && server->isConnected() && !server->isAway()) + server->requestAway(); + } +} + +void AwayManager::setManagedIdentitiesUnaway() +{ + QPtrList serverList = m_connectionManager->getServerList(); + Server* server = 0; + + for (server = serverList.first(); server; server = serverList.next()) + { + IdentityPtr identity = server->getIdentity(); + + if (m_identitiesOnAutoAway.contains(identity->id()) && identity->getAutomaticUnaway() + && server->isConnected() && server->isAway()) + { + server->requestUnaway(); + } + } +} + +void AwayManager::requestAllAway(const QString& reason) +{ + QPtrList serverList = m_connectionManager->getServerList(); + Server* server = 0; + + for (server = serverList.first(); server; server = serverList.next()) + if (server->isConnected()) server->requestAway(reason); +} + +void AwayManager::requestAllUnaway() +{ + QPtrList serverList = m_connectionManager->getServerList(); + Server* server = 0; + + for (server = serverList.first(); server; server = serverList.next()) + if (server->isConnected() && server->isAway()) server->requestUnaway(); +} + +void AwayManager::toggleGlobalAway(bool away) +{ + if (away) + requestAllAway(); + else + requestAllUnaway(); +} + +void AwayManager::updateGlobalAwayAction(bool away) +{ + KonversationApplication* konvApp = static_cast(kapp); + KToggleAction* awayAction = static_cast(konvApp->getMainWindow()->actionCollection()->action("toggle_away")); + + if (!awayAction) return; + + if (away) + { + QPtrList serverList = m_connectionManager->getServerList(); + Server* server = 0; + uint awayCount = 0; + + for (server = serverList.first(); server; server = serverList.next()) + { + if (server->isAway()) + awayCount++; + } + + if (awayCount == serverList.count()) + { + awayAction->setChecked(true); + awayAction->setIcon("konversationaway"); + } + } + else + { + awayAction->setChecked(false); + awayAction->setIcon("konversationavailable"); + } +} + +#include "awaymanager.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/awaymanager.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/awaymanager.h --- konversation-1.0.1/konversation/src/awaymanager.h 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/awaymanager.h 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,73 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + Copyright (C) 2008 Eike Hein +*/ + +#ifndef AWAYMANAGER_H +#define AWAYMANAGER_H + + +#include +#include + + +class ConnectionManager; + +class QTimer; + + +struct AwayManagerPrivate; + + +class AwayManager : public QObject +{ + Q_OBJECT + + public: + explicit AwayManager(QObject* parent = 0); + ~AwayManager(); + + + public slots: + void identitiesChanged(); + + void identityOnline(int identityId); + void identityOffline(int identityId); + + void requestAllAway(const QString& reason = ""); + void requestAllUnaway(); + + void setManagedIdentitiesAway(); + void setManagedIdentitiesUnaway(); + + void toggleGlobalAway(bool away); + void updateGlobalAwayAction(bool away); + + + private slots: + void checkActivity(); + + + private: + void toggleTimer(); + bool Xactivity(); + + void implementIdleAutoAway(bool activity); + + AwayManagerPrivate* d; + + QTime m_idleTime; + QTimer* m_activityTimer; + + QValueList m_identitiesOnAutoAway; + + ConnectionManager* m_connectionManager; +}; + +#endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/blowfish/BlowfishCbc.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/blowfish/BlowfishCbc.cpp --- konversation-1.0.1/konversation/src/blowfish/BlowfishCbc.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/blowfish/BlowfishCbc.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -41,10 +41,11 @@ // Implementation of Bruce Schneier's BLOWFISH algorithm from "Applied // Cryptography", Second Edition. +#include "BlowfishCbc.h" + #include #include -#include "BlowfishCbc.h" //#include //Initialization with a fixed string which consists of the hexadecimal digits of PI (less the initial 3) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/blowfish/blowfish.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/blowfish/blowfish.cpp --- konversation-1.0.1/konversation/src/blowfish/blowfish.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/blowfish/blowfish.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -9,14 +9,15 @@ Copyright (C) 2005 İsmail Dönmez */ -#include -#include - #include "blowfish.h" #include "mc_blowfish.h" #include "server.h" #include "channel.h" +#include +#include + + namespace Konversation { // Find n'th occurrence of separator in input and return the index @@ -67,7 +68,11 @@ qstrncpy(result.data(), cipher.data(), cipher.length()); qstrncpy(ckey.data(), key.data(), key.length()+1); tmp2 = decrypt_string(ckey.data(),result.data()); - cipher = backup+"(e) "+tmp2+' '+'\n'; + const char *pfx="(e) "; + // If it's a CTCP we don't want to have the (e) interfering with the processing + if (tmp2[0] == 1) + pfx = "\x0"; + cipher = backup+pfx+tmp2+' '+'\n'; // FIXME(??) why is there an added space here? free(tmp2); } } @@ -104,31 +109,21 @@ } } - void encrypt(const QString& recipient, QString& cipher, Server* server) + bool encrypt(const QString& key, QCString& cipher) { - QString key = server->getKeyForRecipient(recipient); + if(key.isEmpty()) + return false; - if(!key.isEmpty()) + if (cipher.left(3) == "+p ") + cipher = cipher.mid(3); + else { - if(cipher.startsWith("+p ")) - { - cipher = cipher.mid(3); - return; - } - - QString backup = cipher.section(":",0,0)+':'; - cipher = cipher.section(":",1).remove("\n"); + QCString ckey(key.local8Bit()); - char* tmp; - int size = cipher.utf8().length(); - QCString encrypted( size+1 ); - QCString ckey( key.length()+1 ); - - strcpy(ckey.data(),key.local8Bit()); - strcpy(encrypted.data(),cipher.utf8()); - tmp = encrypt_string(ckey.data(),encrypted.data()); - cipher = backup +"+OK " + tmp +'\n'; + char *tmp = encrypt_string(ckey.data(), cipher.data()); + cipher = QCString("+OK ") + tmp; free(tmp); } + return true; } } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/blowfish/blowfish.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/blowfish/blowfish.h --- konversation-1.0.1/konversation/src/blowfish/blowfish.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/blowfish/blowfish.h 2008-08-06 16:56:27.000000000 +0100 @@ -12,14 +12,19 @@ #ifndef BLOWFISH_H #define BLOWFISH_H + class Server; +class QString; +class QCString; + + namespace Konversation { int findOccurrence(const QCString& input, const QCString& separator, int nth); void decrypt(const QString& recipient, QCString& cipher, Server* server); void decryptTopic(const QString& recipient, QCString& cipher, Server* server); - void encrypt(const QString& recipient, QString& cipher, Server* server); + bool encrypt(const QString& key, QCString& cipher); } #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/blowfish/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/blowfish/Makefile.in --- konversation-1.0.1/konversation/src/blowfish/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/blowfish/Makefile.in 2008-08-06 16:57:57.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,15 +16,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -61,7 +57,14 @@ mc_blowfish.lo newblowfish.lo oldblowfish.lo @KDE_USE_FINAL_FALSE@libblowfish_la_OBJECTS = $(libblowfish_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libblowfish_la_OBJECTS = $(libblowfish_la_final_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +#>- libblowfish_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +#>- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +#>- $(CXXFLAGS) $(libblowfish_la_LDFLAGS) $(LDFLAGS) -o $@ +#>+ 3 +libblowfish_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(KDE_CXXFLAGS) $(libblowfish_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -69,19 +72,21 @@ #>+ 2 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -#>- $(AM_CXXFLAGS) $(CXXFLAGS) +#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -#>+ 2 -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ +#>- $(LDFLAGS) -o $@ +#>+ 3 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(libblowfish_la_SOURCES) DIST_SOURCES = $(libblowfish_la_SOURCES) HEADERS = $(noinst_HEADERS) @@ -91,8 +96,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -132,7 +135,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -207,12 +212,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -226,6 +233,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -245,24 +253,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -274,19 +280,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -313,30 +318,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -346,9 +351,7 @@ noinst_LTLIBRARIES = libblowfish.la noinst_HEADERS = b64stuff.h BlowfishCbc.h blowfish.h mc_blowfish.h newblowfish.h oldblowfish1.h oldblowfish2.h libblowfish_la_SOURCES = b64stuff.cpp BlowfishCbc.cpp blowfish.cpp mc_blowfish.cpp newblowfish.cpp oldblowfish.cpp -#>- libblowfish_la_LDFLAGS = $(all_libraries) -no-undefined -#>+ 1 -libblowfish_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) +libblowfish_la_LDFLAGS = $(all_libraries) -no-undefined #>- all: all-am #>+ 1 all: docs-am all-am @@ -406,11 +409,8 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -#>- libblowfish.la: $(libblowfish_la_OBJECTS) $(libblowfish_la_DEPENDENCIES) -#>+ 2 -@KDE_USE_CLOSURE_TRUE@libblowfish.la: libblowfish.la.closure $(libblowfish_la_OBJECTS) $(libblowfish_la_DEPENDENCIES) -@KDE_USE_CLOSURE_FALSE@libblowfish.la: $(libblowfish_la_OBJECTS) $(libblowfish_la_DEPENDENCIES) - $(CXXLINK) $(libblowfish_la_LDFLAGS) $(libblowfish_la_OBJECTS) $(libblowfish_la_LIBADD) $(LIBS) +libblowfish.la: $(libblowfish_la_OBJECTS) $(libblowfish_la_DEPENDENCIES) + $(libblowfish_la_LINK) $(libblowfish_la_OBJECTS) $(libblowfish_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -426,22 +426,22 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldblowfish.Plo@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< @@ -452,17 +452,13 @@ clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -474,8 +470,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -485,13 +481,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -505,22 +500,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -566,14 +560,14 @@ #>- clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ #>- mostlyclean-am #>+ 2 -clean-am: clean-closures clean-bcheck clean-final clean-generic clean-libtool clean-noinstLTLIBRARIES \ +clean-am: clean-bcheck clean-final clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-am @@ -587,12 +581,20 @@ install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -613,40 +615,30 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-info-am + pdf pdf-am ps ps-am tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 8 -libblowfish.la.closure: $(libblowfish_la_OBJECTS) $(libblowfish_la_DEPENDENCIES) - @echo "int main() {return 0;}" > libblowfish_la_closure.cpp - @$(LTCXXCOMPILE) -c libblowfish_la_closure.cpp - $(CXXLINK) libblowfish_la_closure.lo $(libblowfish_la_LDFLAGS) $(libblowfish_la_OBJECTS) $(libblowfish_la_LIBADD) $(LIBS) - @rm -f libblowfish_la_closure.* libblowfish.la.closure - @echo "timestamp" > libblowfish.la.closure - - #>+ 2 KDE_DIST=Makefile.in Makefile.am -#>+ 3 -clean-closures: - -rm -f libblowfish.la.closure - #>+ 2 docs-am: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/blowfish/mc_blowfish.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/blowfish/mc_blowfish.cpp --- konversation-1.0.1/konversation/src/blowfish/mc_blowfish.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/blowfish/mc_blowfish.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -15,9 +15,10 @@ //--------------------------------------------------------------------------- // include header +#include "mc_blowfish.h" #include "newblowfish.h" #include "oldblowfish1.h" -#include "mc_blowfish.h" + #include //--------------------------------------------------------------------------- diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/blowfish/oldblowfish.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/blowfish/oldblowfish.cpp --- konversation-1.0.1/konversation/src/blowfish/oldblowfish.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/blowfish/oldblowfish.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -271,7 +271,7 @@ #define SALT2 0x23f6b095 // Convert 64-bit encrypted passphrase to text for userfile -char *base64 = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; +char base64[] = "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; int base64dec(char c) { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/channel.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/channel.cpp --- konversation-1.0.1/konversation/src/channel.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/channel.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,13 +6,32 @@ */ /* - The class that controls a channel - begin: Wed Jan 23 2002 - copyright: (C) 2002 by Dario Abatianni - (C) 2004-2006 by Peter Simonsson - (C) 2005 by Ian Monroe + Copyright (C) 2002 Dario Abatianni + Copyright (C) 2004-2006 Peter Simonsson + Copyright (C) 2006-2008 Eike Hein */ +#include "channel.h" +#include "konversationapplication.h" +#include "server.h" +#include "blowfish.h" +#include "nick.h" +#include "nicklistview.h" +#include "quickbutton.h" +#include "modebutton.h" +#include "ircinput.h" +#include "ircviewbox.h" +#include "ircview.h" +#include +#include +#include "common.h" +#include "topiclabel.h" +#include "channeloptionsdialog.h" +#include "notificationhandler.h" +#include "viewcontainer.h" +#include "linkaddressbook/linkaddressbookui.h" +#include "linkaddressbook/addressbook.h" + #include #include #include @@ -45,31 +64,14 @@ #include #include -#include "konversationapplication.h" -#include "channel.h" -#include "server.h" -#include "nick.h" -#include "nicklistview.h" -#include "nicklistviewitem.h" -#include "quickbutton.h" -#include "modebutton.h" -#include "ircinput.h" -#include "ircviewbox.h" -#include "ircview.h" -#include -#include -#include "common.h" -#include "topiclabel.h" -#include "channeloptionsdialog.h" -#include "notificationhandler.h" -#include "linkaddressbook/linkaddressbookui.h" -#include "linkaddressbook/addressbook.h" - -Channel::Channel(QWidget* parent) - : ChatWindow(parent), key(" ") +Channel::Channel(QWidget* parent, QString _name) : ChatWindow(parent) { // init variables + + //HACK I needed the channel name at time of setServer, but setName needs m_server.. + // This effectively assigns the name twice, but none of the other logic has been moved or updated. + name=_name; m_processingTimer = 0; m_delayedSortTimer = 0; m_optionsDialog = NULL; @@ -82,6 +84,8 @@ nickChangeDialog = 0; channelCommand = false; + m_joined = false; + quickButtonsChanged = false; quickButtonsState = false; @@ -196,8 +200,8 @@ nicknameListView->setSelectionModeExt(KListView::Extended); nicknameListView->setAllColumnsShowFocus(true); nicknameListView->setSorting(1,true); - nicknameListView->addColumn(QString::null); - nicknameListView->addColumn(QString::null); + nicknameListView->addColumn(QString()); + nicknameListView->addColumn(QString()); nicknameListView->setColumnWidthMode(1,KListView::Maximum); nicknameListView->header()->hide(); @@ -226,6 +230,9 @@ awayLabel = new QLabel(i18n("(away)"), commandLineBox); awayLabel->hide(); + blowfishLabel = new QLabel(commandLineBox); + blowfishLabel->hide(); + blowfishLabel->setPixmap(KGlobal::iconLoader()->loadIcon("encrypted", KIcon::Toolbar)); channelInput = new IRCInput(commandLineBox); getTextView()->installEventFilter(channelInput); @@ -260,8 +267,6 @@ getTextView()->setSizePolicy(greedy); nicknameListView->setSizePolicy(hmodest); - // remember alternate background color - abgCache=nicknameListView->alternateBackground(); connect(channelInput,SIGNAL (submit()),this,SLOT (channelTextEntered()) ); connect(channelInput,SIGNAL (envelopeCommand()),this,SLOT (channelPassthroughCommand()) ); @@ -271,8 +276,6 @@ connect(getTextView(), SIGNAL(textPasted(bool)), channelInput, SLOT(paste(bool))); connect(getTextView(),SIGNAL (gotFocus()),channelInput,SLOT (setFocus()) ); - connect(getTextView(), SIGNAL(updateTabNotification(Konversation::TabNotifyType)), - this, SLOT(activateTabNotification(Konversation::TabNotifyType))); connect(getTextView(),SIGNAL (sendFile()),this,SLOT (sendFileMenu()) ); connect(getTextView(),SIGNAL (autoText(const QString&)),this,SLOT (sendChannelText(const QString&)) ); @@ -293,13 +296,16 @@ // every few seconds try to get more userhosts userhostTimer.start(10000); - m_firstAutoWhoDone = false; connect(&m_whoTimer,SIGNAL (timeout()),this,SLOT (autoWho())); + + // every 5 minutes decrease everyone's activity by 1 unit + m_fadeActivityTimer.start(5*60*1000); + + connect(&m_fadeActivityTimer, SIGNAL(timeout()), this, SLOT(fadeActivity())); + // re-schedule when the settings were changed connect(Preferences::self(), SIGNAL (autoContinuousWhoChanged()),this,SLOT (scheduleAutoWho())); - m_allowNotifications = true; - updateAppearance(); //FIXME JOHNFLUX @@ -307,23 +313,82 @@ // connect( Konversation::Addressbook::self(), SIGNAL(addresseesChanged()), this, SLOT(slotLoadAddressees())); } -void Channel::setServer(Server *server) +//FIXME there is some logic in setLogfileName that needs to be split out and called here if the server display name gets changed +void Channel::setServer(Server* server) { + if (m_server != server) + connect(server, SIGNAL(connectionStateChanged(Server*, Konversation::ConnectionState)), + SLOT(connectionStateChanged(Server*, Konversation::ConnectionState))); ChatWindow::setServer(server); + if (server->getKeyForRecipient(getName())) + blowfishLabel->show(); topicLine->setServer(server); refreshModeButtons(); setIdentity(server->getIdentity()); } +void Channel::connectionStateChanged(Server* server, Konversation::ConnectionState state) +{ + if (server == m_server) + { + if (state != Konversation::SSConnected) + { + m_joined = false; + + //HACK the way the notification priorities work sucks, this forces the tab text color to gray right now. + if (m_currentTabNotify == Konversation::tnfNone || (!Preferences::tabNotificationsEvents() && m_currentTabNotify == Konversation::tnfControl)) + KonversationApplication::instance()->getMainWindow()->getViewContainer()->unsetViewNotification(this); + } + } +} + +void Channel::setEncryptedOutput(bool e) +{ + if (e) { + blowfishLabel->show(); + //scan the channel topic and decrypt it if necessary + QString topic(m_topicHistory[0].section(' ',2)); + + //prepend two colons to make it appear to be an irc message for decryption, + // \r because it won't decrypt without it, even though the message did not have a \r + // when encrypted. Bring on the QCA! + QCString cipher="::"+topic.utf8()+'\x0d'; + Konversation::decryptTopic(getName(), cipher, m_server); + topic=QString::fromUtf8(cipher.data()+2, cipher.length()-2); + m_topicHistory[0] = m_topicHistory[0].section(' ', 0, 1) + ' ' + topic; + topicLine->setText(topic); + emit topicHistoryChanged(); + } + else + blowfishLabel->hide(); +} + Channel::~Channel() { kdDebug() << "Channel::~Channel(" << getName() << ")" << endl; // Purge nickname list purgeNicks(); + kdDebug() << "nicks purged" << endl; // Unlink this channel from channel list m_server->removeChannel(this); + kdDebug() << "Channel removed." << endl; + +} + +bool Channel::rejoinable() +{ + if (getServer() && getServer()->isConnected()) + return !m_joined; + + return false; +} + +void Channel::rejoin() +{ + if (rejoinable()) + m_server->sendJoinCommand(getName(), getPassword()); } ChannelNickPtr Channel::getOwnChannelNick() @@ -352,16 +417,18 @@ m_optionsDialog = new Konversation::ChannelOptionsDialog(this); m_optionsDialog->refreshModes(); + m_optionsDialog->refreshTopicHistory(); m_optionsDialog->show(); } void Channel::filesDropped(QDropEvent* e) { QPoint p(nicknameListView->contentsToViewport(e->pos())); - NickListViewItem* it = dynamic_cast(nicknameListView->itemAt(p)); + Nick* it = dynamic_cast(nicknameListView->itemAt(p)); if (!it) return; QStrList uris; - if (QUriDrag::decode(e,uris)) m_server->sendURIs(uris, it->getNick()->getNickname()); + if (QUriDrag::decode(e,uris)) + m_server->sendURIs(uris, it->getChannelNick()->getNickname()); } void Channel::textPasted(const QString& text) @@ -423,7 +490,7 @@ if(id == Konversation::AddressbookDelete) { KABC::Addressee addr = (*it)->getNickInfo()->getAddressee(); - addressbook->unassociateNick(addr, (*it)->getNickname(), m_server->getServerName(), m_server->getServerGroup()); + addressbook->unassociateNick(addr, (*it)->getNickname(), m_server->getServerName(), m_server->getDisplayName()); } else { @@ -435,7 +502,7 @@ else addr.setGivenName(nickInfo->getRealName()); addr.setNickName(nickInfo->getNickname()); - addressbook->associateNickAndUnassociateFromEveryoneElse(addr, (*it)->getNickname(), m_server->getServerName(), m_server->getServerGroup()); + addressbook->associateNickAndUnassociateFromEveryoneElse(addr, (*it)->getNickname(), m_server->getServerName(), m_server->getDisplayName()); } } addressbook->saveTicket(); // This will refresh the nicks automatically for us. At least, if it doesn't, it's a bug :) @@ -494,7 +561,7 @@ m_server->requestTopic(getTextView()->currentChannel()); break; case Konversation::Names: - m_server->queue("NAMES " + getTextView()->currentChannel()); + m_server->queue("NAMES " + getTextView()->currentChannel(), Server::LowPriority); break; case Konversation::Join: m_server->queue("JOIN " + getTextView()->currentChannel()); @@ -579,12 +646,17 @@ break; } case Konversation::AddNotify: - for (QStringList::Iterator it=nickList.begin(); it!=nickList.end(); ++it) + { + if (m_server->getServerGroup()) { - if (!Preferences::isNotify(m_server->serverGroupSettings()->id(), (*it))) - Preferences::addNotify(m_server->serverGroupSettings()->id(), (*it)); + for (QStringList::Iterator it=nickList.begin(); it!=nickList.end(); ++it) + { + if (!Preferences::isNotify(m_server->getServerGroup()->id(), (*it))) + Preferences::addNotify(m_server->getServerGroup()->id(), (*it)); + } } break; + } } // switch if (!pattern.isEmpty()) @@ -724,7 +796,7 @@ { nick = it.current(); - if(nick->getNickname().startsWith(pattern, Preferences::nickCompletionCaseSensitive()) && + if(nick->getChannelNick()->getNickname().startsWith(pattern, Preferences::nickCompletionCaseSensitive()) && (nick->getChannelNick()->timeStamp() > timeStamp)) { timeStamp = nick->getChannelNick()->timeStamp(); @@ -743,7 +815,7 @@ do { - QString lookNick = nicknameList.at(completionPosition)->getNickname(); + QString lookNick = nicknameList.at(completionPosition)->getChannelNick()->getNickname(); if(!prefixCharacter.isEmpty() && lookNick.contains(prefixCharacter)) { @@ -825,14 +897,95 @@ setLogfileName(newName.lower()); } -void Channel::setKey(const QString& newKey) +bool Channel::autoJoin() { - key=newKey; + if (!m_server->getServerGroup()) return false; + + Konversation::ChannelList channelList = m_server->getServerGroup()->channelList(); + + if (!channelList.empty()) + return channelList.find(channelSettings()) != channelList.end(); + else + return false; } -QString Channel::getKey() +void Channel::setAutoJoin(bool autojoin) { - return key; + if (autojoin && !(autoJoin())) + { + Konversation::ChannelSettings before; + + QPtrList channelList = m_server->getChannelList(); + + if (channelList.count() > 1) + { + QPtrListIterator it(channelList); + Channel* channel; + QMap channelMap; + + int index = -1; + int ownIndex = m_server->getViewContainer()->getViewIndex(this); + + while ((channel = it.current()) != 0) + { + ++it; + + index = m_server->getViewContainer()->getViewIndex(channel); + + if (index && index > ownIndex) channelMap.insert(index, channel); + } + + if (channelMap.count()) + { + QMap::Iterator it2; + + for (it2 = channelMap.begin(); it2 != channelMap.end(); ++it2) + { + channel = it2.data(); + + if (channel->autoJoin()) + { + before = channel->channelSettings(); + + break; + } + } + } + } + + if (m_server->getServerGroup()) + m_server->getServerGroup()->addChannel(channelSettings(), before); + } + else + { + if (m_server->getServerGroup()) + m_server->getServerGroup()->removeChannel(channelSettings()); + } +} + + + +QString Channel::getPassword() +{ + QString password; + + for (QStringList::const_iterator it = m_modeList.begin(); it != m_modeList.end(); ++it) + { + if ((*it)[0] == 'k') password = (*it).mid(1); + } + + return password; +} + +const Konversation::ChannelSettings Channel::channelSettings() +{ + Konversation::ChannelSettings channel; + + channel.setName(getName()); + channel.setPassword(getPassword()); + channel.setNotificationsEnabled(notificationsEnabled()); + + return channel; } void Channel::sendFileMenu() @@ -843,7 +996,7 @@ void Channel::channelTextEntered() { QString line = channelInput->text(); - channelInput->clear(); + channelInput->setText (""); if(line.lower().stripWhiteSpace() == Preferences::commandChar()+"clear") { @@ -865,7 +1018,7 @@ QString commandChar = Preferences::commandChar(); QString line = channelInput->text(); - channelInput->clear(); + channelInput->setText(""); if(!line.isEmpty()) { @@ -885,12 +1038,12 @@ // replace aliases and wildcards if(m_server->getOutputFilter()->replaceAliases(outputAll)) { - outputAll = m_server->parseWildcards(outputAll,m_server->getNickname(),getName(),getKey(), - getSelectedNickList(),QString::null); + outputAll = m_server->parseWildcards(outputAll,m_server->getNickname(),getName(),getPassword(), + getSelectedNickList(),QString()); } // Send all strings, one after another - QStringList outList=QStringList::split('\n',outputAll); + QStringList outList=QStringList::split(QRegExp("[\r\n]+"),outputAll); for(unsigned int index=0;indexgetNickname(), result.output); else if(result.type == Konversation::Command) appendCommandMessage(result.typeString, result.output); else if(result.type == Konversation::Program) appendServerMessage(result.typeString, result.output); - else if(result.type == Konversation::PrivateMessage) appendQuery(result.typeString, result.output); + else if(result.type == Konversation::PrivateMessage) appendQuery(result.typeString, result.output, true); else append(m_server->getNickname(), result.output); } else if (result.outputList.count()) @@ -916,13 +1069,13 @@ } } // Send anything else to the server - if(!result.toServer.isEmpty()) + if(!result.toServerList.empty()) { - m_server->queue(result.toServer); + m_server->queueList(result.toServerList); } else { - m_server->queueList(result.toServerList); + m_server->queue(result.toServer); } } // for } @@ -944,7 +1097,7 @@ while(nick) { - if(nick->isSelected()) result.append(nick->getNickname()); + if(nick->isSelected()) result.append(nick->getChannelNick()->getNickname()); nick=nicknameList.next(); } } @@ -961,7 +1114,7 @@ { if(channelCommand) { - if(nick->getNickname() == textView->getContextNick()) + if(nick->getChannelNick()->getNickname() == textView->getContextNick()) { result.append(nick->getChannelNick()); return result; @@ -984,27 +1137,24 @@ modeButtonClicked(7,lim>0); } -void Channel::modeButtonClicked(int id,bool on) +void Channel::modeButtonClicked(int id, bool on) { char mode[]={'t','n','s','i','p','m','k','l'}; QString command("MODE %1 %2%3 %4"); - QString args; + QString args = getPassword(); - if(mode[id]=='k') + if (mode[id] == 'k') { - //FIXME: Apparently we initialize the key as a space so so the - // channel join code has something to work with when producing - // things like "JOIN #chan1,#chan2,#chan§ key1, ,key3". - if(getKey().isEmpty() || getKey() == " ") + if (args.isEmpty()) { - QCString key; + QCString newPassword; - int result=KPasswordDialog::getPassword(key,i18n("Channel Password")); + int result = KPasswordDialog::getPassword(newPassword, i18n("Channel Password")); - if(result==KPasswordDialog::Accepted && !key.isEmpty()) setKey(key); + if (result == KPasswordDialog::Accepted && !newPassword.isEmpty()) + args = newPassword; } - args=getKey(); - if(!on) setKey(QString::null); + } else if(mode[id]=='l') { @@ -1030,7 +1180,7 @@ void Channel::quickButtonClicked(const QString &buttonText) { // parse wildcards (toParse,nickname,channelName,nickList,queryName,parameter) - QString out=m_server->parseWildcards(buttonText,m_server->getNickname(),getName(),getKey(),getSelectedNickList(),QString::null); + QString out=m_server->parseWildcards(buttonText,m_server->getNickname(),getName(),getPassword(),getSelectedNickList(),QString()); // are there any newlines in the definition? if(out.find('\n')!=-1) @@ -1051,7 +1201,7 @@ while((lookNick = it.current()) != 0) { - if(lookNick->loweredNickname() == nickname) + if(lookNick->getChannelNick()->loweredNickname() == nickname) { nick = lookNick; break; @@ -1109,18 +1259,24 @@ } - void Channel::joinNickname(ChannelNickPtr channelNick) { if(channelNick->getNickname() == m_server->getNickname()) { + m_joined = true; + emit joined(this); appendCommandMessage(i18n("Join"),i18n("%1 is the channel and %2 is our hostmask", "You have joined the channel %1 (%2).").arg(getName()).arg(channelNick->getHostmask()),false, false, true); m_ownChannelNick = channelNick; connect(m_ownChannelNick, SIGNAL(channelNickChanged()), SLOT(refreshModeButtons())); refreshModeButtons(); - KonversationApplication* konv_app = static_cast(KApplication::kApplication()); - konv_app->notificationHandler()->channelJoin(this,getName()); + setActive(true); + + //HACK the way the notification priorities work sucks, this forces the tab text color to ungray right now. + if (m_currentTabNotify == Konversation::tnfNone || !Preferences::tabNotificationsEvents()) + KonversationApplication::instance()->getMainWindow()->getViewContainer()->unsetViewNotification(this); + + KonversationApplication::instance()->notificationHandler()->channelJoin(this,getName()); } else { @@ -1198,12 +1354,12 @@ } else { - kdWarning() << "Channel::kickNick(): Nickname " << channelNick->getNickname() << " not found!"<< endl; + kdWarning() << "Channel::removeNick(): Nickname " << channelNick->getNickname() << " not found!"<< endl; } } } -void Channel::kickNick(ChannelNickPtr channelNick, const ChannelNick &kicker, const QString &reason) +void Channel::kickNick(ChannelNickPtr channelNick, const QString &kicker, const QString &reason) { QString displayReason = reason; @@ -1216,44 +1372,50 @@ if(channelNick->getNickname() == m_server->getNickname()) { - if(kicker.getNickname() == m_server->getNickname()) + if(kicker == m_server->getNickname()) { if (displayReason.isEmpty()) - m_server->appendStatusMessage(i18n("Kick"), i18n("You have kicked yourself from channel %1.").arg(getName())); + appendCommandMessage(i18n("Kick"), i18n("You have kicked yourself from channel %1.").arg(getName())); else - m_server->appendStatusMessage(i18n("Kick"), i18n("%1 adds the channel and %2 the reason", + appendCommandMessage(i18n("Kick"), i18n("%1 adds the channel and %2 the reason", "You have kicked yourself from channel %1 (%2).").arg(getName()).arg(displayReason)); } else { if (displayReason.isEmpty()) { - m_server->appendStatusMessage(i18n("Kick"), i18n("%1 adds the channel, %2 adds the kicker", + appendCommandMessage(i18n("Kick"), i18n("%1 adds the channel, %2 adds the kicker", "You have been kicked from channel %1 by %2.") - .arg(getName()).arg(kicker.getNickname())); + .arg(getName()).arg(kicker), true); } else { - m_server->appendStatusMessage(i18n("Kick"), i18n("%1 adds the channel, %2 the kicker and %3 the reason", + appendCommandMessage(i18n("Kick"), i18n("%1 adds the channel, %2 the kicker and %3 the reason", "You have been kicked from channel %1 by %2 (%3).") - .arg(getName()).arg(kicker.getNickname()).arg(displayReason)); + .arg(getName()).arg(kicker).arg(displayReason), true); } - KonversationApplication* konv_app = static_cast(KApplication::kApplication()); - konv_app->notificationHandler()->kick(this,getName(), kicker.getNickname()); + KonversationApplication::instance()->notificationHandler()->kick(this,getName(), kicker); } - delete this; + m_joined=false; + setActive(false); + + //HACK the way the notification priorities work sucks, this forces the tab text color to gray right now. + if (m_currentTabNotify == Konversation::tnfNone || (!Preferences::tabNotificationsEvents() && m_currentTabNotify == Konversation::tnfControl)) + KonversationApplication::instance()->getMainWindow()->getViewContainer()->unsetViewNotification(this); + + return; } else { - if(kicker.getNickname() == m_server->getNickname()) + if(kicker == m_server->getNickname()) { if (displayReason.isEmpty()) appendCommandMessage(i18n("Kick"), i18n("You have kicked %1 from the channel.").arg(channelNick->getNickname())); else appendCommandMessage(i18n("Kick"), i18n("%1 adds the kicked nick and %2 the reason", - "You have kicked %1 from the channel (%2).").arg(channelNick->getNickname()).arg(displayReason)); + "You have kicked %1 from the channel (%2).").arg(channelNick->getNickname()).arg(displayReason), true); } else { @@ -1261,13 +1423,13 @@ { appendCommandMessage(i18n("Kick"), i18n("%1 adds the kicked nick, %2 adds the kicker", "%1 has been kicked from the channel by %2.") - .arg(channelNick->getNickname()).arg(kicker.getNickname())); + .arg(channelNick->getNickname()).arg(kicker), true); } else { appendCommandMessage(i18n("Kick"), i18n("%1 adds the kicked nick, %2 the kicker and %3 the reason", "%1 has been kicked from the channel by %2 (%3).") - .arg(channelNick->getNickname()).arg(kicker.getNickname()).arg(displayReason)); + .arg(channelNick->getNickname()).arg(kicker).arg(displayReason), true); } } @@ -1295,7 +1457,7 @@ while(it.current() != 0) { - if(it.current()->loweredNickname() == lcLookname) + if(it.current()->getChannelNick()->loweredNickname() == lcLookname) return it.current(); ++it; @@ -1350,15 +1512,16 @@ void Channel::setTopic(const QString &newTopic) { appendCommandMessage(i18n("Topic"), i18n("The channel topic is \"%1\".").arg(newTopic)); + QString topic = Konversation::removeIrcMarkup(newTopic); + topicLine->setText(topic); + topicAuthorUnknown=true; // if we only get called with a topic, it was a 332, which usually has a 333 next // cut off "nickname" and "time_t" portion of the topic before comparing, otherwise the history // list will fill up with the same entries while the user only requests the topic to be seen. + if(m_topicHistory.first().section(' ', 2) != newTopic) { m_topicHistory.prepend(QString("%1 "+i18n("unknown")+" %2").arg(QDateTime::currentDateTime().toTime_t()).arg(newTopic)); - QString topic = Konversation::removeIrcMarkup(newTopic); - topicLine->setText(topic); - emit topicHistoryChanged(); } } @@ -1391,12 +1554,17 @@ return m_topicHistory[0]; } -void Channel::setTopicAuthor(const QString& newAuthor) +void Channel::setTopicAuthor(const QString& newAuthor, QDateTime time) { + if (time.isNull() || !time.isValid()) + time=QDateTime::currentDateTime(); + if(topicAuthorUnknown) { - m_topicHistory[0] = m_topicHistory[0].section(' ', 0, 0) + ' ' + newAuthor + ' ' + m_topicHistory[0].section(' ', 2); + m_topicHistory[0] = QString("%1").arg(time.toTime_t()) + ' ' + newAuthor + ' ' + m_topicHistory[0].section(' ', 2); topicAuthorUnknown = false; + + emit topicHistoryChanged(); } } @@ -1405,7 +1573,7 @@ //Note for future expansion: doing m_server->getChannelNick(getName(), sourceNick); may not return a valid channelNickPtr if the //mode is updated by the server. - QString message(QString::null); + QString message; ChannelNickPtr parameterChannelNick=m_server->getChannelNick(getName(), parameter); bool fromMe=false; @@ -1602,13 +1770,13 @@ { if(fromMe) { - if(toMe) message=i18n("You give yourself the permission to talk."); - else message=i18n("You give %1 the permission to talk.").arg(parameter); + if(toMe) message=i18n("You give yourself permission to talk."); + else message=i18n("You give %1 permission to talk.").arg(parameter); } else { - if(toMe) message=i18n("%1 gives you the permission to talk.").arg(sourceNick); - else message=i18n("%1 gives %2 the permission to talk.").arg(sourceNick).arg(parameter); + if(toMe) message=i18n("%1 gives you permission to talk.").arg(sourceNick); + else message=i18n("%1 gives %2 permission to talk.").arg(sourceNick).arg(parameter); } } else @@ -1642,7 +1810,6 @@ if(fromMe) message=i18n("You set the channel mode to 'allow color codes'."); else message=i18n("%1 sets the channel mode to 'allow color codes'.").arg(sourceNick); } - modeM->setDown(plus); break; case 'i': @@ -1733,7 +1900,19 @@ modeT->setDown(plus); break; - //case 'k': break; + case 'k': + if(plus) + { + if(fromMe) message=i18n("You set the channel key to '%1'.").arg(parameter); + else message=i18n("%1 sets the channel key to '%2'.").arg(sourceNick).arg(parameter); + } + else + { + if(fromMe) message=i18n("You remove the channel key."); + else message=i18n("%1 removes the channel key.").arg(sourceNick); + } + modeK->setDown(plus); + break; case 'l': if(plus) @@ -1821,7 +2000,18 @@ void Channel::clearModeList() { + QString k; + + // Keep channel password in the backing store, for rejoins. + for (QStringList::const_iterator it = m_modeList.begin(); it != m_modeList.end(); ++it) + { + if ((*it)[0] == 'k') k = (*it); + } + m_modeList.clear(); + + if (!k.isEmpty()) m_modeList << k; + modeT->setOn(0); modeT->setDown(0); @@ -1845,7 +2035,9 @@ modeL->setOn(0); modeL->setDown(0); + limit->clear(); + emit modesChanged(); } @@ -1906,7 +2098,7 @@ for(unsigned int index=0;indexunsetPalette(); @@ -2085,7 +2276,7 @@ else { getTextView()->setViewBackground(Preferences::color(Preferences::TextViewBackground), - QString::null); + QString()); } if (Preferences::customTextFont()) @@ -2129,11 +2320,6 @@ ChatWindow::updateAppearance(); } -void Channel::updateStyleSheet() -{ - getTextView()->updateStyleSheet(); -} - void Channel::nicknameComboboxChanged() { QString newNick=nicknameCombobox->currentText(); @@ -2221,7 +2407,7 @@ void Channel::cycleChannel() { closeYourself(); - m_server->sendJoinCommand(getName()); + m_server->sendJoinCommand(getName(), getPassword()); } void Channel::autoUserhost() @@ -2237,9 +2423,9 @@ while((nick = it.current()) != 0) { - if(nick->getHostmask().isEmpty()) + if(nick->getChannelNick()->getHostmask().isEmpty()) { - if(limit--) nickString = nickString + nick->getNickname() + ' '; + if(limit--) nickString = nickString + nick->getChannelNick()->getNickname() + ' '; else break; } @@ -2263,7 +2449,7 @@ if(nicknameListView->columns()==2) { // re-add the hostmask column - nicknameListView->addColumn(QString::null); + nicknameListView->addColumn(QString()); nicknameListView->setColumnWidthMode(2,KListView::Maximum); nicknameListView->setResizeMode(QListView::NoColumn); @@ -2272,7 +2458,7 @@ while(item) { Nick* lookNick=getNickByName(item->text(1)); - if(lookNick) item->setText(2,lookNick->getHostmask()); + if(lookNick) item->setText(2,lookNick->getChannelNick()->getHostmask()); item=item->itemBelow(); } } @@ -2289,27 +2475,35 @@ void Channel::scheduleAutoWho() // slot { - if(!m_firstAutoWhoDone) // abort if initialization hasn't done yet - return; if(m_whoTimer.isActive()) m_whoTimer.stop(); if(Preferences::autoWhoContinuousEnabled()) - m_whoTimer.start(Preferences::autoWhoContinuousInterval()*1000, true); + m_whoTimer.start(Preferences::autoWhoContinuousInterval() * 1000, true); } void Channel::autoWho() { // don't use auto /WHO when the number of nicks is too large, or get banned. - if(nicks > Preferences::autoWhoNicksLimit()) + if((nicks > Preferences::autoWhoNicksLimit()) || + m_server->getInputFilter()->isWhoRequestUnderProcess(getName())) { scheduleAutoWho(); return; } - if(m_server->getInputFilter()->isWhoRequestUnderProcess(getName())) - return; + m_server->requestWho(getName()); } +void Channel::fadeActivity() +{ + QPtrListIterator it( nicknameList ); + Nick *nick; + while ( (nick = it.current()) != 0 ) { + ++it; + nick->getChannelNick()->lessActive(); + } +} + QString Channel::getTextInLine() { return channelInput->text(); @@ -2325,46 +2519,60 @@ return true; } -void Channel::appendInputText(const QString& s) +void Channel::appendInputText(const QString& s, bool fromCursor) { - channelInput->setText(channelInput->text() + s); + if(!fromCursor) + { + channelInput->append(s); + } + else + { + int para = 0, index = 0; + channelInput->getCursorPosition(¶, &index); + channelInput->insertAt(s, para, index); + channelInput->setCursorPosition(para, index + s.length()); + } } -bool Channel::closeYourself() +bool Channel::closeYourself(bool confirm) { - int result=KMessageBox::warningContinueCancel( - this, - i18n("Do you want to leave %1?").arg(getName()), - i18n("Leave Channel"), - i18n("Leave"), - "QuitChannelTab"); + int result=KMessageBox::Continue; + if (confirm) + result = KMessageBox::warningContinueCancel(this, i18n("Do you want to leave %1?").arg(getName()), + i18n("Leave Channel"), i18n("Leave"), "QuitChannelTab"); - if(result==KMessageBox::Continue) + if (result==KMessageBox::Continue) { m_server->closeChannel(getName()); m_server->removeChannel(this); - Preferences::setSpellChecking(channelInput->checkSpellingEnabled()); - delete this; + Preferences::setSpellChecking(channelInput->checkSpellingEnabled()); + deleteLater(); return true; } return false; } -//Used to disable functions when not connected void Channel::serverOnline(bool online) { - if (online) + setActive(online); +} + +//Used to disable functions when not connected, does not necessarily mean the server is offline +void Channel::setActive(bool active) +{ + if (active) { - //channelInput->setEnabled(true); getTextView()->setNickAndChannelContextMenusEnabled(true); nicknameCombobox->setEnabled(true); } else { purgeNicks(); - //channelInput->setEnabled(false); getTextView()->setNickAndChannelContextMenusEnabled(false); nicknameCombobox->setEnabled(false); + topicLine->setText(QString::null); + clearModeList(); + clearBanList(); } } @@ -2445,25 +2653,17 @@ sortNickList(); nicknameListView->setUpdatesEnabled(true); nicknameListView->triggerUpdate(); - if (!m_firstAutoWhoDone) - { - if(Preferences::autoWhoContinuousEnabled()) - { - autoWho(); - } - m_firstAutoWhoDone = true; - } } } void Channel::setChannelEncoding(const QString& encoding) // virtual { - Preferences::setChannelEncoding(m_server->getServerGroup(), getName(), encoding); + Preferences::setChannelEncoding(m_server->getDisplayName(), getName(), encoding); } QString Channel::getChannelEncoding() // virtual { - return Preferences::channelEncoding(m_server->getServerGroup(), getName()); + return Preferences::channelEncoding(m_server->getDisplayName(), getName()); } QString Channel::getChannelEncodingDefaultDesc() // virtual @@ -2522,16 +2722,13 @@ } } -void Channel::setIdentity(const Identity *newIdentity) +void Channel::setIdentity(const IdentityPtr identity) { - if(!newIdentity) - { - return; - } - - ChatWindow::setIdentity(newIdentity); - nicknameCombobox->clear(); - nicknameCombobox->insertStringList(newIdentity->getNicknameList()); + if (identity) + { + nicknameCombobox->clear(); + nicknameCombobox->insertStringList(identity->getNicknameList()); + } } bool Channel::eventFilter(QObject* watched, QEvent* e) @@ -2594,7 +2791,7 @@ emit banListCleared(); } -void Channel::append(const QString& nickname,const QString& message) +void Channel::append(const QString& nickname, const QString& message) { if(nickname != getServer()->getNickname()) { Nick* nick = getNickByName(nickname); @@ -2605,9 +2802,10 @@ } ChatWindow::append(nickname, message); + nickActive(nickname); } -void Channel::appendAction(const QString& nickname,const QString& message, bool usenotifications) +void Channel::appendAction(const QString& nickname, const QString& message) { if(nickname != getServer()->getNickname()) { Nick* nick = getNickByName(nickname); @@ -2617,7 +2815,18 @@ } } - ChatWindow::appendAction(nickname, message, usenotifications); + ChatWindow::appendAction(nickname, message); + nickActive(nickname); +} + +void Channel::nickActive(const QString& nickname) //FIXME reported to crash, can't reproduce +{ + ChannelNickPtr nick=getChannelNick(nickname); + //XXX Would be nice to know why it can be null here... + if (nick) { + nick->moreActive(); + sortNickList(); //FIXME: no need to completely resort, we can just see if this particular nick should move + } } // @@ -2634,21 +2843,22 @@ m_compareMethod = method; } +//doesn't the following somehow duplicate NickListViewItem::compare()? int NickList::compareItems(QPtrCollection::Item item1, QPtrCollection::Item item2) { if(m_compareMethod == NickList::TimeStamp) { int returnValue = static_cast(item2)->getChannelNick()->timeStamp() - static_cast(item1)->getChannelNick()->timeStamp(); if(returnValue == 0) { - returnValue = QString::compare(static_cast(item1)->loweredNickname(), - static_cast(item2)->loweredNickname()); + returnValue = QString::compare(static_cast(item1)->getChannelNick()->loweredNickname(), + static_cast(item2)->getChannelNick()->loweredNickname()); } return returnValue; } - return QString::compare(static_cast(item1)->loweredNickname(), - static_cast(item2)->loweredNickname()); + return QString::compare(static_cast(item1)->getChannelNick()->loweredNickname(), + static_cast(item2)->getChannelNick()->loweredNickname()); } QString NickList::completeNick(const QString& pattern, bool& complete, QStringList& found, @@ -2672,7 +2882,7 @@ while(it.current() != 0) { - newNick = it.current()->getNickname(); + newNick = it.current()->getChannelNick()->getNickname(); if(!prefix.isEmpty() && newNick.contains(prefixCharacter)) { @@ -2693,7 +2903,7 @@ while(it2.current() != 0) { - found.append(it2.current()->getNickname()); + found.append(it2.current()->getChannelNick()->getNickname()); ++it2; } @@ -2735,7 +2945,7 @@ while (it.current() != 0) { - if (it.current()->getNickname()==nickname) + if (it.current()->getChannelNick()->getNickname()==nickname) return true; ++it; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/channeldialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/channeldialog.cpp --- konversation-1.0.1/konversation/src/channeldialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/channeldialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -8,6 +8,9 @@ email: psn@linux.se */ +#include "channeldialog.h" +#include "servergroupsettings.h" + #include #include #include @@ -16,8 +19,6 @@ #include #include -#include "channeldialog.h" -#include "servergroupsettings.h" namespace Konversation { @@ -28,7 +29,7 @@ QFrame* mainWidget = plainPage(); QGridLayout* mainLayout = new QGridLayout(mainWidget, 1, 2, 0, spacingHint()); - QLabel* channelLbl = new QLabel(i18n("&Channel:"), mainWidget); + QLabel* channelLbl = new QLabel(i18n("C&hannel:"), mainWidget); m_channelEdit = new QLineEdit(mainWidget); m_channelEdit->setMaxLength(50); channelLbl->setBuddy(m_channelEdit); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/channeldialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/channeldialog.h --- konversation-1.0.1/konversation/src/channeldialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/channeldialog.h 2008-08-06 16:56:27.000000000 +0100 @@ -14,6 +14,7 @@ #include + class QLineEdit; namespace Konversation diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/channel.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/channel.h --- konversation-1.0.1/konversation/src/channel.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/channel.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,26 +6,22 @@ */ /* - channel.h - The class that controls a channel - begin: Wed Jan 23 2002 - copyright: (C) 2002 by Dario Abatianni - (C) 2004 by Peter Simonsson - email: eisfuchs@tigress.com + Copyright (C) 2002 Dario Abatianni + Copyright (C) 2004-2006 Peter Simonsson + Copyright (C) 2006-2008 Eike Hein */ #ifndef CHANNEL_H #define CHANNEL_H -#include -#include #include "server.h" #include "chatwindow.h" #include "channelnick.h" #include "nick.h" -/* - @author Dario Abatianni -*/ +#include +#include + class QPushButton; class QCheckBox; @@ -59,7 +55,7 @@ public: NickList(); - typedef enum CompareMethod { AlphaNumeric, TimeStamp }; + enum CompareMethod { AlphaNumeric, TimeStamp }; QString completeNick(const QString& pattern, bool& complete, QStringList& found, bool skipNonAlfaNum, bool caseSensitive); @@ -80,24 +76,32 @@ Q_OBJECT public: - Channel(QWidget* parent); + explicit Channel(QWidget* parent, QString name); ~Channel(); //META virtual bool canBeFrontView(); virtual bool searchView(); virtual void append(const QString& nickname,const QString& message); - virtual void appendAction(const QString& nickname,const QString& message, bool usenotifications = false); + virtual void appendAction(const QString& nickname,const QString& message); + void nickActive(const QString& nickname); //General administrative stuff public: void setName(const QString& newName); - void setKey(const QString& newKey); - QString getKey(); + QString getPassword(); + + const Konversation::ChannelSettings channelSettings(); + + QString getPassword() const; virtual void setServer(Server* newServer); - virtual void setIdentity(const Identity *newIdentity); + void setIdentity(const IdentityPtr identity); + void setEncryptedOutput(bool); + + bool joined() { return m_joined; } + bool rejoinable(); //Unsure of future placement and/or continued existence of these members int numberOfNicks() const { return nicks; } int numberOfOps() const { return ops; } @@ -109,17 +113,18 @@ protected: // use with caution! does not check for duplicates void fastAddNickname(ChannelNickPtr channelnick); - + void setActive(bool active); public slots: void setNickname(const QString& newNickname); void scheduleAutoWho(); void setAutoUserhost(bool state); - + void rejoin(); protected slots: void autoUserhost(); void autoWho(); + void fadeActivity(); virtual void serverOnline(bool online); @@ -130,7 +135,7 @@ void joinNickname(ChannelNickPtr channelNick); void removeNick(ChannelNickPtr channelNick, const QString &reason, bool quit); - void kickNick(ChannelNickPtr channelNick, const ChannelNick &kicker, const QString &reason); + void kickNick(ChannelNickPtr channelNick, const QString &kicker, const QString &reason); void addNickname(ChannelNickPtr channelNick); void nickRenamed(const QString &oldNick, const NickInfo& channelnick); void resetNickList(); @@ -168,10 +173,11 @@ void setTopic(const QString& topic); void setTopic(const QString& nickname, const QString& topic); - void setTopicAuthor(const QString& author); + void setTopicAuthor(const QString& author, QDateTime t); signals: void topicHistoryChanged(); + void joined(Channel* channel); //Modes @@ -218,16 +224,12 @@ void updateModeWidgets(char mode, bool plus, const QString ¶meter); void updateQuickButtons(const QStringList &newButtonList); - /// Thunks to ircview->updateStyleSheet - void updateStyleSheet(); - /// Get the contents of the input line. virtual QString getTextInLine(); /// Sounds suspiciously like a destructor.. - virtual bool closeYourself(); + virtual bool closeYourself(bool askForConfirmation=true); - ///TODO: kill this, it has been reimplemented at the ChatWindow level - bool allowNotifications() { return m_allowNotifications; } + bool autoJoin(); ChannelNickList getSelectedChannelNicks(); ///TODO: this looks like a half-arsed overload. @@ -235,6 +237,8 @@ NickListView* getNickListView() const { return nicknameListView; } + Konversation::ChannelSettings channelSettings() const; + signals: void sendFile(); @@ -247,13 +251,15 @@ void showQuickButtons(bool show); void showModeButtons(bool show); - void appendInputText(const QString& s); + void appendInputText(const QString& s, bool fromCursor); virtual void indicateAway(bool show); void showTopic(bool show); void showNicknameBox(bool show); void showNicknameList(bool show); - void setAllowNotifications(bool allow) { m_allowNotifications = allow; } + void setAutoJoin(bool autojoin); + + void connectionStateChanged(Server*, Konversation::ConnectionState); protected slots: void completeNick(); ///< I guess this is a GUI function, might be nice to have at DCOP level though --argonel @@ -325,19 +331,20 @@ KLineEdit* limit; //TODO: this GUI element is the only storage for the mode NickListView* nicknameListView; - QColor abgCache; ///< Caches the alternate background color for the nicklist QHBox* commandLineBox; QVBox* nickListButtons; QGrid* buttonsGrid; QComboBox* nicknameCombobox; QString oldNick; ///< GUI QLabel* awayLabel; + QLabel* blowfishLabel; IRCInput* channelInput; NickChangeDialog* nickChangeDialog; QPtrList buttonList; //Members from here to end are not GUI + bool m_joined; NickList nicknameList; QTimer userhostTimer; @@ -345,10 +352,9 @@ QStringList m_BanList; bool topicAuthorUnknown; ///< Stores whether the "" bit is there or not. - QString key; - bool m_firstAutoWhoDone; QTimer m_whoTimer; ///< For continuous auto /WHO + QTimer m_fadeActivityTimer; ///< For the smoothing function used in activity sorting QValueList m_pendingChannelNickLists; int m_opsToAdd; @@ -364,8 +370,6 @@ int nicks; ///< How many nicks on the channel int ops; ///< How many ops on the channel - bool m_allowNotifications; /// #include #include @@ -34,16 +40,14 @@ #include #include -#include "channel.h" -#include "channellistpanel.h" -#include "channellistviewitem.h" -#include "server.h" ChannelListPanel::ChannelListPanel(QWidget* parent) : ChatWindow(parent) { setType(ChatWindow::ChannelList); setName(i18n("Channel List")); + m_oldSortColumn = 0; + setNumChannels(0); setNumUsers(0); setVisibleChannels(0); @@ -56,24 +60,24 @@ setTopicTarget(false); setRegExp(false); - filterTextChanged(QString::null); + filterTextChanged(QString()); QHGroupBox* filterGroup=new QHGroupBox(i18n("Filter Settings"),this); QGrid* mainGrid=new QGrid(2,Qt::Vertical,filterGroup); mainGrid->setSpacing(spacing()); - QLabel* minLabel=new QLabel(i18n("M&inimum users:"),mainGrid); - QLabel* maxLabel=new QLabel(i18n("Ma&ximum users:"),mainGrid); - QSpinBox* minUsersSpin=new QSpinBox(mainGrid,"min_users_spin"); + QLabel* minLabel=new QLabel(i18n("Minimum users:"),mainGrid); + QLabel* maxLabel=new QLabel(i18n("Maximum users:"),mainGrid); + QSpinBox* minUsersSpin=new QSpinBox(0, 9999, 1, mainGrid,"min_users_spin"); QWhatsThis::add(minUsersSpin, i18n("You can limit the channel list to those channels with a minimum number of users here. Choosing 0 disables this criterion.")); - QSpinBox* maxUsersSpin=new QSpinBox(mainGrid,"max_users_spin"); + QSpinBox* maxUsersSpin=new QSpinBox(0, 9999, 1, mainGrid,"max_users_spin"); QWhatsThis::add(maxUsersSpin, i18n("You can limit the channel list to those channels with a maximum number of users here. Choosing 0 disables this criterion.")); minUsersSpin->setValue(getMinUsers()); maxUsersSpin->setValue(getMaxUsers()); minLabel->setBuddy(minUsersSpin); maxLabel->setBuddy(maxUsersSpin); - QLabel* patternLabel=new QLabel(i18n("Filter &pattern:"),mainGrid); + QLabel* patternLabel=new QLabel(i18n("Filter pattern:"),mainGrid); new QLabel(i18n("Filter target:"),mainGrid); filterInput=new KLineEdit(mainGrid,"channel_list_filter_input"); @@ -85,10 +89,10 @@ QHBox* targetBox=new QHBox(mainGrid); targetBox->setSpacing(spacing()); - channelFilter=new QCheckBox(i18n("&Channel"),targetBox,"filter_target_channel_check"); - topicFilter=new QCheckBox(i18n("&Topic"),targetBox,"filter_target_topic_check"); - regexpCheck=new QCheckBox(i18n("&Regular expression"),targetBox,"regexp_check"); - applyFilter=new QPushButton(i18n("Appl&y Filter"),targetBox,"apply_filter_button"); + channelFilter=new QCheckBox(i18n("Channel"),targetBox,"filter_target_channel_check"); + topicFilter=new QCheckBox(i18n("Topic"),targetBox,"filter_target_topic_check"); + regexpCheck=new QCheckBox(i18n("Regular expression"),targetBox,"regexp_check"); + applyFilter=new QPushButton(i18n("Apply Filter"),targetBox,"apply_filter_button"); QWhatsThis::add(applyFilter, i18n("Click here to retrieve the list of channels from the server and apply the filter.")); channelFilter->setChecked(getChannelTarget()); @@ -104,21 +108,22 @@ channelListView->addColumn(i18n("Channel Topic")); channelListView->setAllColumnsShowFocus(true); channelListView->setResizeMode( KListView::LastColumn ); + channelListView->setSortColumn(-1); //Disable sorting QHBox* statsBox=new QHBox(this); statsBox->setSpacing(spacing()); - QLabel* channelsLabel=new QLabel(QString::null,statsBox); - QLabel* usersLabel=new QLabel(QString::null,statsBox); + QLabel* channelsLabel=new QLabel(QString(),statsBox); + QLabel* usersLabel=new QLabel(QString(),statsBox); statsBox->setStretchFactor(usersLabel,10); QHBox* actionBox=new QHBox(this); actionBox->setSpacing(spacing()); - refreshListButton=new QPushButton(i18n("Re&fresh List"),actionBox,"refresh_list_button"); - QPushButton* saveListButton=new QPushButton(i18n("&Save List..."),actionBox,"save_list_button"); - joinChannelButton=new QPushButton(i18n("&Join Channel"),actionBox,"join_channel_button"); + refreshListButton=new QPushButton(i18n("Refresh List"),actionBox,"refresh_list_button"); + QPushButton* saveListButton=new QPushButton(i18n("Save List..."),actionBox,"save_list_button"); + joinChannelButton=new QPushButton(i18n("Join Channel"),actionBox,"join_channel_button"); QWhatsThis::add(joinChannelButton, i18n("Click here to join the channel. A new tab is created for the channel.")); connect(&updateTimer,SIGNAL (timeout()),this,SLOT (updateDisplay())); @@ -180,8 +185,8 @@ { // Ask user for file name QString fileName=KFileDialog::getSaveFileName( - QString::null, - QString::null, + QString(), + QString(), this, i18n("Save Channel List")); @@ -262,7 +267,8 @@ void ChannelListPanel::addToChannelList(const QString& channel,int users,const QString& topic) { - pendingChannels.append(channel+' '+QString::number(users)+' '+topic); + pendingChannels.append(channel + ' ' + QString::number(users) + + ' ' + Konversation::removeIrcMarkup(topic)); // set internal numbers of channels and users, display will be updated by a timer setNumChannels(getNumChannels()+1); @@ -270,8 +276,12 @@ if(!updateTimer.isActive()) { - updateTimer.start(0); - channelListView->setUpdatesEnabled(false); + updateTimer.start(10); + + if(channelListView->sortColumn() != -1) + m_oldSortColumn = channelListView->sortColumn(); + + channelListView->setSortColumn(-1); //Disable sorting } } @@ -294,8 +304,7 @@ { updateTimer.stop(); updateUsersChannels(); - channelListView->setUpdatesEnabled(true); - channelListView->triggerUpdate(); + channelListView->setSortColumn(m_oldSortColumn); //Disable sorting applyFilter->setEnabled(true); refreshListButton->setEnabled(true); } @@ -306,28 +315,28 @@ filterText=newText; } -int ChannelListPanel::getNumChannels() -{ +int ChannelListPanel::getNumChannels() +{ return numChannels; } int ChannelListPanel::getNumUsers() -{ +{ return numUsers; } -void ChannelListPanel::setNumChannels(int num) -{ +void ChannelListPanel::setNumChannels(int num) +{ numChannels=num; } -void ChannelListPanel::setNumUsers(int num) +void ChannelListPanel::setNumUsers(int num) { numUsers=num; } int ChannelListPanel::getVisibleChannels() -{ +{ return visibleChannels; } @@ -528,8 +537,8 @@ else if(href.startsWith("ftp.")) href="ftp://"+href; // Replace all spaces with %20 in href - href.replace(" ","%20"); - href.replace("&","&&"); + href.replace(' ', "%20"); + href.replace('&', "&&"); // next search begins right after the link pos+=url.length(); @@ -559,8 +568,9 @@ delete showURLmenu; } -void ChannelListPanel::appendInputText(const QString& text) +void ChannelListPanel::appendInputText(const QString& text, bool fromCursor) { + Q_UNUSED(fromCursor); filterInput->setText(filterInput->text() + text); } @@ -575,7 +585,7 @@ void ChannelListPanel::emitUpdateInfo() { QString info; - info = i18n("Channel List for %1").arg(m_server->getServerGroup()); + info = i18n("Channel List for %1").arg(m_server->getDisplayName()); emit updateInfo(info); } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/channellistpanel.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/channellistpanel.h --- konversation-1.0.1/konversation/src/channellistpanel.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/channellistpanel.h 2008-08-06 16:56:27.000000000 +0100 @@ -17,13 +17,15 @@ #include "chatwindow.h" -/* - Dario Abatianni -*/ +#include + class QCheckBox; class QStringList; class QTimer; +class QListView; +class QListViewItem; +class QPushButton; class KListView; class KLineEdit; @@ -51,7 +53,7 @@ public slots: void addToChannelList(const QString& channel,int users,const QString& topic); - virtual void appendInputText(const QString&); + virtual void appendInputText(const QString&, bool fromCursor); void setFilter(const QString& filter); void applyFilterClicked(); @@ -139,5 +141,7 @@ KLineEdit* filterInput; QString filterText; + + int m_oldSortColumn; }; #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/channellistviewitem.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/channellistviewitem.cpp --- konversation-1.0.1/konversation/src/channellistviewitem.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/channellistviewitem.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,10 +12,9 @@ email: eisfuchs@tigress.com */ -#include - #include "channellistviewitem.h" + ChannelListViewItem::ChannelListViewItem(KListView* parent, const QString& channel, const QString& users, const QString& topic) : KListViewItem(parent,channel,users,topic) { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/channellistviewitem.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/channellistviewitem.h --- konversation-1.0.1/konversation/src/channellistviewitem.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/channellistviewitem.h 2008-08-06 16:56:27.000000000 +0100 @@ -19,6 +19,7 @@ #include + class ChannelListViewItem : public KListViewItem { public: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/channelnick.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/channelnick.cpp --- konversation-1.0.1/konversation/src/channelnick.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/channelnick.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -11,16 +11,17 @@ email: eisfuchs@tigress.com */ -#include +/* An instance of ChannelNick is made for each nick in each channel. + So for a person in multiple channels, they will have one NickInfo, and multiple ChannelNicks. + It contains a pointer to the NickInfo, and the mode of that person in the channel. +*/ -#include "channel.h" #include "channelnick.h" +#include "channel.h" #include "server.h" -/** An instance of ChannelNick is made for each nick in each channel. - So for a person in multiple channels, they will have one NickInfo, and multiple ChannelNicks. - It contains a pointer to the NickInfo, and the mode of that person in the channel. -*/ +#include + ChannelNick::ChannelNick(const NickInfoPtr& nickInfo, const bool& isop, const bool& isadmin, const bool& isowner, const bool& ishalfop, const bool& hasvoice) @@ -33,6 +34,7 @@ this->ishalfop = ishalfop; this->hasvoice = hasvoice; m_timeStamp = 0; + m_recentActivity = 0; } ChannelNick::~ChannelNick() @@ -234,6 +236,21 @@ return m_timeStamp; } +uint ChannelNick::recentActivity() const +{ + return m_recentActivity; +} + +void ChannelNick::moreActive() +{ + m_recentActivity++; +} + +void ChannelNick::lessActive() +{ + m_recentActivity--; +} + void ChannelNick::setTimeStamp(uint stamp) { m_timeStamp = stamp; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/channelnick.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/channelnick.h --- konversation-1.0.1/konversation/src/channelnick.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/channelnick.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,9 +15,10 @@ #ifndef CHANNEL_NICK_H #define CHANNEL_NICK_H +#include "nickinfo.h" + #include -#include "nickinfo.h" class ChannelNick : public QObject, public KShared { @@ -38,6 +39,8 @@ bool isAnyTypeOfOp() const; bool hasVoice() const; uint timeStamp() const; + uint recentActivity() const; + void moreActive(); bool setVoice(bool state); bool setOp(bool state); @@ -50,7 +53,7 @@ void setTimeStamp(uint stamp); NickInfoPtr getNickInfo() const; - //Purely provided for convience because they are used so often. + //Purely provided for convenience because they are used so often. //Just calls nickInfo->getNickname() etc QString getNickname() const; QString loweredNickname() const; @@ -64,9 +67,13 @@ bool ishalfop; bool hasvoice; uint m_timeStamp; + uint m_recentActivity; signals: void channelNickChanged(); + + public slots: + void lessActive(); }; /** A ChannelNickPtr is a pointer to a ChannelNick. Since it is a KSharedPtr, diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/channeloptionsdialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/channeloptionsdialog.cpp --- konversation-1.0.1/konversation/src/channeloptionsdialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/channeloptionsdialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,25 +6,30 @@ */ /* - copyright: (C) 2004 by Peter Simonsson - email: psn@linux.se + Copyright (C) 2005-2007 Peter Simonsson + Copyright (C) 2006 Dario Abatianni + Copyright (C) 2006-2007 Eike Hein */ +#include "channeloptionsdialog.h" +#include "konversationapplication.h" +#include "channeloptionsui.h" +#include "channel.h" + #include +#include +#include +#include +#include #include #include #include #include #include -#include -#include -#include +#include +#include -#include "channeloptionsdialog.h" -#include "konversationapplication.h" -#include "channeloptionsui.h" -#include "channel.h" namespace Konversation { @@ -42,7 +47,9 @@ // don't allow sorting. most recent topic is always first m_widget->topicHistoryList->setSortColumn(-1); + m_widget->clearButton->setIconSet(SmallIconSet("locationbar_erase")); m_widget->banList->setDefaultRenameAction(QListView::Accept); + m_widget->banListSearchLine->setListView(m_widget->banList); // hide column where the complete topic will be put in for convenience m_widget->topicHistoryList->hideColumn(2); // do not allow the user to resize the hidden column back into view @@ -61,8 +68,9 @@ connect(m_channel, SIGNAL(modesChanged()), this, SLOT(refreshModes())); connect(m_channel->getOwnChannelNick(), SIGNAL(channelNickChanged()), this, SLOT(refreshEnableModes())); - connect(this, SIGNAL(cancelClicked()), this, SLOT(hide())); + connect(this, SIGNAL(cancelClicked()), this, SLOT(cancelClicked())); connect(this, SIGNAL(okClicked()), this, SLOT(changeOptions())); + connect(this, SIGNAL(okClicked()), this, SLOT(okClicked())); connect(m_channel, SIGNAL(banAdded(const QString&)), this, SLOT(addBan(const QString&))); connect(m_channel, SIGNAL(banRemoved(const QString&)), this, SLOT(removeBan(const QString&))); @@ -182,7 +190,7 @@ m_widget->topicPreview->setText(item->text(2)); else // clear topic preview - m_widget->topicPreview->clear(); + m_widget->topicPreview->setText(""); } void ChannelOptionsDialog::refreshEnableModes() @@ -242,7 +250,7 @@ m_widget->moderatedModeChBox->setChecked(false); m_widget->secretModeChBox->setChecked(false); m_widget->keyModeChBox->setChecked(false); - m_widget->keyModeEdit->clear(); + m_widget->keyModeEdit->setText(""); QListViewItem* item = m_widget->otherModesList->firstChild(); @@ -369,21 +377,13 @@ QStringList banlist = m_channel->getBanList(); m_widget->banList->clear(); - for(QStringList::const_iterator it = banlist.fromLast(); it != banlist.end(); --it) - { - QDateTime date; - date.setTime_t((*it).section(' ', 2 ,2).toUInt()); - - new BanListViewItem(m_widget->banList, (*it).section(' ', 0, 0), (*it).section(' ', 1, 1).section('!', 0, 0), date.toString(Qt::LocalDate)); - } + for (QStringList::const_iterator it = banlist.fromLast(); it != banlist.end(); --it) + addBan((*it)); } void ChannelOptionsDialog::addBan(const QString& newban) { - QDateTime date; - date.setTime_t(newban.section(' ', 2 ,2).toUInt()); - - new BanListViewItem(m_widget->banList, newban.section(' ', 0, 0), newban.section(' ', 1, 1).section('!', 0, 0), date.toString(Qt::LocalDate)); + new BanListViewItem(m_widget->banList, newban.section(' ', 0, 0), newban.section(' ', 1, 1).section('!', 0, 0), newban.section(' ', 2 ,2).toUInt()); } void ChannelOptionsDialog::removeBan(const QString& ban) @@ -397,7 +397,7 @@ { if (!m_NewBan->text(0).isEmpty()) { - m_channel->getServer()->requestBan(QStringList(m_NewBan->text(0)), m_channel->getName(), QString::null); + m_channel->getServer()->requestBan(QStringList(m_NewBan->text(0)), m_channel->getName(), QString()); } // We will delete the item and let the addBan slot handle @@ -418,7 +418,7 @@ if (!new_edited->text(0).isEmpty()) { - m_channel->getServer()->requestBan(QStringList(new_edited->text(0)), m_channel->getName(), QString::null); + m_channel->getServer()->requestBan(QStringList(new_edited->text(0)), m_channel->getName(), QString()); } // We delete the existing item because it's possible the server may @@ -439,8 +439,29 @@ void ChannelOptionsDialog::removeBanClicked() { if (m_widget->banList->currentItem()) - { m_channel->getServer()->requestUnban(m_widget->banList->currentItem()->text(0), m_channel->getName()); + } + + void ChannelOptionsDialog::cancelClicked() + { + if (m_widget->banList->renameLineEdit()->isShown()) + { + QKeyEvent e(QEvent::KeyPress, Qt::Key_Escape, 27, Qt::NoButton); + + KApplication::sendEvent(m_widget->banList->renameLineEdit(), &e); + } + + topicBeingEdited(false); + hide(); + } + + void ChannelOptionsDialog::okClicked() + { + if (m_widget->banList->renameLineEdit()->isShown()) + { + QKeyEvent e(QEvent::KeyPress, Qt::Key_Return, 13, Qt::NoButton); + + KApplication::sendEvent(m_widget->banList->renameLineEdit(), &e); } } @@ -459,15 +480,42 @@ } BanListViewItem::BanListViewItem (QListView *parent, const QString& label1, const QString& label2, - const QString& label3) : KListViewItem(parent, label1, label2, label3) + uint timestamp) : KListViewItem(parent, label1, label2) { m_isNewBan = 0; + m_timestamp.setTime_t(timestamp); } BanListViewItem::BanListViewItem (QListView *parent, bool isNew, const QString& label1, const QString& label2, - const QString& label3) : KListViewItem(parent, label1, label2, label3) + uint timestamp) : KListViewItem(parent, label1, label2) { m_isNewBan = isNew; + m_timestamp.setTime_t(timestamp); + } + + QString BanListViewItem::text(int column) const + { + if (column == 2) + return KGlobal::locale()->formatDateTime(m_timestamp, true, true); + + return KListViewItem::text(column); + } + + int BanListViewItem::compare(QListViewItem *i, int col, bool ascending) const + { + if (col == 2) + { + BanListViewItem* item = static_cast(i); + + if (m_timestamp == item->timestamp()) + return 0; + else if (m_timestamp < item->timestamp()) + return -1; + else + return 1; + } + + return KListViewItem::compare(i, col, ascending); } void BanListViewItem::startRename( int col ) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/channeloptionsdialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/channeloptionsdialog.h --- konversation-1.0.1/konversation/src/channeloptionsdialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/channeloptionsdialog.h 2008-08-06 16:56:27.000000000 +0100 @@ -12,14 +12,16 @@ #ifndef KONVERSATIONCHANNELOPTIONSDIALOG_H #define KONVERSATIONCHANNELOPTIONSDIALOG_H -#include +#include "channel.h" #include -#include "channel.h" + +#include +#include + namespace Konversation { - class ChannelOptionsUI; class ChannelOptionsDialog : public KDialogBase @@ -32,6 +34,7 @@ QString topic(); QStringList modes(); + public slots: void refreshTopicHistory(); void refreshAllowedChannelModes(); @@ -48,39 +51,51 @@ void changeOptions(); + protected slots: void topicHistoryItemClicked(QListViewItem* item); void topicBeingEdited(bool state); + void cancelClicked(); + void okClicked(); + + protected: bool m_editingTopic; QListViewItem *m_NewBan; + private: ChannelOptionsUI* m_widget; Channel *m_channel; }; + // This is needed to overcome two deficiencies in KListViewItem - // First there is no signal emited when a rename is canceled + // First there is no signal emitted when a rename is canceled // Second there is no way to get the old value of an item after a rename class BanListViewItem : public KListViewItem { public: - BanListViewItem( QListView *parent ); - BanListViewItem( QListView *parent, bool isNew ); - BanListViewItem ( QListView *parent, const QString& label1, const QString& label2 = QString::null, - const QString& label3 = QString::null); - BanListViewItem ( QListView *parent, bool isNew, const QString& label1, - const QString& label2 = QString::null, const QString& label3 = QString::null); - virtual void startRename( int col ); - virtual QString getOldValue() { return m_oldValue; } + explicit BanListViewItem( QListView *parent ); + BanListViewItem(QListView *parent, bool isNew); + BanListViewItem(QListView *parent, const QString& label1, const QString& label2 = QString(), uint timestamp = 0); + BanListViewItem (QListView *parent, bool isNew, const QString& label1, const QString& label2 = QString(), uint timestamp = 0); + + QString getOldValue() { return m_oldValue; } + QDateTime timestamp() { return m_timestamp; } + + virtual QString text(int column) const; + virtual int compare(QListViewItem *i, int col, bool ascending) const; + virtual void startRename(int col); + protected: - virtual void cancelRename ( int col ); + virtual void cancelRename(int col); QString m_oldValue; bool m_isNewBan; + QDateTime m_timestamp; }; } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/channeloptionsui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/channeloptionsui.ui --- konversation-1.0.1/konversation/src/channeloptionsui.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/channeloptionsui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -14,18 +14,18 @@ 0 0 - 462 - 488 + 502 + 421 - + unnamed 0 - + channelTabWidget @@ -226,7 +226,7 @@ keyModeChBox - Channel &key: + Channel &password: <qt>These control the <em>mode</em> of the channel. Only an operator can change these.<p>A <b>P</b>rotected channel requires users to enter a password in order to join.</qt> @@ -399,11 +399,43 @@ &Ban List - + unnamed - + + + removeBan + + + + 5 + 5 + 0 + 0 + + + + &Remove Ban + + + + + addBan + + + + 5 + 5 + 0 + 0 + + + + &Add Ban + + + Hostmask @@ -447,53 +479,50 @@ true - + - layout6 + clearButton + + + + 4 + 4 + 0 + 0 + + + + - - - unnamed - - - - removeBan - - - - 5 - 5 - 0 - 0 - - - - &Remove Ban - - - - - addBan - - - - 5 - 5 - 0 - 0 - - - - &Add Ban - - - - + + + textLabel2 + + + + 4 + 5 + 0 + 0 + + + + Search: + + + + + banListSearchLine + + + - + + + keyModeChBox @@ -507,6 +536,12 @@ userLimitEdit setEnabled(bool) + + clearButton + clicked() + banListSearchLine + clear() + @@ -518,5 +553,7 @@ knuminput.h klineedit.h klistview.h + klistview.h + klistviewsearchline.h diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/chatwindowappearance_preferences.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/chatwindowappearance_preferences.ui --- konversation-1.0.1/konversation/src/chatwindowappearance_preferences.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/chatwindowappearance_preferences.ui 2008-08-06 16:56:27.000000000 +0100 @@ -12,8 +12,8 @@ 0 0 - 399 - 476 + 401 + 502 @@ -42,7 +42,7 @@ kcfg_ShowDate - Show &dates + Sho&w dates @@ -57,16 +57,6 @@ - - - hh:mm - - - - - hh:mm:ss - - kcfg_TimestampFormat @@ -98,7 +88,7 @@ kcfg_ShowBacklog - Show Backlog + Show &Backlog true @@ -175,15 +165,18 @@ Show channel &mode buttons - + - kcfg_ShowNickList + kcfg_ShowIRCViewScrollBar - Show channel &nick list and quick buttons + Show sc&rollbar + + + - + kcfg_ShowNicknameBox @@ -191,9 +184,20 @@ Show bo&x to change own nickname - + - spacer9 + kcfg_ShowQuickButtons + + + false + + + Show &quick buttons + + + + + spacer10 Horizontal @@ -208,9 +212,20 @@ - + - spacer10 + kcfg_ShowRealNames + + + false + + + Show real names in nickname list + + + + + spacer9 Horizontal @@ -225,7 +240,15 @@ - + + + kcfg_ShowNickList + + + Show channel &nick list and quick buttons + + + kcfg_AutoUserhost @@ -236,17 +259,23 @@ Show hostmas&ks in nickname list - + - kcfg_ShowQuickButtons + spacer9_2 - - false + + Horizontal - - Show &quick buttons + + Fixed - + + + 16 + 20 + + + @@ -294,12 +323,14 @@ 20 - 10 + 20 + + kcfg_ShowNickList @@ -313,16 +344,29 @@ kcfg_ShowQuickButtons setEnabled(bool) + + kcfg_ShowNickList + toggled(bool) + kcfg_ShowRealNames + setEnabled(bool) + - kcfg_ShowDate kcfg_TimestampFormat + kcfg_ShowDate + kcfg_BacklogLines kcfg_ShowTopic kcfg_ShowModeButtons - kcfg_ShowQuickButtons + kcfg_ShowNickList kcfg_AutoUserhost + kcfg_ShowRealNames + kcfg_ShowQuickButtons kcfg_ShowNicknameBox + kcfg_ShowIRCViewScrollBar kcfg_BackgroundImage + kcfg_ShowBackgroundImage + kcfg_Timestamping + kcfg_ShowBacklog diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/chatwindowbehaviour_preferences.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/chatwindowbehaviour_preferences.ui --- konversation-1.0.1/konversation/src/chatwindowbehaviour_preferences.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/chatwindowbehaviour_preferences.ui 2008-08-06 16:56:27.000000000 +0100 @@ -8,29 +8,29 @@ 0 0 - 507 - 492 + 458 + 461 - + unnamed 0 - + groupBox3 General - + unnamed - + kcfg_Beep @@ -41,7 +41,7 @@ Sounds the system bell when you receive an ASCII BEL (0x07) control character - + kcfg_HideUnimportantEvents @@ -49,7 +49,7 @@ Hide &Join/Part/Nick events - + kcfg_DisableExpansion @@ -60,26 +60,7 @@ Do not expand variables when sending text to the server. A variable starts with '%'; for example, %B will expand to the characters needed to make a text bold. - - - kcfg_AutoInsertRememberLineAfterMinimizing - - - Insert a &remember line when chat window is hidden - - - Inserts a remember line into the chat window when you switch to another chat window or minimize the application. - - - - - kcfg_ShowRememberLineInAllWindows - - - Show remember lines in all chat windows - - - + kcfg_RedirectServerAndAppMsgToStatusPane @@ -87,20 +68,23 @@ &Redirect status messages to the server status window - + - kcfg_UseLiteralModes + textLabel1 - &Use raw modes for mode changes + Scroll&back limit: + + + kcfg_ScrollbackMax - Keep channel mode string as a combination of characters instead of translating them into human readable words. E.g. '*** Channel modes: no messages from outside' will become '*** Channel modes: n' + How many lines to keep in buffers, 0 = unlimited - + - spacer1 + spacer1_2 Horizontal @@ -110,26 +94,23 @@ - 230 + 410 20 - + - textLabel1 + kcfg_UseLiteralModes - Scroll&back limit: - - - kcfg_ScrollbackMax + &Use raw modes for mode changes - How many lines to keep in buffers, 0 = unlimited + Keep channel mode string as a combination of characters instead of translating them into human readable words. E.g. '*** Channel modes: no messages from outside' will become '*** Channel modes: n' - + kcfg_ScrollbackMax @@ -146,73 +127,105 @@ How many lines to keep in buffers, 0 = unlimited - + + + spacer1 + + + Horizontal + + + Expanding + + + + 230 + 20 + + + + - + - spacer6 - - - Vertical - - - Expanding - - - - 41 - 10 - - - - - - kcfg_AutoWhoContinuousEnabled + groupBox3_2 - Enable Automatic User Information Look Up (/WHO) - - - true - - - false + Marker Lines unnamed - + - whoIntervalLbl + kcfg_MarkerLineInAllViews - Update interval: + Show manually inserted lines in all chat windows - - kcfg_AutoWhoContinuousInterval + + + + kcfg_AutomaticRememberLine + + + Mark the last position in a chat window when it is hidden + + + + + + Inserts a remember line into the chat window when you switch to another chat window or minimize the application. - + - kcfg_AutoWhoContinuousInterval + kcfg_AutomaticRememberLineOnlyOnTextChange false - - Every + + Move the line only when new text is about to be shown - - sec + + + + spacer9 - - 1000 + + Horizontal - - 30 + + Fixed - + + + 16 + 20 + + + + + + + + kcfg_AutoWhoContinuousEnabled + + + Enable Automatic User Information Look Up (/WHO) + + + true + + + false + + + + unnamed + spacer3 @@ -230,24 +243,7 @@ - - - kcfg_AutoWhoNicksLimit - - - nicks - - - 1000 - - - 0 - - - 300 - - - + spacer2 @@ -264,7 +260,7 @@ - + textLabel2 @@ -275,20 +271,74 @@ kcfg_AutoWhoNicksLimit - + + + kcfg_AutoWhoNicksLimit + + + nicks + + + 1000 + + + 0 + + + 300 + + + + + kcfg_AutoWhoContinuousInterval + + + false + + + + + + seconds + + + 1000 + + + 30 + + + - kcfg_ShowRealNames + whoIntervalLbl - &Show real names next to nicknames + Update interval: - - Show the real name of a person next to his/her nick in nickname list. + + kcfg_AutoWhoContinuousInterval - + + + spacer6 + + + Vertical + + + Expanding + + + + 41 + 20 + + + + @@ -297,7 +347,28 @@ kcfg_AutoWhoContinuousInterval setEnabled(bool) + + kcfg_AutomaticRememberLine + toggled(bool) + kcfg_AutomaticRememberLineOnlyOnTextChange + setEnabled(bool) + + + kcfg_Beep + kcfg_HideUnimportantEvents + kcfg_DisableExpansion + kcfg_RedirectServerAndAppMsgToStatusPane + kcfg_UseLiteralModes + kcfg_ScrollbackMax + kcfg_AutomaticRememberLine + kcfg_AutomaticRememberLineOnlyOnTextChange + kcfg_MarkerLineInAllViews + kcfg_AutoWhoNicksLimit + kcfg_AutoWhoContinuousInterval + kcfg_AutoWhoContinuousEnabled + kcfg_AutoWhoContinuousEnabled + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/chatwindow.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/chatwindow.cpp --- konversation-1.0.1/konversation/src/chatwindow.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/chatwindow.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,12 +6,17 @@ */ /* - Base class for all chat panels - begin: Fri Feb 1 2002 - copyright: (C) 2002 by Dario Abatianni - email: eisfuchs@tigress.com + Copyright (C) 2002 Dario Abatianni + Copyright (C) 2006-2008 Eike Hein */ +#include "chatwindow.h" +#include "channel.h" +#include "ircview.h" +#include "server.h" +#include "konversationapplication.h" +#include "logfilereader.h" + #include #include #include @@ -25,16 +30,11 @@ #include #include -#include "channel.h" -#include "chatwindow.h" -#include "ircview.h" -#include "server.h" -#include "konversationapplication.h" -#include "logfilereader.h" ChatWindow::ChatWindow(QWidget* parent) : QVBox(parent) { setName("ChatWindowObject"); + setTextView(0); parentWidget=parent; firstLog=true; m_server=0; @@ -53,6 +53,7 @@ ChatWindow::~ChatWindow() { emit closing(this); + m_server=0; } void ChatWindow::updateAppearance() @@ -60,6 +61,14 @@ // The font size of the KTabWidget container may be inappropriately // small due to the "Tab bar" font size setting. setFont(KGlobalSettings::generalFont()); + + if (textView) + { + if (Preferences::showIRCViewScrollBar()) + textView->setVScrollBarMode(QScrollView::AlwaysOn); + else + textView->setVScrollBarMode(QScrollView::AlwaysOff); + } } void ChatWindow::setName(const QString& newName) @@ -110,15 +119,9 @@ return m_server; } -void ChatWindow::serverOnline(bool state) +void ChatWindow::serverOnline(bool /* state */) { - emit online(this,state); -} - -void ChatWindow::setIdentity(const Identity *newIdentity) -{ - if(!newIdentity) return; - identity=*newIdentity; + //emit online(this,state); } void ChatWindow::setTextView(IRCView* newView) @@ -130,18 +133,21 @@ return; } + if(Preferences::showIRCViewScrollBar()) + { + textView->setVScrollBarMode(QScrollView::Auto); + } + else + { + textView->setVScrollBarMode(QScrollView::AlwaysOff); + } + textView->setChatWin(this); connect(textView,SIGNAL(textToLog(const QString&)), this,SLOT(logText(const QString&))); connect(textView,SIGNAL(setStatusBarTempText(const QString&)), this, SIGNAL(setStatusBarTempText(const QString&))); connect(textView,SIGNAL(clearStatusBarTempText()), this, SIGNAL(clearStatusBarTempText())); } -void ChatWindow::insertRememberLine() -{ - if(!textView) return; - textView->appendLine(); -} - void ChatWindow::appendRaw(const QString& message, bool suppressTimestamps) { if(!textView) return; @@ -154,16 +160,20 @@ textView->append(nickname,message); } -void ChatWindow::appendQuery(const QString& nickname,const QString& message, bool) +void ChatWindow::appendQuery(const QString& nickname,const QString& message, bool inChannel) { if(!textView) return ; - textView->appendQuery(nickname,message); + textView->appendQuery(nickname,message, inChannel); } -void ChatWindow::appendAction(const QString& nickname,const QString& message, bool) +void ChatWindow::appendAction(const QString& nickname, const QString& message) { - if(!textView) return ; - textView->appendAction(nickname,message); + if(!textView) return; + + if (getType() == Query || getType() == DccChat) + textView->appendQueryAction(nickname, message); + else + textView->appendChannelAction(nickname, message); } void ChatWindow::appendServerMessage(const QString& type,const QString& message, bool parseURL) @@ -213,10 +223,10 @@ { logName = name + ".log"; } - else if(m_server) + else if (m_server) { // make sure that no path delimiters are in the name - logName = QString(m_server->getServerGroup().lower()).append('_').append(name).append(".log").replace('/','_'); + logName = QString(m_server->getDisplayName().lower()).append('_').append(name).append(".log").replace('/','_'); } // load backlog to show @@ -413,13 +423,15 @@ } // reimplement this in all panels that have user input -void ChatWindow::appendInputText(const QString&) +void ChatWindow::appendInputText(const QString&, bool) { } // reimplement this if your window needs special close treatment -bool ChatWindow::closeYourself() +bool ChatWindow::closeYourself(bool /* askForConfirmation */) { + deleteLater(); + return true; } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/chatwindow.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/chatwindow.h --- konversation-1.0.1/konversation/src/chatwindow.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/chatwindow.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,29 +6,23 @@ */ /* - Base class for all chat panels - begin: Fri Feb 1 2002 - copyright: (C) 2002 by Dario Abatianni - email: eisfuchs@tigress.com + Copyright (C) 2002 Dario Abatianni + Copyright (C) 2006-2008 Eike Hein */ #ifndef CHATWINDOW_H #define CHATWINDOW_H -#include -#include - #include "identity.h" #include "common.h" -/* - @author Dario Abatianni -*/ +#include +#include + class IRCView; class Server; class KonversationMainWindow; -class ViewContainer; class ChatWindow : public QVBox { @@ -44,7 +38,7 @@ Channel, Query, DccChat, - DccPanel, + DccTransferPanel, RawLog, Notice, SNotice, @@ -69,7 +63,6 @@ * @return The server it is associated with, or null if none. */ Server* getServer(); - virtual void setIdentity(const Identity *newIdentity); void setTextView(IRCView* newView); IRCView* getTextView() const; void setLog(bool activate); @@ -79,11 +72,10 @@ void setType(WindowType newType); WindowType getType(); - virtual void insertRememberLine(); virtual void append(const QString& nickname,const QString& message); virtual void appendRaw(const QString& message, bool suppressTimestamps=false); - virtual void appendQuery(const QString& nickname,const QString& message, bool usenotifications = false); - virtual void appendAction(const QString& nickname,const QString& message, bool usenotifications = false); + virtual void appendQuery(const QString& nickname,const QString& message, bool inChannel = false); + virtual void appendAction(const QString& nickname,const QString& message); virtual void appendServerMessage(const QString& type,const QString& message, bool parseURL = true); virtual void appendCommandMessage(const QString& command, const QString& message, bool important = true, bool parseURL = true, bool self = false); @@ -93,7 +85,7 @@ virtual QString getTextInLine(); /** Clean up and close this tab. Return false if you want to cancel the close. */ - virtual bool closeYourself(); + virtual bool closeYourself(bool askForConfirmation = true); /** Reimplement this to return true in all classes that /can/ become front view. */ virtual bool canBeFrontView(); @@ -133,7 +125,7 @@ signals: void nameChanged(ChatWindow* view, const QString& newName); - void online(ChatWindow* myself, bool state); + //void online(ChatWindow* myself, bool state); /** Emit this signal when you want to change the status bar text for this tab. * It is ignored if this tab isn't focused. */ @@ -158,19 +150,18 @@ */ void adjustFocus(); - virtual void appendInputText(const QString&); + virtual void appendInputText(const QString&, bool fromCursor); virtual void indicateAway(bool away); + virtual void setNotificationsEnabled(bool enable) { m_notificationsEnabled = enable; } + void activateTabNotification(Konversation::TabNotifyType type); void resetTabNotification(); protected slots: ///Used to disable functions when not connected virtual void serverOnline(bool online); - ///Checks if we should update tab notification or not - void activateTabNotification(Konversation::TabNotifyType type); - protected: /** Some children may handle the name themselves, and not want this public. @@ -202,7 +193,6 @@ * Not always non-null - e.g. for konsolepanel */ Server* m_server; - Identity identity; QFile logfile; WindowType type; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/colorsappearance_preferences.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/colorsappearance_preferences.ui --- konversation-1.0.1/konversation/src/colorsappearance_preferences.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/colorsappearance_preferences.ui 2008-08-06 16:56:27.000000000 +0100 @@ -1305,6 +1305,46 @@ + + kcfg_ActionMessageColor + kcfg_ChannelMessageColor + kcfg_HyperlinkColor + kcfg_ServerMessageColor + kcfg_TextViewBackgroundColor + kcfg_BacklogMessageColor + kcfg_CommandMessageColor + kcfg_QueryMessageColor + kcfg_TimeColor + kcfg_AlternateBackgroundColor + kcfg_InputFieldsBackgroundColor + kcfg_UseColoredNicks + kcfg_NickColor0 + kcfg_NickColor1 + kcfg_NickColor2 + kcfg_NickColor3 + kcfg_NickColor4 + kcfg_NickColor5 + kcfg_NickColor6 + kcfg_NickColor7 + kcfg_NickColor8 + kcfg_AllowColorCodes + kcfg_IrcColorCode0 + kcfg_IrcColorCode1 + kcfg_IrcColorCode2 + kcfg_IrcColorCode3 + kcfg_IrcColorCode4 + kcfg_IrcColorCode5 + kcfg_IrcColorCode6 + kcfg_IrcColorCode7 + kcfg_IrcColorCode8 + kcfg_IrcColorCode9 + kcfg_IrcColorCode10 + kcfg_IrcColorCode11 + kcfg_IrcColorCode12 + kcfg_IrcColorCode13 + kcfg_IrcColorCode14 + kcfg_IrcColorCode15 + @@ -1344,4 +1384,12 @@ kcolorbutton.h kcolorbutton.h + + + kcfg_InputFieldsBackgroundColor + toggled(bool) + kcfg_AlternateBackgroundColor + setEnabled(bool) + + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/commit.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/commit.h --- konversation-1.0.1/konversation/src/commit.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/commit.h 2008-08-06 16:56:27.000000000 +0100 @@ -1,4 +1,4 @@ // This COMMIT number is added to version string to be used as "patch level" #ifndef COMMIT -#define COMMIT 3183 +#define COMMIT 3300 #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/common.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/common.cpp --- konversation-1.0.1/konversation/src/common.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/common.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,10 +6,14 @@ */ /* - copyright: (C) 2004 by Peter Simonsson - email: psn@linux.se + Copyright (C) 2004 Peter Simonsson + Copyright (C) 2006-2008 Eike Hein */ +#include "common.h" +#include "konversationapplication.h" +#include "config/preferences.h" + #include #include #include @@ -18,9 +22,6 @@ #include #include -#include "common.h" -#include "konversationapplication.h" -#include "config/preferences.h" namespace Konversation { @@ -29,7 +30,7 @@ #include "unicode.cpp" static QRegExp colorRegExp("((\003([0-9]|0[0-9]|1[0-5])(,([0-9]|0[0-9]|1[0-5])|)|\017)|\x02|\x09|\x13|\x16|\x1f)"); - static QRegExp urlPattern("((www\\.(?!\\.)|(fish|(f|ht)tp(|s))://)(\\.?[\\d\\w/,\\':~\\?=;#@\\-\\+\\%\\*\\{\\}\\!\\(\\)]|&)+)|" + static QRegExp urlPattern("((www\\.(?!\\.)|(fish|irc|(f|sf|ht)tp(|s))://)(\\.?[\\d\\w/,\\':~\\?=;#@\\-\\+\\%\\*\\{\\}\\!\\(\\)]|&)+)|" "([-.\\d\\w]+@[-.\\d\\w]{2,}\\.[\\w]{2,})"); static QRegExp tdlPattern("(.*)\\.(\\w+),$"); @@ -53,27 +54,38 @@ QString filteredLine = text; QString linkColor = Preferences::color(Preferences::Hyperlink).name(); QString link; + QString insertText; + int pos = 0; + int urlLen = 0; + QString href; if(useCustomColor) { - link = "\\1\\2"; + link = "%2"; } else { - link = "\\1\\2"; + link = "%2"; } if(filteredLine.contains("#")) { - QRegExp chanExp("(^|\\s|^\"|\\s\"|,|'|\\(|\\:|!|@|%|\\+)(#[^,\\s;\\)\\:\\/\\(\\<\\>]*[^.,\\s;\\)\\:\\/\\(\"\''\\<\\>])"); - filteredLine.replace(chanExp, link); + QRegExp chanExp("(^|\\s|^\"|\\s\"|,|'|\\(|\\:|!|@|%|\\+)(#[^,\\s;\\)\\:\\/\\(\\<\\>]*[^.,\\s;\\)\\:\\/\\(\"\''\\<\\>])"); + while((pos = chanExp.search(filteredLine, pos)) >= 0) + { + href = chanExp.cap(2); + urlLen = href.length(); + pos += chanExp.cap(1).length(); + + // HACK:Use space as a placeholder for \ as Qt tries to be clever and does a replace to / in urls in QTextEdit + insertText = link.arg(QString(href).replace('\\', " "), href); + filteredLine.replace(pos, urlLen, insertText); + pos += insertText.length(); + } } - int pos = 0; - int urlLen = 0; - QString append; - QString href; - QString insertText; + pos = 0; + urlLen = 0; urlPattern.setCaseSensitive(false); QString protocol; @@ -89,6 +101,8 @@ while((pos = urlPattern.search(filteredLine, pos)) >= 0) { + QString append; + // check if the matched text is already replaced as a channel if ( filteredLine.findRev( " filteredLine.findRev( "", pos ) ) { @@ -107,6 +121,13 @@ append = ','; } + // Don't consider trailing semicolon part of link. + if (href.right(1) == ";") + { + href.truncate(href.length()-1); + append = ';'; + } + // Don't consider trailing closing parenthesis part of link when // there's an opening parenthesis preceding the beginning of the // URL or there is no opening parenthesis in the URL at all. @@ -128,8 +149,9 @@ else if (urlPattern.cap(1).isEmpty()) protocol = "mailto:"; - // Use \003 as a placeholder for & so we can readd them after changing all & in the normal text to & - insertText = link.arg(protocol, QString(href).replace('&', "\x0b"), href) + append; + // Use \x0b as a placeholder for & so we can readd them after changing all & in the normal text to & + // HACK Replace % with \x03 in the url to keep Qt from doing stupid things + insertText = link.arg(protocol, QString(href).replace('&', "\x0b").replace('%', "\x03"), href) + append; filteredLine.replace(pos, urlLen, insertText); pos += insertText.length(); KonversationApplication::instance()->storeUrl(fromNick, href); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/common.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/common.h --- konversation-1.0.1/konversation/src/common.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/common.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,8 +6,8 @@ */ /* - copyright: (C) 2004 by Peter Simonsson - email: psn@linux.se + Copyright (C) 2004 Peter Simonsson + Copyright (C) 2006-2008 Eike Hein */ #ifndef COMMON_H @@ -30,10 +30,27 @@ { tnfNick, tnfHighlight, + tnfPrivate, tnfNormal, tnfSystem, tnfControl, tnfNone }; + + enum ConnectionState + { + SSNeverConnected, + SSDeliberatelyDisconnected, + SSInvoluntarilyDisconnected, + SSConnecting, + SSConnected + }; + + enum ConnectionFlag + { + SilentlyReuseConnection, + PromptToReuseConnection, + CreateNewConnection + }; } #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/config/konversation.kcfg /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/config/konversation.kcfg --- konversation-1.0.1/konversation/src/config/konversation.kcfg 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/config/konversation.kcfg 2008-08-06 16:56:27.000000000 +0100 @@ -136,6 +136,7 @@ 2 + 0 @@ -215,16 +216,15 @@ - - false - - - true + + true + + @@ -265,6 +265,19 @@ + + true + + + + + false + + + + false + + false @@ -360,7 +373,23 @@ - + + 10 + 10 + + + + + false + + + + + true + + + + false @@ -409,6 +438,11 @@ + + false + + + true @@ -667,6 +701,14 @@ eth0 + + false + + + 16,90,80,150,70,90,120,80,70,120 + + + @@ -704,6 +746,9 @@ Bottom + + false + true @@ -727,18 +772,13 @@ - - 120 - - - - + 10 - - false + + 0 @@ -870,6 +910,16 @@ + + true + + + + + #800000 + + + false @@ -912,4 +962,35 @@ + + + + QValueList< QValueList<int> > defaultRate; + QValueList< QValueList<int> >::iterator defaultRateInitIter; + + defaultRateInitIter = defaultRate.append(QValueList<int>()); + (*defaultRateInitIter).append( 15 ); + (*defaultRateInitIter).append( 60 ); + (*defaultRateInitIter).append( 0 ); + + defaultRateInitIter = defaultRate.append(QValueList<int>()); + (*defaultRateInitIter).append( 40 ); + (*defaultRateInitIter).append( 60 ); + (*defaultRateInitIter).append( 0 ); + + defaultRateInitIter = defaultRate.append(QValueList<int>()); + (*defaultRateInitIter).append( 1 ); + (*defaultRateInitIter).append( 1 ); + (*defaultRateInitIter).append( 0 ); + + if (0) //kconfig_compiler generates invalid code for int lists + + defaultRate[0] + defaultRate[1] + defaultRate[2] + + + false + + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/config/Makefile.am /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/config/Makefile.am --- konversation-1.0.1/konversation/src/config/Makefile.am 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/config/Makefile.am 2008-08-06 16:56:27.000000000 +0100 @@ -1,9 +1,8 @@ -INCLUDES = -I$(top_srcdir)/konversation/src -I$(top_builddir)/konversation/src $(all_includes) +INCLUDES = -I.. -I$(srcdir)/.. $(all_includes) METASOURCES = AUTO noinst_LTLIBRARIES = libkonversationconfig.la libkonversationconfig_la_SOURCES = preferences_base.kcfgc preferences.cpp libkonversationconfig_la_LDFLAGS = $(all_libraries) -no-undefined -libkonversationconfig_la_LIBADD = $(LIB_KDEUI) kde_kcfg_DATA = konversation.kcfg diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/config/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/config/Makefile.in --- konversation-1.0.1/konversation/src/config/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/config/Makefile.in 2008-08-06 16:57:57.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,15 +16,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -50,8 +46,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -am__DEPENDENCIES_1 = -libkonversationconfig_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +libkonversationconfig_la_LIBADD = am_libkonversationconfig_la_OBJECTS = preferences.lo #>- libkonversationconfig_la_OBJECTS = \ #>- $(am_libkonversationconfig_la_OBJECTS) @@ -60,7 +55,16 @@ libkonversationconfig_la_nofinal_OBJECTS = preferences.lo preferences_base.lo @KDE_USE_FINAL_FALSE@libkonversationconfig_la_OBJECTS = $(libkonversationconfig_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libkonversationconfig_la_OBJECTS = $(libkonversationconfig_la_final_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +#>- libkonversationconfig_la_LINK = $(LIBTOOL) --tag=CXX \ +#>- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ +#>- $(AM_CXXFLAGS) $(CXXFLAGS) $(libkonversationconfig_la_LDFLAGS) \ +#>- $(LDFLAGS) -o $@ +#>+ 4 +libkonversationconfig_la_LINK = $(LIBTOOL) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(libkonversationconfig_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -68,19 +72,21 @@ #>+ 2 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -#>- $(AM_CXXFLAGS) $(CXXFLAGS) +#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -#>+ 2 -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ +#>- $(LDFLAGS) -o $@ +#>+ 3 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(libkonversationconfig_la_SOURCES) DIST_SOURCES = $(libkonversationconfig_la_SOURCES) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -98,8 +104,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -139,7 +143,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -214,12 +220,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -233,6 +241,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -252,24 +261,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -281,19 +288,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -320,45 +326,42 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ -INCLUDES = -I$(top_srcdir)/konversation/src -I$(top_builddir)/konversation/src $(all_includes) +INCLUDES = -I.. -I$(srcdir)/.. $(all_includes) #>- METASOURCES = AUTO noinst_LTLIBRARIES = libkonversationconfig.la #>- libkonversationconfig_la_SOURCES = preferences_base.kcfgc preferences.cpp #>+ 1 libkonversationconfig_la_SOURCES= preferences.cpp preferences_base.cpp -#>- libkonversationconfig_la_LDFLAGS = $(all_libraries) -no-undefined -#>+ 1 -libkonversationconfig_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -libkonversationconfig_la_LIBADD = $(LIB_KDEUI) +libkonversationconfig_la_LDFLAGS = $(all_libraries) -no-undefined kde_kcfg_DATA = konversation.kcfg #>- all: all-am #>+ 1 @@ -417,11 +420,8 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -#>- libkonversationconfig.la: $(libkonversationconfig_la_OBJECTS) $(libkonversationconfig_la_DEPENDENCIES) -#>+ 2 -@KDE_USE_CLOSURE_TRUE@libkonversationconfig.la: libkonversationconfig.la.closure $(libkonversationconfig_la_OBJECTS) $(libkonversationconfig_la_DEPENDENCIES) -@KDE_USE_CLOSURE_FALSE@libkonversationconfig.la: $(libkonversationconfig_la_OBJECTS) $(libkonversationconfig_la_DEPENDENCIES) - $(CXXLINK) $(libkonversationconfig_la_LDFLAGS) $(libkonversationconfig_la_OBJECTS) $(libkonversationconfig_la_LIBADD) $(LIBS) +libkonversationconfig.la: $(libkonversationconfig_la_OBJECTS) $(libkonversationconfig_la_DEPENDENCIES) + $(libkonversationconfig_la_LINK) $(libkonversationconfig_la_OBJECTS) $(libkonversationconfig_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -432,22 +432,22 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preferences.Plo@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< @@ -457,13 +457,9 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-kde_kcfgDATA: $(kde_kcfg_DATA) @$(NORMAL_INSTALL) - test -z "$(kde_kcfgdir)" || $(mkdir_p) "$(DESTDIR)$(kde_kcfgdir)" + test -z "$(kde_kcfgdir)" || $(MKDIR_P) "$(DESTDIR)$(kde_kcfgdir)" @list='$(kde_kcfg_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -484,8 +480,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -497,8 +493,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -508,13 +504,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -528,22 +523,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -559,7 +553,7 @@ all-am: Makefile $(LTLIBRARIES) $(DATA) installdirs: for dir in "$(DESTDIR)$(kde_kcfgdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -592,14 +586,14 @@ #>- clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ #>- mostlyclean-am #>+ 2 -clean-am: clean-metasources clean-kcfg clean-closures clean-bcheck clean-final clean-generic clean-libtool clean-noinstLTLIBRARIES \ +clean-am: clean-metasources clean-kcfg clean-bcheck clean-final clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-am @@ -613,12 +607,20 @@ install-data-am: install-kde_kcfgDATA +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -639,34 +641,28 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-kde_kcfgDATA +uninstall-am: uninstall-kde_kcfgDATA + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ - install-kde_kcfgDATA install-man install-strip installcheck \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-kde_kcfgDATA install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-kde_kcfgDATA + tags uninstall uninstall-am uninstall-kde_kcfgDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 8 -libkonversationconfig.la.closure: $(libkonversationconfig_la_OBJECTS) $(libkonversationconfig_la_DEPENDENCIES) - @echo "int main() {return 0;}" > libkonversationconfig_la_closure.cpp - @$(LTCXXCOMPILE) -c libkonversationconfig_la_closure.cpp - $(CXXLINK) libkonversationconfig_la_closure.lo $(libkonversationconfig_la_LDFLAGS) $(libkonversationconfig_la_OBJECTS) $(libkonversationconfig_la_LIBADD) $(LIBS) - @rm -f libkonversationconfig_la_closure.* libkonversationconfig.la.closure - @echo "timestamp" > libkonversationconfig.la.closure - - #>+ 3 preferences.moc: $(srcdir)/preferences.h $(MOC) $(srcdir)/preferences.h -o preferences.moc @@ -686,10 +682,6 @@ -rm -f \ preferences_base.cpp preferences_base.h -#>+ 3 -clean-closures: - -rm -f libkonversationconfig.la.closure - #>+ 2 docs-am: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/config/preferences.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/config/preferences.cpp --- konversation-1.0.1/konversation/src/config/preferences.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/config/preferences.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -10,9 +10,16 @@ Copyright (C) 2005 Ismail Donmez Copyright (C) 2005 Peter Simonsson Copyright (C) 2005 John Tapsell - Copyright (C) 2005 Eike Hein + Copyright (C) 2005-2008 Eike Hein */ +#include "config/preferences.h" +#include "identity.h" +#include "ignore.h" +#include "highlight.h" +#include "commit.h" +#include "version.h" + #include #include #include @@ -27,12 +34,6 @@ #include #include -#include "config/preferences.h" -#include "identity.h" -#include "ignore.h" -#include "highlight.h" -#include "commit.h" -#include "version.h" Preferences *Preferences::mSelf = 0; static KStaticDeleter staticPreferencesDeleter; @@ -55,10 +56,11 @@ mIdentity=new Identity(); mIdentity->setName(i18n("Default Identity")); addIdentity(mIdentity); + mIgnoreList.setAutoDelete(true); KUser user(KUser::UseRealUserID); - setIdent(user.loginName()); - setRealName(user.fullName()); + mIdentity->setIdent(user.loginName()); + mIdentity->setRealName(user.fullName()); QStringList nickList; nickList.append(user.loginName()); @@ -66,30 +68,25 @@ nickList.append(user.loginName() + "__"); mIdentity->setNicknameList(nickList); - setPartReason("Konversation terminated!"); - setKickReason("User terminated!"); - - setShowAwayMessage(false); - setAwayMessage("/me is away: %s"); - setUnAwayMessage("/me is back."); Konversation::ServerGroupSettingsPtr serverGroup = new Konversation::ServerGroupSettings; serverGroup->setName("Freenode"); Konversation::ServerSettings server; - server.setServer("irc.freenode.org"); + server.setHost("irc.freenode.org"); + server.setPort(8001); serverGroup->addServer(server); serverGroup->setIdentityId(mIdentity->id()); Konversation::ChannelSettings channel; channel.setName("#kde"); serverGroup->addChannel(channel); serverGroup->setExpanded(false); - mServerGroupList.append(serverGroup); + addServerGroup(serverGroup); setQuickButtonList(defaultQuickButtonList()); setAutoreplaceList(defaultAutoreplaceList()); } Preferences::~Preferences() { - clearIdentityList(); + mIdentityList.clear(); if ( mSelf == this ) staticPreferencesDeleter.setObject( mSelf, 0, false ); @@ -155,6 +152,8 @@ { self()->mServerGroupList.clear(); self()->mServerGroupList = list; + + Konversation::ServerGroupList::iterator it; } void Preferences::addServerGroup(Konversation::ServerGroupSettingsPtr serverGroup) @@ -164,16 +163,16 @@ const Konversation::ServerGroupSettingsPtr Preferences::serverGroupById(int id) { - if(!self()->mServerGroupList.count()) + if (!self()->mServerGroupList.count()) { return 0; } Konversation::ServerGroupList::iterator it; - for(it = self()->mServerGroupList.begin(); it != self()->mServerGroupList.end(); ++it) + for (it = self()->mServerGroupList.begin(); it != self()->mServerGroupList.end(); ++it) { - if((*it)->id() == id) + if ((*it)->id() == id) { return (*it); } @@ -184,18 +183,18 @@ const Konversation::ServerGroupSettingsPtr Preferences::serverGroupByServer(const QString& server) { - if(!self()->mServerGroupList.count()) + if (!self()->mServerGroupList.count()) { return 0; } Konversation::ServerGroupList::iterator it; - for(it = self()->mServerGroupList.begin(); it != self()->mServerGroupList.end(); ++it) + for (it = self()->mServerGroupList.begin(); it != self()->mServerGroupList.end(); ++it) { for (uint i = 0; i != (*it)->serverList().count(); i++) { - if ((*it)->serverByIndex(i).server().lower() == server) + if ((*it)->serverByIndex(i).host().lower() == server) { return (*it); } @@ -209,7 +208,7 @@ { Konversation::ServerGroupList::iterator it; - for(it = self()->mServerGroupList.begin(); it != self()->mServerGroupList.end(); ++it) + for (it = self()->mServerGroupList.begin(); it != self()->mServerGroupList.end(); ++it) { if((*it)->name().lower() == serverGroup.lower()) { @@ -217,7 +216,7 @@ } } - return 0; + return -1; } bool Preferences::isServerGroup(const QString& server) @@ -237,18 +236,19 @@ void Preferences::removeServerGroup(int id) { - if(!self()->mServerGroupList.count()) + if (!self()->mServerGroupList.count()) { return; } Konversation::ServerGroupList::iterator it; - for(it = self()->mServerGroupList.begin(); it != self()->mServerGroupList.end(); ++it) + for (it = self()->mServerGroupList.begin(); it != self()->mServerGroupList.end(); ++it) { - if((*it)->id() == id) + if ((*it)->id() == id) { self()->mServerGroupList.remove(it); + return; } } @@ -340,7 +340,7 @@ return notifyListByGroupName(groupName).join(" "); } -const bool Preferences::addNotify(int serverGroupId, const QString& newPattern) +bool Preferences::addNotify(int serverGroupId, const QString& newPattern) { if (!self()->mNotifyList[serverGroupId].contains(newPattern)) { @@ -352,7 +352,7 @@ return false; } -const bool Preferences::removeNotify(const QString& groupName, const QString& pattern) +bool Preferences::removeNotify(const QString& groupName, const QString& pattern) { int id=serverGroupIdByName(groupName); if(!id) return false; @@ -370,7 +370,7 @@ return false; } -const bool Preferences::isNotify(int serverGroupId, const QString& pattern) +bool Preferences::isNotify(int serverGroupId, const QString& pattern) { if (self()->mNotifyList.find(serverGroupId) != self()->mNotifyList.end()) { @@ -381,7 +381,7 @@ return false; } -const bool Preferences::hasNotifyList(int serverGroupId) +bool Preferences::hasNotifyList(int serverGroupId) { if (self()->mNotifyList.find(serverGroupId) != self()->mNotifyList.end()) return true; @@ -398,9 +398,9 @@ self()->mIdentityList.clear(); } -const QValueList Preferences::identityList() { return self()->mIdentityList; } +const IdentityList Preferences::identityList() { return self()->mIdentityList; } -void Preferences::setIdentityList(const QValueList& list) +void Preferences::setIdentityList(const IdentityList& list) { self()->mIdentityList.clear(); self()->mIdentityList = list; @@ -471,6 +471,8 @@ } } + delete fileInfo; + return aliasList; } @@ -487,7 +489,7 @@ const QString Preferences::kickReason() { return self()->mIdentityList[0]->getKickReason(); } void Preferences::setKickReason(const QString &newReason) { self()->mIdentityList[0]->setKickReason(newReason); } -const bool Preferences::showAwayMessage() { return self()->mIdentityList[0]->getShowAwayMessage(); } +bool Preferences::showAwayMessage() { return self()->mIdentityList[0]->getShowAwayMessage(); } void Preferences::setShowAwayMessage(bool state) { self()->mIdentityList[0]->setShowAwayMessage(state); } const QString Preferences::awayMessage() { return self()->mIdentityList[0]->getAwayMessage(); } @@ -521,7 +523,7 @@ PreferencesBase::setAutoUserhost(state); } -const bool Preferences::dialogFlag(const QString& flagName) +bool Preferences::dialogFlag(const QString& flagName) { KConfig* config=KApplication::kApplication()->config(); @@ -554,32 +556,35 @@ // Channel Encodings const QString Preferences::channelEncoding(const QString& server,const QString& channel) { - if(self()->mChannelEncodingsMap.contains(server)) - if(self()->mChannelEncodingsMap[server].contains(channel.lower())) - return self()->mChannelEncodingsMap[server][channel.lower()]; + return channelEncoding(serverGroupIdByName(server),channel); +} + +const QString Preferences::channelEncoding(int serverGroupId,const QString& channel) +{ + if(self()->mChannelEncodingsMap.contains(serverGroupId)) + if(self()->mChannelEncodingsMap[serverGroupId].contains(channel.lower())) + return self()->mChannelEncodingsMap[serverGroupId][channel.lower()]; return QString(); } void Preferences::setChannelEncoding(const QString& server,const QString& channel,const QString& encoding) { - if(!encoding.isEmpty()) - self()->mChannelEncodingsMap[server][channel.lower()]=encoding; - else - { - self()->mChannelEncodingsMap[server].remove(channel.lower()); - if(self()->mChannelEncodingsMap[server].count()==0) - self()->mChannelEncodingsMap.remove(server); - } + setChannelEncoding(serverGroupIdByName(server),channel,encoding); +} + +void Preferences::setChannelEncoding(int serverGroupId,const QString& channel,const QString& encoding) +{ + self()->mChannelEncodingsMap[serverGroupId][channel.lower()]=encoding; } -const QStringList Preferences::channelEncodingsServerList() +const QValueList Preferences::channelEncodingsServerGroupIdList() { return self()->mChannelEncodingsMap.keys(); } -const QStringList Preferences::channelEncodingsChannelList(const QString& server) +const QStringList Preferences::channelEncodingsChannelList(int serverGroupId) { - return self()->mChannelEncodingsMap[server].keys(); + return self()->mChannelEncodingsMap[serverGroupId].keys(); } const QString Preferences::defaultNicknameSortingOrder() diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/config/preferences.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/config/preferences.h --- konversation-1.0.1/konversation/src/config/preferences.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/config/preferences.h 2008-08-06 16:56:27.000000000 +0100 @@ -10,12 +10,16 @@ Copyright (C) 2005 Ismail Donmez Copyright (C) 2005 Peter Simonsson Copyright (C) 2005 John Tapsell - Copyright (C) 2005 Eike Hein + Copyright (C) 2005-2008 Eike Hein */ #ifndef PREFERENCES_H #define PREFERENCES_H +#include "servergroupsettings.h" +#include "identity.h" +#include "preferences_base.h" + #include #include #include @@ -27,13 +31,6 @@ #include -#include "servergroupsettings.h" -#include "identity.h" -#include "preferences_base.h" - -/* - @author Dario Abatianni -*/ /* Options still to be GUIfied: @@ -73,24 +70,24 @@ static bool isServerGroup(const QString& server); static void removeServerGroup(int id); - /** Returns a list of alias set up by default. This is a set of aliases for the scripts found. */ - static QStringList defaultAliasList(); + /** Returns a list of alias set up by default. This is a set of aliases for the scripts found. */ + static QStringList defaultAliasList(); - //notifylist is in kconfigxt - FIXME + //notifylist is in kconfigxt - FIXME static const QMap notifyList(); static const QStringList notifyListByGroupName(const QString& groupName); static const QString notifyStringByGroupName(const QString& groupName); static void setNotifyList(const QMap& newList); - static const bool addNotify(int serverGroupId, const QString& newPattern); - static const bool removeNotify(const QString& groupName, const QString& pattern); - static const bool isNotify(int serverGroupId, const QString& pattern); - static const bool hasNotifyList(int serverGroupId); + static bool addNotify(int serverGroupId, const QString& newPattern); + static bool removeNotify(const QString& groupName, const QString& pattern); + static bool isNotify(int serverGroupId, const QString& pattern); + static bool hasNotifyList(int serverGroupId); static const QPtrList highlightList(); static void setHighlightList(QPtrList newList); static void addHighlight(const QString& newHighlight,bool regExp, const QColor &color,const QString& sound,const QString& autoText); - /* All of the below work on the first (default) identity in your identity list*/ + /* All of the below work on the first (default) identity in your identity list*/ static void addIgnore(const QString &newIgnore); static bool removeIgnore(const QString &oldIgnore); static bool isIgnored(const QString &nickname); @@ -111,8 +108,8 @@ static void addIdentity(IdentityPtr identity); static void removeIdentity(IdentityPtr identity); static void clearIdentityList(); - static const QValueList identityList(); - static void setIdentityList(const QValueList& list); + static const IdentityList identityList(); + static void setIdentityList(const IdentityList& list); static const IdentityPtr identityByName(const QString& name); static const IdentityPtr identityById(int id); static const QString ident(); @@ -124,24 +121,26 @@ static const QString kickReason(); static void setKickReason(const QString &newReason); static void setShowAwayMessage(bool state); - static const bool showAwayMessage(); + static bool showAwayMessage(); static const QString awayMessage(); static void setAwayMessage(const QString &newMessage); static const QString unAwayMessage(); static void setUnAwayMessage(const QString &newMessage); - static const QString defaultNicknameSortingOrder(); + static const QString defaultNicknameSortingOrder(); static const QString nickname(int index); static const QStringList nicknameList(); static void setNickname(int index,const QString &newName); static void setNicknameList(const QStringList &newList); - static const bool dialogFlag(const QString& flagName); + static bool dialogFlag(const QString& flagName); static void setDialogFlag(const QString& flagName,bool state); static const QString channelEncoding(const QString& server,const QString& channel); + static const QString channelEncoding(int serverGroupId,const QString& channel); static void setChannelEncoding(const QString& server,const QString& channel,const QString& encoding); - static const QStringList channelEncodingsServerList(); - static const QStringList channelEncodingsChannelList(const QString& server); + static void setChannelEncoding(int serverGroupId,const QString& channel,const QString& encoding); + static const QValueList channelEncodingsServerGroupIdList(); + static const QStringList channelEncodingsChannelList(int serverGroupId); static void setShowTrayIcon(bool state); static void setTrayNotify(bool state); @@ -162,7 +161,7 @@ QValueList mIdentityList; QPtrList mHighlightList; QMap mNotifyList; // network id, list of nicks - QMap< QString,QMap > mChannelEncodingsMap; + QMap< int,QMap > mChannelEncodingsMap; // mChannelEncodingsMap[serverGroupdId][channelName] QStringList mQuickButtonList; QStringList mAutoreplaceList; QString mSortingOrder; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/connectionbehavior_preferences.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/connectionbehavior_preferences.ui --- konversation-1.0.1/konversation/src/connectionbehavior_preferences.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/connectionbehavior_preferences.ui 2008-08-06 16:56:27.000000000 +0100 @@ -41,13 +41,13 @@ - reconnectTimeoutLabel + reconnectDelayLabel - Reconnect timeout: + Reconnect delay: - reconnectTimeoutSpin + reconnectDelaySpin @@ -77,7 +77,7 @@ - kcfg_ReconnectTimeout + kcfg_ReconnectDelay @@ -92,7 +92,7 @@ 9999 - s + seconds @@ -102,6 +102,12 @@ 100 + + 0 + + + Unlimited + @@ -162,6 +168,14 @@ + + + + kcfg_AutoReconnect + kcfg_ReconnectDelay + kcfg_ReconnectCount + kcfg_RawLog + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/connectionmanager.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/connectionmanager.cpp --- konversation-1.0.1/konversation/src/connectionmanager.cpp 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/connectionmanager.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,580 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + Copyright (C) 2008 Eike Hein +*/ + +#include "connectionmanager.h" +#include "connectionsettings.h" +#include "serversettings.h" +#include "servergroupsettings.h" +#include "config/preferences.h" +#include "konversationapplication.h" +#include "konversationmainwindow.h" +#include "statuspanel.h" + +#include + +#include +#include + + +ConnectionManager::ConnectionManager(QObject* parent) : QObject(parent) +{ + connect(this, SIGNAL(requestReconnect(Server*)), this, SLOT(handleReconnect(Server*))); +} + +ConnectionManager::~ConnectionManager() +{ +} + +void ConnectionManager::connectTo(Konversation::ConnectionFlag flag, const QString& target, + const QString& port, const QString& password, const QString& nick, const QString& channel, + bool useSSL) +{ + ConnectionSettings settings; + + if (target.startsWith("irc://")) + decodeIrcUrl(target, settings); + else + { + decodeAddress(target, settings); + + Konversation::ServerSettings server = settings.server(); + + if (!port.isEmpty()) server.setPort(port.toInt()); + + if (!password.isEmpty()) server.setPassword(password); + + if (useSSL) server.setSSLEnabled(true); + + settings.setServer(server); + + if (!nick.isEmpty()) settings.setInitialNick(nick); + + if (!channel.isEmpty()) + { + Konversation::ChannelSettings channelSettings(channel); + + settings.setInitialChannel(channelSettings); + } + } + + connectTo(flag, settings); +} + +void ConnectionManager::connectTo(Konversation::ConnectionFlag flag, int serverGroupId) +{ + ConnectionSettings settings; + + Konversation::ServerGroupSettingsPtr serverGroup; + + serverGroup = Preferences::serverGroupById(serverGroupId); + + if (serverGroup) + { + settings.setServerGroup(serverGroup); + + if (serverGroup->serverList().size() > 0) + settings.setServer(serverGroup->serverList()[0]); + } + + connectTo(flag, settings); +} + +void ConnectionManager::connectTo(Konversation::ConnectionFlag flag, ConnectionSettings& settings) +{ + if (!settings.isValid()) return; + + emit closeServerList(); + + if (flag != Konversation::CreateNewConnection + && reuseExistingConnection(settings, (flag == Konversation::PromptToReuseConnection))) + { + return; + } + + IdentityPtr identity = settings.identity(); + + if (!identity || !validateIdentity(identity)) return; + + KonversationApplication* konvApp = static_cast(kapp); + KonversationMainWindow* mainWindow = konvApp->getMainWindow(); + + Server* server = new Server(this, settings); + + enlistConnection(server->connectionId(), server); + + connect(server, SIGNAL(destroyed(int)), this, SLOT(delistConnection(int))); + + connect(server, SIGNAL(connectionStateChanged(Server*, Konversation::ConnectionState)), + this, SLOT(handleConnectionStateChange(Server*, Konversation::ConnectionState))); + + connect(server, SIGNAL(awayState(bool)), this, SIGNAL(connectionChangedAwayState(bool))); + + connect(server, SIGNAL(nicksNowOnline(Server*, const QStringList&, bool)), + mainWindow, SLOT(setOnlineList(Server*, const QStringList&,bool))); + connect(server, SIGNAL(awayInsertRememberLine(Server*)), + mainWindow, SIGNAL(triggerRememberLines(Server*))); + + connect(mainWindow, SIGNAL(startNotifyTimer(int)), server, SLOT(startNotifyTimer(int))); + + connect(server, SIGNAL(multiServerCommand(const QString&, const QString&)), + konvApp, SLOT(sendMultiServerCommand(const QString&, const QString&))); +} + +void ConnectionManager::enlistConnection(int connectionId, Server* server) +{ + m_connectionList.insert(connectionId, server); +} + +void ConnectionManager::delistConnection(int connectionId) +{ + m_connectionList.remove(connectionId); +} + +void ConnectionManager::handleConnectionStateChange(Server* server, Konversation::ConnectionState state) +{ + emit connectionChangedState(server, state); + + int identityId = server->getIdentity()->id(); + + if (state == Konversation::SSConnected) + { + if (!m_activeIdentities.contains(identityId)) + { + m_activeIdentities.append(identityId); + + emit identityOnline(identityId); + } + } + else if (state != Konversation::SSConnecting) + { + if (m_activeIdentities.contains(identityId)) + { + m_activeIdentities.remove(identityId); + + emit identityOffline(identityId); + } + } + + if (state == Konversation::SSInvoluntarilyDisconnected) + { + // The asynchronous invocation of handleReconnect() makes sure that + // connectionChangedState() is emitted and delivered before it runs + // (and causes the next connection state change to occur). + emit requestReconnect(server); + } +} + +void ConnectionManager::handleReconnect(Server* server) +{ + if (!Preferences::autoReconnect()) return; + + ConnectionSettings settings = server->getConnectionSettings(); + + uint reconnectCount = Preferences::reconnectCount(); + + // For server groups, one iteration over their server list shall count as one + // connection attempt. + if (settings.serverGroup()) + reconnectCount = reconnectCount * settings.serverGroup()->serverList().size(); + + if (reconnectCount == 0 || settings.reconnectCount() < reconnectCount) + { + if (settings.serverGroup() && settings.serverGroup()->serverList().size() > 1) + { + Konversation::ServerList serverList = settings.serverGroup()->serverList(); + + int index = serverList.findIndex(settings.server()); + int size = serverList.size(); + + if (index == size - 1 || index == -1) + settings.setServer(serverList[0]); + else if (index < size - 1) + settings.setServer(serverList[index+1]); + + server->setConnectionSettings(settings); + + server->getStatusView()->appendServerMessage(i18n("Info"), + i18n("Trying to connect to %1 in %2 seconds.") + .arg(settings.server().host()) + .arg(Preferences::reconnectDelay())); + } + else + { + server->getStatusView()->appendServerMessage(i18n("Info"), + i18n("Trying to reconnect to %1 in %2 seconds.") + .arg(settings.server().host()) + .arg(Preferences::reconnectDelay())); + } + + server->getConnectionSettings().incrementReconnectCount(); + + QTimer::singleShot(Preferences::reconnectDelay() * 1000, server, SLOT(connectToIRCServer())); + } + else + server->getStatusView()->appendServerMessage(i18n("Error"), i18n("Reconnection attempts exceeded.")); +} + +void ConnectionManager::quitServers() +{ + QMap::ConstIterator it; + + for (it = m_connectionList.begin(); it != m_connectionList.end(); ++it) + it.data()->quitServer(); +} + +void ConnectionManager::decodeIrcUrl(const QString& url, ConnectionSettings& settings) +{ + if (!url.startsWith("irc://")) return; + + QString mangledUrl = url; + + mangledUrl.remove(QRegExp("^irc:/+")); + + if (mangledUrl.isEmpty()) return; + + // Parsing address and channel. + QStringList mangledUrlSegments; + + mangledUrlSegments = QStringList::split('/', mangledUrl, false); + + // Check for ",isserver". + if (mangledUrlSegments[0].contains(',')) + { + QStringList addressSegments; + bool checkIfServerGroup = true; + + addressSegments = QStringList::split(',', mangledUrlSegments[0], false); + + if (addressSegments.grep("isserver", false).size() > 0) + checkIfServerGroup = false; + + decodeAddress(addressSegments[0], settings, checkIfServerGroup); + } + else + decodeAddress(mangledUrlSegments[0], settings); + + QString channel; + Konversation::ChannelSettings channelSettings; + + // Grabbing channel from in front of potential ?key=value parameters. + if (mangledUrlSegments.size() > 1) + channel = mangledUrlSegments[1].section('?', 0, 0); + + if (!channel.isEmpty()) + { + // Add default prefix to channel if necessary. + if (!channel.contains(QRegExp("^[#+&]{1}"))) + channel = '#' + channel; + + channelSettings.setName(channel); + } + + // Parsing ?key=value parameters. + QString parameterString; + + if (mangledUrlSegments.size() > 1) + parameterString = mangledUrlSegments[1].section('?', 1); + + if (parameterString.isEmpty() && mangledUrlSegments.size() > 2) + parameterString = mangledUrlSegments[2]; + + if (!parameterString.isEmpty()) + { + QRegExp parameterCatcher; + + parameterCatcher.setPattern("pass=([^&]+)"); + + if (parameterCatcher.search(parameterString) != -1) + { + Konversation::ServerSettings server = settings.server(); + + server.setPassword(parameterCatcher.cap(1)); + + settings.setServer(server); + } + + parameterCatcher.setPattern("key=([^&]+)"); + + if (parameterCatcher.search(parameterString) != -1) + channelSettings.setPassword(parameterCatcher.cap(1)); + } + + // Assigning channel. + if (!channelSettings.name().isEmpty()) + settings.setInitialChannel(channelSettings); +} + +void ConnectionManager::decodeAddress(const QString& address, ConnectionSettings& settings, + bool checkIfServerGroup) +{ + QString host; + QString port = "6667"; + + // Full-length IPv6 address with port + // Example: RFC 2732 notation: [2001:0DB8:0000:0000:0000:0000:1428:57ab]:6666 + // Example: Non-RFC 2732 notation: 2001:0DB8:0000:0000:0000:0000:1428:57ab:6666 + if (address.contains(':')==8) + { + host = address.section(':',0,-2).remove("[").remove("]"); + port = address.section(':',-1); + } + // Full-length IPv6 address without port or not-full-length IPv6 address with port + // Example: Without port, RFC 2732 notation: [2001:0DB8:0000:0000:0000:0000:1428:57ab] + // Example: Without port, Non-RFC 2732 notation: 2001:0DB8:0000:0000:0000:0000:1428:57ab + // Example: With port, RFC 2732 notation: [2001:0DB8::1428:57ab]:6666 + else if (address.contains(':')>=4) + { + // Last segment does not end with ], but the next to last does; + // Assume not-full-length IPv6 address with port + // Example: [2001:0DB8::1428:57ab]:6666 + if (address.section(':',0,-2).endsWith("]") && !address.section(':',-1).endsWith("]")) + { + host = address.section(':',0,-2).remove("[").remove("]"); + port = address.section(':',-1); + } + else + { + QString addressCopy = address; + host = addressCopy.remove("[").remove("]"); + } + } + // IPv4 address or ordinary hostname with port + // Example: IPv4 address with port: 123.123.123.123:6666 + // Example: Hostname with port: irc.bla.org:6666 + else if (address.contains(':')==1) + { + host = address.section(':',0,-2); + port = address.section(':',-1); + } + else + host = address; + + // Try to assign server group. + if (checkIfServerGroup && Preferences::isServerGroup(host)) + { + // If host is found to be the name of a server group. + + int serverGroupId = Preferences::serverGroupIdByName(host); + + Konversation::ServerGroupSettingsPtr serverGroup; + + serverGroup = Preferences::serverGroupById(serverGroupId); + + settings.setServerGroup(serverGroup); + + if (serverGroup->serverList().size() > 0) + settings.setServer(serverGroup->serverList()[0]); + } + else + { + if (Preferences::serverGroupByServer(host)) + { + // If the host is found to be part of a server group's server list. + + Konversation::ServerGroupSettingsPtr serverGroup; + + serverGroup = Preferences::serverGroupByServer(host); + + settings.setServerGroup(serverGroup); + } + + Konversation::ServerSettings server; + + server.setHost(host); + server.setPort(port.toInt()); + + settings.setServer(server); + } +} + +bool ConnectionManager::reuseExistingConnection(ConnectionSettings& settings, bool interactive) +{ + Server* dupe = 0; + ConnectionDupe dupeType; + bool doReuse = true; + + KonversationApplication* konvApp = static_cast(kapp); + KonversationMainWindow* mainWindow = konvApp->getMainWindow(); + + QMap::ConstIterator it; + + for (it = m_connectionList.begin(); it != m_connectionList.end(); ++it) + { + if (it.data()->getServerGroup() && settings.serverGroup() + && it.data()->getServerGroup() == settings.serverGroup()) + { + dupe = it.data(); + dupeType = SameServerGroup; + + break; + } + } + + if (!dupe) + { + for (it = m_connectionList.begin(); it != m_connectionList.end(); ++it) + { + if (it.data()->getConnectionSettings().server() == settings.server()) + { + dupe = it.data(); + dupeType = SameServer; + + break; + } + } + } + + if (dupe && interactive) + { + int result = KMessageBox::warningContinueCancel( + mainWindow, + i18n("You are already connected to %1. Do you want to open another connection?") + .arg(dupe->getDisplayName()), + i18n("Already connected to %1").arg(dupe->getDisplayName()), + i18n("Create connection"), + "ReuseExistingConnection"); + + if (result == KMessageBox::Continue) doReuse = false; + } + + if (dupe && doReuse) + { + if (interactive && dupeType == SameServerGroup + && !(dupe->getConnectionSettings().server() == settings.server())) + { + int result = KMessageBox::warningContinueCancel( + mainWindow, + i18n("You are presently connected to %1 via '%2' (port %3). Do you want to switch to '%4' (port %5) instead?") + .arg(dupe->getDisplayName()) + .arg(dupe->getServerName()) + .arg(dupe->getPort()) + .arg(settings.server().host()) + .arg(settings.server().port()), + i18n("Already connected to %1").arg(dupe->getDisplayName()), + i18n("Switch Server"), + "ReconnectWithDifferentServer"); + + if (result == KMessageBox::Continue) + { + dupe->disconnect(); + + dupe->setConnectionSettings(settings); + } + } + + if (!dupe->isConnected()) + { + if (!settings.initialChannel().name().isEmpty()) + dupe->updateAutoJoin(settings.initialChannel()); + + if (!dupe->isConnecting()) + dupe->reconnect(); + } + else + { + if (!settings.initialChannel().name().isEmpty()) + { + dupe->sendJoinCommand(settings.initialChannel().name(), + settings.initialChannel().password()); + } + } + } + + return (dupe && doReuse); +} + +bool ConnectionManager::validateIdentity(IdentityPtr identity, bool interactive) +{ + KonversationApplication* konvApp = static_cast(kapp); + KonversationMainWindow* mainWindow = konvApp->getMainWindow(); + + QString errors; + + if (identity->getIdent().isEmpty()) + errors+=i18n("Please fill in your Ident.
"); + + if (identity->getRealName().isEmpty()) + errors+=i18n("Please fill in your Real name.
"); + + if (identity->getNickname(0).isEmpty()) + errors+=i18n("Please provide at least one Nickname.
"); + + if (!errors.isEmpty()) + { + if (interactive) + { + int result = KMessageBox::warningContinueCancel(mainWindow, + i18n("Your identity \"%1\" is not set up correctly:
%2") + .arg(identity->getName()).arg(errors), + i18n("Identity Settings"), + i18n("Edit Identity...")); + + if (result == KMessageBox::Continue) + { + identity = mainWindow->editIdentity(identity); + + if (identity && validateIdentity(identity, false)) + return true; + else + return false; + } + else + return false; + } + + return false; + } + + return true; +} + +QPtrList ConnectionManager::getServerList() +{ + QPtrList serverList; + + QMap::ConstIterator it; + + for (it = m_connectionList.begin(); it != m_connectionList.end(); ++it) + serverList.append(it.data()); + + return serverList; +} + +Server* ConnectionManager::getServerByConnectionId(int connectionId) +{ + if (m_connectionList.contains(connectionId)) + return m_connectionList[connectionId]; + else + return 0; +} + +Server* ConnectionManager::getServerByName(const QString& name) +{ + QMap::ConstIterator it; + + for (it = m_connectionList.begin(); it != m_connectionList.end(); ++it) + { + if (it.data()->getDisplayName() == name || it.data()->getServerName() == name) + return it.data(); + } + + return 0; +} + +Server* ConnectionManager::getAnyServer() +{ + if ( m_connectionList.count() > 0) + return m_connectionList[0]; + + return 0; +} + +#include "connectionmanager.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/connectionmanager.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/connectionmanager.h --- konversation-1.0.1/konversation/src/connectionmanager.h 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/connectionmanager.h 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,95 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + Copyright (C) 2008 Eike Hein +*/ + +#ifndef CONNECTIONMANAGER_H +#define CONNECTIONMANAGER_H + +#include "server.h" +#include "identity.h" + +#include + + +class ConnectionSettings; + +class ConnectionManager : public QObject +{ + Q_OBJECT + + public: + explicit ConnectionManager(QObject* parent = 0); + ~ConnectionManager(); + + uint connectionCount() const { return m_connectionList.count(); } + + QPtrList getServerList(); + + Server* getServerByConnectionId(int connectionId); + Server* getServerByName(const QString& name); + Server* getAnyServer(); + + void quitServers(); + void toggleGlobalAway(); + + + public slots: + void connectTo(Konversation::ConnectionFlag flag, + const QString& target, + const QString& port = "", + const QString& password = "", + const QString& nick = "", + const QString& channel = "", + bool useSSL = false); + + void connectTo(Konversation::ConnectionFlag flag, int serverGroupId); + void connectTo(Konversation::ConnectionFlag flag, ConnectionSettings& settings); + + + signals: + void connectionChangedState(Server* server, Konversation::ConnectionState state); + + void connectionChangedAwayState(bool away); + + void requestReconnect(Server* server); + + void identityOnline(int identityId); + void identityOffline(int identityId); + + void closeServerList(); + + + private slots: + void delistConnection(int connectionId); + + void handleConnectionStateChange(Server* server, Konversation::ConnectionState state); + + void handleReconnect(Server* server); + + + private: + void enlistConnection(int connectionId, Server* server); + + void decodeIrcUrl(const QString& url, ConnectionSettings& settings); + + void decodeAddress(const QString& address, + ConnectionSettings& settings, + bool checkIfServerGroup = true); + + bool reuseExistingConnection(ConnectionSettings& settings, bool interactive); + bool validateIdentity(IdentityPtr identity, bool interactive = true); + + QMap m_connectionList; + QValueList m_activeIdentities; + + enum ConnectionDupe { SameServer, SameServerGroup }; +}; + +#endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/connectionsettings.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/connectionsettings.cpp --- konversation-1.0.1/konversation/src/connectionsettings.cpp 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/connectionsettings.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,55 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + Copyright (C) 2008 Eike Hein +*/ + +#include "connectionsettings.h" +#include "config/preferences.h" + + +ConnectionSettings::ConnectionSettings() +{ + m_reconnectCount = 0; +} + +ConnectionSettings::~ConnectionSettings() +{ +} + +bool ConnectionSettings::isValid() +{ + if (m_server.host().isEmpty()) return false; + + return true; +} + +QString ConnectionSettings::name() const +{ + if (m_serverGroup) + return m_serverGroup->name(); + else + return m_server.host(); +} + +IdentityPtr ConnectionSettings::identity() const +{ + if (m_serverGroup) + return m_serverGroup->identity(); + + return Preferences::identityById(0); +} + +QString ConnectionSettings::initialNick() const +{ + if (!m_initialNick.isEmpty()) + return m_initialNick; + + return identity()->getNickname(0); +} + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/connectionsettings.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/connectionsettings.h --- konversation-1.0.1/konversation/src/connectionsettings.h 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/connectionsettings.h 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,61 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + Copyright (C) 2008 Eike Hein +*/ + +#ifndef CONNECTIONSETTINGS_H +#define CONNECTIONSETTINGS_H + +#include "servergroupsettings.h" +#include "serversettings.h" + +#include + + +class ConnectionSettings +{ + public: + explicit ConnectionSettings(); + ~ConnectionSettings(); + + bool isValid(); + + QString name() const; + + Konversation::ServerSettings server() const { return m_server; } + void setServer(Konversation::ServerSettings server) { m_server = server; } + + Konversation::ServerGroupSettingsPtr serverGroup() const { return m_serverGroup; } + void setServerGroup(Konversation::ServerGroupSettingsPtr serverGroup) { m_serverGroup = serverGroup; } + + IdentityPtr identity() const; + + QString initialNick() const; + void setInitialNick(const QString& nick) { m_initialNick = nick; } + + Konversation::ChannelSettings initialChannel() const { return m_initialChannel; } + void setInitialChannel(Konversation::ChannelSettings& channel) { m_initialChannel = channel; } + + uint reconnectCount() const { return m_reconnectCount; } + void incrementReconnectCount() { m_reconnectCount++; } + void setReconnectCount(uint count) { m_reconnectCount = count; } + + + private: + Konversation::ServerSettings m_server; + Konversation::ServerGroupSettingsPtr m_serverGroup; + + QString m_initialNick; + Konversation::ChannelSettings m_initialChannel; + + uint m_reconnectCount; +}; + + +#endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dccchat.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dccchat.cpp --- konversation-1.0.1/konversation/src/dccchat.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dccchat.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,12 +6,23 @@ */ /* - The class that controls dcc chats - begin: Sun Nov 16 2003 - copyright: (C) 2002 by Dario Abatianni - email: eisfuchs@tigress.com + Copyright (C) 2002 Dario Abatianni + Copyright (C) 2006 Eike Hein + Copyright (C) 2004,2007 Shintaro Matsuoka */ +#include "dccchat.h" +#include "dcccommon.h" +#include "konversationapplication.h" +#include "konversationmainwindow.h" +#include "irccharsets.h" +#include "ircview.h" +#include "ircviewbox.h" +#include "ircinput.h" +#include "topiclabel.h" +#include "server.h" +#include "channel.h" + #include #include #include @@ -31,38 +42,26 @@ #include #include -#include "konversationapplication.h" -#include "konversationmainwindow.h" -#include "irccharsets.h" -#include "ircview.h" -#include "ircviewbox.h" -#include "ircinput.h" -#include "dccchat.h" -#include "topiclabel.h" - #define DCCCHAT_BUFFER_SIZE 1024 -DccChat::DccChat(QWidget* parent, const QString& myNickname,const QString& nickname,const QStringList& parameters,bool listen) -: ChatWindow(parent) + +DccChat::DccChat(QWidget* parent, bool listen, Server* server, const QString& ownNick, const QString& partnerNick, const QString& partnerHost, int partnerPort) + : ChatWindow(parent) { kdDebug() << "DccChat::DccChat() [BEGIN]" << endl; - m_dccSocket=0; - m_listenSocket=0; - m_port=0; - m_initialShow = true; - m_myNick=myNickname; - m_partnerNick=nickname; + m_dccSocket = 0; + m_listenSocket = 0; + + m_ownNick = ownNick; + + m_partnerNick = partnerNick; + m_partnerHost = partnerHost; + m_partnerPort = partnerPort; setType(ChatWindow::DccChat); setChannelEncodingSupported(true); - if (!listen) - { - host=parameters[1]; - m_port=parameters[2].toInt(); - } - m_headerSplitter = new QSplitter(Qt::Vertical, this); m_sourceLine = new Konversation::TopicLabel(m_headerSplitter); @@ -96,14 +95,18 @@ connect( getTextView(), SIGNAL( textPasted(bool) ), m_dccChatInput, SLOT( paste(bool) ) ); connect( getTextView(), SIGNAL( gotFocus() ), m_dccChatInput, SLOT( setFocus() ) ); - connect( getTextView(), SIGNAL( updateTabNotification(Konversation::TabNotifyType)), - this, SLOT( activateTabNotification( Konversation::TabNotifyType ) ) ); connect( getTextView(), SIGNAL( autoText(const QString&) ), this, SLOT( sendDccChatText( const QString& ) ) ); if (listen) + { listenForPartner(); + QString ownNumericalIp = DccCommon::textIpToNumericalIp( DccCommon::getOwnIp( server ) ); + server->requestDccChat( m_partnerNick, ownNumericalIp, QString::number( m_ownPort ) ); + } else + { connectToPartner(); + } kdDebug() << "DccChat::DccChat() [END]" << endl; @@ -124,51 +127,25 @@ kdDebug() << "DccChat::listenForPartner() [BEGIN]" << endl; // Set up server socket - m_listenSocket = new KNetwork::KServerSocket( this ); - m_listenSocket->setFamily(KNetwork::KResolver::InetFamily); - - // user specifies ports - if(Preferences::dccSpecificChatPorts()) - { - // set port - bool found = false; // wether succeeded to set port - unsigned long port = Preferences::dccChatPortsFirst(); - for( ; port <= Preferences::dccChatPortsLast() ; ++port ) - { - kdDebug() << "DccChat::listenForPartner(): trying port " << port << endl; - m_listenSocket->setAddress(QString::number(port)); - bool success = m_listenSocket->listen(); - if( found = ( success && m_listenSocket->error() == KNetwork::KSocketBase::NoError ) ) - break; - m_listenSocket->close(); - } - if(!found) - { - KMessageBox::sorry(this, i18n("There is no vacant port for DCC Chat.")); - return; - } - } - else // user doesn't specify ports + QString failedReason; + if ( Preferences::dccSpecificChatPorts() ) + m_listenSocket = DccCommon::createServerSocketAndListen( this, &failedReason, Preferences::dccChatPortsFirst(), Preferences::dccChatPortsLast() ); + else + m_listenSocket = DccCommon::createServerSocketAndListen( this, &failedReason ); + if ( !m_listenSocket ) { - // Let the operating system choose a port - m_listenSocket->setAddress("0"); - if(!m_listenSocket->listen()) - { - kdDebug() << this << "DccChat::listenForPartner(): listen() failed!" << endl; - return; - } + getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Could not open a socket for listening: %1" ).arg( failedReason ) ); + return; } connect( m_listenSocket, SIGNAL(readyAccept()), this, SLOT(heardPartner()) ); // Get our own port number - const KNetwork::KSocketAddress ipAddr = m_listenSocket->localAddress(); - const struct sockaddr_in* socketAddress = (sockaddr_in*)ipAddr.address(); - m_port = ntohs( socketAddress->sin_port ); - kdDebug() << "DccChat::listenForPartner(): using port " << m_port << endl; + m_ownPort = DccCommon::getServerSocketPort( m_listenSocket ); + kdDebug() << "DccChat::listenForPartner(): using port " << m_ownPort << endl; - getTextView()->appendServerMessage( i18n("DCC"), i18n("Offering DCC Chat connection to %1 on port %2...").arg( m_partnerNick ).arg( m_port ) ); - m_sourceLine->setText(i18n( "DCC chat with %1 on port %2." ).arg( m_partnerNick ).arg( m_port ) ); + getTextView()->appendServerMessage( i18n("DCC"), i18n("Offering DCC Chat connection to %1 on port %2...").arg( m_partnerNick ).arg( m_ownPort ) ); + m_sourceLine->setText(i18n( "DCC chat with %1 on port %2." ).arg( m_partnerNick ).arg( m_ownPort ) ); kdDebug() << "DccChat::listenForPartner() [END]" << endl; } @@ -176,15 +153,15 @@ { QHostAddress ip; - ip.setAddress(host.toUInt()); - host=ip.toString(); + ip.setAddress(m_partnerHost.toUInt()); + m_partnerHost=ip.toString(); getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "%1 = nickname, %2 = IP, %3 = port", - "Establishing DCC Chat connection to %1 (%2:%3)..." ).arg( m_partnerNick ).arg( host ).arg( m_port ) ); + "Establishing DCC Chat connection to %1 (%2:%3)..." ).arg( m_partnerNick ).arg( m_partnerHost ).arg( m_partnerPort ) ); - m_sourceLine->setText( i18n( "%1 = nickname, %2 = IP, %3 = port", "DCC chat with %1 on %2:%3." ).arg( m_partnerNick ).arg( host ).arg( m_port ) ); + m_sourceLine->setText( i18n( "%1 = nickname, %2 = IP, %3 = port", "DCC chat with %1 on %2:%3." ).arg( m_partnerNick ).arg( host ).arg( m_partnerPort ) ); - m_dccSocket = new KNetwork::KStreamSocket( host, QString::number( m_port ), this ); + m_dccSocket = new KNetwork::KStreamSocket( m_partnerHost, QString::number( m_partnerPort ), this ); m_dccSocket->setBlocking(false); m_dccSocket->setFamily(KNetwork::KResolver::InetFamily); @@ -262,7 +239,7 @@ QString ctcpArgument = ctcp.section( " ", 1 ); if( ctcpCommand.lower() == "action" ) - getTextView()->appendAction( m_partnerNick, ctcpArgument ); + appendAction( m_partnerNick, ctcpArgument ); else getTextView()->appendServerMessage( i18n( "CTCP" ), i18n( "Received unknown CTCP-%1 request from %2" ).arg( ctcp ).arg( m_partnerNick ) ); } @@ -278,7 +255,7 @@ void DccChat::dccChatTextEntered() { QString line = m_dccChatInput->text(); - m_dccChatInput->clear(); + m_dccChatInput->setText(""); if ( line.lower() == Preferences::commandChar()+"clear" ) { textView->clear(); @@ -314,12 +291,19 @@ // line=filter.parse(nick,line,getName()); // convert /me actions - if(line.lower().startsWith(cc+"me ")) + QString cmd=line.section(' ', 0,0).lower(); + if (cmd == cc+"me") { - getTextView()->appendAction( m_myNick, line.section( " ", 1 ) ); + appendAction( m_ownNick, line.section( " ", 1 ) ); line=QString("\x01%1 %2\x01").arg("ACTION").arg(line.section(" ",1)); } - else getTextView()->append( m_myNick, line ); + else if (cmd == cc+"close") + { + closeYourself(false); + return; + } + else + getTextView()->append( m_ownNick, line ); stream << line << endl; } // endfor @@ -382,9 +366,9 @@ return true; } -int DccChat::getPort() +int DccChat::getOwnPort() { - return m_port; + return m_ownPort; } QString DccChat::getTextInLine() @@ -392,14 +376,25 @@ return m_dccChatInput->text(); } -void DccChat::appendInputText( const QString& s ) +void DccChat::appendInputText( const QString& s, bool fromCursor ) { - m_dccChatInput->setText( m_dccChatInput->text() + s ); + if(!fromCursor) + { + m_dccChatInput->append(s); + } + else + { + int para = 0, index = 0; + m_dccChatInput->getCursorPosition(¶, &index); + m_dccChatInput->insertAt(s, para, index); + m_dccChatInput->setCursorPosition(para, index + s.length()); + } } -bool DccChat::closeYourself() +//FIXME uh... where is the confimation for this? +bool DccChat::closeYourself(bool) { - delete this; + deleteLater(); return true; } @@ -458,7 +453,7 @@ else { getTextView()->setViewBackground(Preferences::color(Preferences::TextViewBackground), - QString::null); + QString()); } if (Preferences::customTextFont()) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dccchat.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dccchat.h --- konversation-1.0.1/konversation/src/dccchat.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dccchat.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,10 +6,8 @@ */ /* - The class that controls dcc chats - begin: Sun Nov 16 2003 - copyright: (C) 2002 by Dario Abatianni - email: eisfuchs@tigress.com + Copyright (C) 2002 Dario Abatianni + Copyright (C) 2006 Eike Hein */ #ifndef DCCCHAT_H @@ -17,9 +15,8 @@ #include "chatwindow.h" -/* - @author Dario Abatianni -*/ + +class QSplitter; class IRCInput; class KLineEdit; @@ -41,15 +38,15 @@ Q_OBJECT public: - DccChat(QWidget* parent, const QString& myNickname,const QString& nickname,const QStringList& parameters,bool listen); + DccChat(QWidget* parent, bool listen, Server* server, const QString& ownNick, const QString& partnerNick, const QString& partnerHost = QString(), int partnerPort = 0); ~DccChat(); virtual QString getTextInLine(); - virtual bool closeYourself(); + virtual bool closeYourself(bool askForConfirmation=true); virtual bool canBeFrontView(); virtual bool searchView(); - int getPort(); + int getOwnPort(); virtual void setChannelEncoding(const QString& encoding); virtual QString getChannelEncoding(); @@ -57,10 +54,10 @@ virtual bool isInsertSupported() { return true; } - QString getMyNick() { return m_myNick; } + QString getOwnNick() { return m_ownNick; } public slots: - void appendInputText(const QString& s); + void appendInputText(const QString& s, bool fromCursor); void updateAppearance(); protected slots: @@ -83,12 +80,14 @@ /** Called from ChatWindow adjustFocus */ virtual void childAdjustFocus(); - QString m_myNick; + QString m_ownNick; QString m_partnerNick; + QString m_partnerHost; + int m_partnerPort; QString host; //QString m_ip; - int m_port; + int m_ownPort; QSplitter* m_headerSplitter; Konversation::TopicLabel* m_sourceLine; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcccommon.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcccommon.cpp --- konversation-1.0.1/konversation/src/dcccommon.cpp 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/dcccommon.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,118 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + Copyright (C) 2007 Shintaro Matsuoka +*/ + +#include "dcccommon.h" +#include "channel.h" +#include "preferences.h" +#include "server.h" + +#include + +#include + +#include +#include +#include + + +QString DccCommon::textIpToNumericalIp( const QString& ipString ) +{ + QHostAddress ip; + ip.setAddress( ipString ); + + return QString::number( ip.ip4Addr() ); +} + +QString DccCommon::numericalIpToTextIp( const QString& numericalIp ) +{ + QHostAddress ip; + ip.setAddress( numericalIp.toULong() ); + + return ip.toString(); +} + +QString DccCommon::getOwnIp( Server* server ) +{ + QString ownIp; + int methodId = Preferences::dccMethodToGetOwnIp(); + + if ( methodId == 1 && server ) + { + // by the WELCOME message or the USERHOST message from the server + ownIp = server->getOwnIpByServerMessage(); + } + else if ( methodId == 2 && !Preferences::dccSpecificOwnIp().isEmpty() ) + { + // manual + KNetwork::KResolverResults res = KNetwork::KResolver::resolve(Preferences::dccSpecificOwnIp(), ""); + if(res.error() == KResolver::NoError && res.size() > 0) + { + ownIp = res.first().address().nodeName(); + } + } + + // fallback or methodId == 3 (network interface) + if ( ownIp.isEmpty() && server ) + { + ownIp = server->getOwnIpByNetworkInterface(); + } + + kdDebug() << "DccCommon::getOwnIp(): " << ownIp << endl; + return ownIp; +} + +KNetwork::KServerSocket* DccCommon::createServerSocketAndListen( QObject* parent, QString* failedReason, int minPort, int maxPort ) +{ + KNetwork::KServerSocket* socket = new KNetwork::KServerSocket( parent ); + socket->setFamily( KNetwork::KResolver::InetFamily ); + + if ( minPort > 0 && maxPort >= minPort ) // ports are configured manually + { + // set port + bool found = false; // whether succeeded to set port + for ( int port = minPort; port <= maxPort ; ++port ) + { + socket->setAddress( QString::number( port ) ); + bool success = socket->listen(); + if ( ( found = ( success && socket->error() == KNetwork::KSocketBase::NoError ) ) ) + break; + socket->close(); + } + if ( !found ) + { + if ( failedReason ) + *failedReason = i18n( "No vacant port" ); + delete socket; + return 0; + } + } + else + { + // Let the operating system choose a port + socket->setAddress( "0" ); + if ( !socket->listen() ) + { + if ( failedReason ) + *failedReason = i18n( "Could not open a socket" ); + delete socket; + return 0; + } + } + + return socket; +} + +int DccCommon::getServerSocketPort( KNetwork::KServerSocket* serverSocket ) +{ + KNetwork::KSocketAddress ipAddr = serverSocket->localAddress(); + const struct sockaddr_in* socketAddress = (sockaddr_in*)ipAddr.address(); + return ntohs( socketAddress->sin_port ); +} diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcccommon.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcccommon.h --- konversation-1.0.1/konversation/src/dcccommon.h 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/dcccommon.h 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,48 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + Copyright (C) 2007 Shintaro Matsuoka +*/ + +#ifndef DCCCOMMON_H +#define DCCCOMMON_H + +#include + +class QObject; + +namespace KNetwork +{ + class KServerSocket; +} + +class Server; + +class DccCommon +{ + public: + // converts an IP text like "127.0.0.1" to a number. + static QString textIpToNumericalIp( const QString& ipString ); + + // converts a numerical IP text like "12345678" to a normal IP text. + static QString numericalIpToTextIp( const QString& numericalIp ); + + // returns the self IP following the setting. + static QString getOwnIp( Server* server = 0 ); + + // creates an instance of KNetwork::ServerSocket following the DCC settings + static KNetwork::KServerSocket* createServerSocketAndListen( QObject* parent = 0, QString* failedReason = 0, int minPort = 0, int maxPort = 0 ); + + // returns the port number from a server socket + static int getServerSocketPort( KNetwork::KServerSocket* serverSocket ); + + private: + DccCommon(); +}; + +#endif // DCCCOMMON_H diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dccdetaildialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dccdetaildialog.cpp --- konversation-1.0.1/konversation/src/dccdetaildialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dccdetaildialog.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,313 +0,0 @@ -// Copyright (C) 2004 Shintaro Matsuoka - -/* - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. -*/ - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "dccdetaildialog.h" -#include "dcctransfer.h" -#include "dcctransferrecv.h" - -DccDetailDialog::DccDetailDialog( DccTransfer* item ) -: KDialog( 0 ), m_item( item ) -{ - QVBoxLayout* baseLayout = new QVBoxLayout( this ); - baseLayout->setMargin( marginHint() ); - baseLayout->setSpacing( spacingHint() ); - - // information - - QFrame* infoFrame = new QFrame( this ); - QGridLayout* infoLayout = new QGridLayout( infoFrame, 1, 2 ); - infoLayout->setSpacing( spacingHint() ); - - // Filename - QLabel* fileNameHeader = new QLabel( i18n("File:"), infoFrame ); - fileNameHeader->setAlignment( AlignHCenter | AlignVCenter ); - KLineEdit* fileName = new KLineEdit( m_item->m_fileName, infoFrame ); - fileName->setFocusPolicy( ClickFocus ); - fileName->setReadOnly( true ); - fileName->setFrame( false ); - fileName->setAlignment( AlignHCenter ); - - // Local File URL - QLabel* localFileURLHeader = new QLabel( infoFrame ); - localFileURLHeader->setAlignment( AlignHCenter | AlignVCenter ); - if ( m_item->m_dccType == DccTransfer::Send ) - localFileURLHeader->setText( i18n("Local Path:") ); - else - localFileURLHeader->setText( i18n("Saved to:") ); - QHBox* localFileURLBox = new QHBox( infoFrame ); - localFileURLBox->setSpacing( spacingHint() ); - m_localFileURL = new KURLRequester( m_item->getFileURL().prettyURL(), localFileURLBox ); - connect( m_localFileURL, SIGNAL( textChanged( const QString& ) ), this, SLOT( slotLocalFileURLChanged( const QString& ) ) ); - m_buttonOpenFile = new KPushButton( KGlobal::iconLoader()->loadIconSet( "exec", KIcon::Small ), QString::null, localFileURLBox ); - m_buttonOpenFile->setFixedSize( m_localFileURL->button()->size() ); - connect( m_buttonOpenFile, SIGNAL( clicked() ), this, SLOT( slotOpenFile() ) ); - m_buttonRemoveFile = new KPushButton( KGlobal::iconLoader()->loadIconSet( "edittrash", KIcon::Small ), QString::null, localFileURLBox ); - m_buttonRemoveFile->setFixedSize( m_localFileURL->button()->size() ); - connect( m_buttonRemoveFile, SIGNAL( clicked() ), this, SLOT( slotRemoveFile() ) ); - - //QToolTip::add( m_localFileURL, i18n( "Change the download destination" ) ); - QToolTip::add( m_buttonOpenFile, i18n( "Open this file" ) ); - QToolTip::add( m_buttonRemoveFile, i18n( "Delete this file" ) ); - - // Partner - QLabel* partnerHeader = new QLabel( infoFrame ); - partnerHeader->setAlignment( AlignHCenter | AlignVCenter ); - if ( m_item->m_dccType == DccTransfer::Send ) - partnerHeader->setText( i18n("Receiver:") ); - else - partnerHeader->setText( i18n("Sender:") ); - m_partner = new KLineEdit( infoFrame ); - m_partner->setFocusPolicy( ClickFocus ); - m_partner->setReadOnly( true ); - m_partner->setFrame( false ); - m_partner->setAlignment( AlignHCenter ); - - // Self - QLabel* selfHeader = 0; - m_self = 0; - if ( m_item->m_dccType == DccTransfer::Send ) - { - selfHeader = new QLabel( i18n("Self:"), infoFrame ); - selfHeader->setAlignment( AlignHCenter | AlignVCenter ); - m_self = new KLineEdit( infoFrame ); - m_self->setFocusPolicy( ClickFocus ); - m_self->setReadOnly( true ); - m_self->setFrame( false ); - m_self->setAlignment( AlignHCenter ); - } - - // Status - QLabel* statusHeader = new QLabel( i18n("Status:"), infoFrame ); - statusHeader->setAlignment( AlignHCenter | AlignVCenter ); - m_status = new KLineEdit( infoFrame ); - m_status->setFocusPolicy( ClickFocus ); - m_status->setReadOnly( true ); - m_status->setFrame( false ); - m_status->setAlignment( AlignHCenter ); - - // Progres - QLabel* progressHeader = new QLabel( i18n("Progress:"), infoFrame ); - progressHeader->setAlignment( AlignHCenter | AlignVCenter ); - m_progress = new KProgress( 100, infoFrame ); - m_progress->setCenterIndicator( true ); - - // Position - QLabel* positionHeader = new QLabel( i18n("Position:"), infoFrame ); - positionHeader->setAlignment( AlignHCenter | AlignVCenter ); - m_position = new KLineEdit( infoFrame ); - m_position->setFocusPolicy( ClickFocus ); - m_position->setReadOnly( true ); - m_position->setFrame( false ); - m_position->setAlignment( AlignHCenter ); - - // buttons - - QFrame* buttonFrame = new QFrame( this ); - QHBoxLayout* buttonLayout = new QHBoxLayout( buttonFrame ); - buttonLayout->setSpacing( spacingHint() ); - - // Accept - m_buttonAccept = 0; - if ( m_item->m_dccType == DccTransfer::Receive ) - { - m_buttonAccept = new KPushButton( KGlobal::iconLoader()->loadIconSet( "player_play", KIcon::Small ), i18n("&Accept"), buttonFrame ); - m_buttonAccept->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); - connect( m_buttonAccept, SIGNAL( clicked() ), this, SLOT( slotAccept() ) ); - QToolTip::add( m_buttonAccept, i18n( "Accept this transfer" ) ); - } - - // Abort - m_buttonAbort = new KPushButton( KGlobal::iconLoader()->loadIconSet( "stop", KIcon::Small ), i18n("A&bort"), buttonFrame ); - m_buttonAbort->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); - connect( m_buttonAbort, SIGNAL( clicked() ), this, SLOT( slotAbort() ) ); - QToolTip::add( m_buttonAbort, i18n( "Abort this transfer" ) ); - - // Close - KPushButton* buttonClose = new KPushButton( KGlobal::iconLoader()->loadIconSet( "button_ok", KIcon::Small ), i18n("&Close"), buttonFrame ); - buttonClose->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); - connect( buttonClose, SIGNAL( clicked() ), this, SLOT( slotClose() ) ); - - // layout - - // construct layout: base - baseLayout->addWidget( infoFrame ); - baseLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding ) ); - baseLayout->addWidget( buttonFrame ); - - // construct layout: info - int row = 0; - - infoLayout->addWidget( fileNameHeader, row, 0 ); - infoLayout->addWidget( fileName, row, 1 ); - - ++row; - infoLayout->addWidget( localFileURLHeader, row, 0 ); - infoLayout->addWidget( localFileURLBox, row, 1 ); - - ++row; - infoLayout->addWidget( partnerHeader, row, 0 ); - infoLayout->addWidget( m_partner, row, 1 ); - - if ( m_self ) - { - ++row; - infoLayout->addWidget( selfHeader, row, 0 ); - infoLayout->addWidget( m_self, row, 1 ); - } - - ++row; - infoLayout->addWidget( statusHeader, row, 0 ); - infoLayout->addWidget( m_status, row, 1 ); - - ++row; - infoLayout->addWidget( progressHeader, row, 0 ); - infoLayout->addWidget( m_progress, row, 1 ); - - ++row; - infoLayout->addWidget( positionHeader, row, 0 ); - infoLayout->addWidget( m_position, row, 1 ); - - // construct layout: buttons - if ( m_buttonAccept ) - buttonLayout->addWidget( m_buttonAccept ); - buttonLayout->addWidget( m_buttonAbort ); - buttonLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding ) ); - buttonLayout->addWidget( buttonClose ); - - // update - updateView(); - - // make up - adjustSize(); - resize( 450, height() ); - buttonClose->setFocus(); -} - -DccDetailDialog::~DccDetailDialog() -{ -} - -void DccDetailDialog::updateView() // public -{ - // caption - setCaption( i18n( "DCC %1: %2" ).arg( m_item->getTypeText() ).arg( m_item->m_fileName ) ); - - // information - - // Local path - m_localFileURL->setURL( m_item->getFileURL().prettyURL() ); - m_localFileURL->lineEdit()->setFocusPolicy( m_item->m_dccStatus == DccTransfer::Queued ? StrongFocus : ClickFocus ); - m_localFileURL->lineEdit()->setReadOnly( m_item->m_dccStatus != DccTransfer::Queued ); - m_localFileURL->lineEdit()->setFrame( m_item->m_dccStatus == DccTransfer::Queued ); - m_localFileURL->lineEdit()->setAlignment( m_item->m_dccStatus == DccTransfer::Queued ? AlignLeft : AlignHCenter ); - m_localFileURL->button()->setEnabled( m_item->m_dccStatus == DccTransfer::Queued ); - m_buttonOpenFile->setEnabled( m_item->m_dccType == DccTransfer::Send || m_item->m_dccStatus == DccTransfer::Done ); - m_buttonRemoveFile->setEnabled( m_item->m_dccType == DccTransfer::Receive && m_item->m_dccStatus == DccTransfer::Done ); - - // Partner - if ( !m_item->m_partnerIp.isEmpty() || !m_item->m_partnerPort.isEmpty() ) - m_partner->setText( QString( "%1 (%2:%3)" ) - .arg( m_item->m_partnerNick ) - .arg( !m_item->m_partnerIp.isEmpty() ? m_item->m_partnerIp : i18n("unknown") ) - .arg( !m_item->m_partnerPort.isEmpty() ? m_item->m_partnerPort : i18n("unknown") ) - ); - else - m_partner->setText( m_item->m_partnerNick ); - - // Self - if ( m_self ) - { - QString self; - if ( !m_item->m_ownIp.isEmpty() || !m_item->m_ownPort.isEmpty() ) - m_self->setText( QString( "%1:%2" ) - .arg( !m_item->m_ownIp.isEmpty() ? m_item->m_ownIp : QString("* ") ) - .arg( !m_item->m_ownPort.isEmpty() ? m_item->m_ownPort : i18n("unknown") ) - ); - else - m_self->setText( i18n("unknown") ); - } - - // Status - if ( m_item->m_dccStatus == DccTransfer::Sending || m_item->m_dccStatus == DccTransfer::Receiving ) - m_status->setText( m_item->getStatusText() + " ( " + m_item->getCPSPrettyText() + " )" ); - else - m_status->setText( m_item->m_dccStatusDetail.isEmpty() ? m_item->getStatusText() : m_item->getStatusText() + " (" + m_item->m_dccStatusDetail + ')' ); - - // Progress - // FIXME: in case filesize is unknown - m_progress->setProgress( m_item->getProgress() ); - - // Position - m_position->setText( m_item->getPositionPrettyText( true ) ); - - // buttons - - // Accept - if ( m_buttonAccept ) - m_buttonAccept->setEnabled( m_item->m_dccStatus == DccTransfer::Queued ); - - // Abort - m_buttonAbort->setEnabled( m_item->m_dccStatus < DccTransfer::Done ); -} - -void DccDetailDialog::slotLocalFileURLChanged( const QString& newURL ) -{ - DccTransferRecv* item = static_cast( m_item ); - if ( item ) - item->m_fileURL = KURL::fromPathOrURL( newURL ); -} - -void DccDetailDialog::slotOpenFile() -{ - m_item->runFile(); -} - -void DccDetailDialog::slotRemoveFile() -{ - int ret = KMessageBox::warningContinueCancel( this, - i18n( "Do you really want to remove the received file?" ), - i18n( "Delete Confirmation" ), - i18n( "&Delete" ), - "RemoveDCCReceivedFile", - KMessageBox::Dangerous - ); - if ( ret == KMessageBox::Continue ) - m_item->removeFile(); -} - -void DccDetailDialog::slotAccept() -{ - m_item->start(); -} - -void DccDetailDialog::slotAbort() -{ - m_item->abort(); -} - -void DccDetailDialog::slotClose() -{ - accept(); // *not* mean accepting DCC, but closing this dialog -} - -#include "dccdetaildialog.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dccdetaildialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dccdetaildialog.h --- konversation-1.0.1/konversation/src/dccdetaildialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dccdetaildialog.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -// Copyright (C) 2004 Shintaro Matsuoka - -/* - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. -*/ - -#ifndef DCCDETAILDIALOG_H -#define DCCDETAILDIALOG_H - -#include - -class KLineEdit; -class KProgress; -class KPushButton; -class KURLRequester; -class DccTransfer; - -class DccDetailDialog : public KDialog -{ - Q_OBJECT - - public: - explicit DccDetailDialog( DccTransfer* item ); - virtual ~DccDetailDialog(); - - void updateView(); - - protected slots: - void slotLocalFileURLChanged( const QString& newURL ); - void slotOpenFile(); - void slotRemoveFile(); - void slotAccept(); - void slotAbort(); - void slotClose(); - - protected: - DccTransfer* m_item; - - // UI - KPushButton* m_buttonOpenFile; - KPushButton* m_buttonRemoveFile; - KURLRequester* m_localFileURL; - KLineEdit* m_partner; - KLineEdit* m_self; - KLineEdit* m_status; - KProgress* m_progress; - KLineEdit* m_position; - - KPushButton* m_buttonAccept; - KPushButton* m_buttonAbort; -}; -#endif // DCCDETAILDIALOG_H diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dccpanel.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dccpanel.cpp --- konversation-1.0.1/konversation/src/dccpanel.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dccpanel.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,521 +0,0 @@ -/* - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. -*/ - -/* - begin: Mit Aug 7 2002 - copyright: (C) 2002 by Dario Abatianni - email: eisfuchs@tigress.com -*/ - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "dccpanel.h" -#include "dcctransfer.h" -#include "dcctransfersend.h" - -DccPanel::DccPanel(QWidget* parent) -: ChatWindow(parent) -{ - setType(ChatWindow::DccPanel); - setName(i18n("DCC Status")); - - m_listView = new KListView(this,"dcc_control_panel"); - - m_listView->setSelectionMode(QListView::Extended); - m_listView->setDragEnabled(true); - m_listView->setAcceptDrops(true); - m_listView->setSorting(-1,false); - m_listView->setAllColumnsShowFocus(true); - - for(unsigned int i=0 ; i < Column::COUNT ; ++i) - m_listView->addColumn(""); - - //m_listView->setColumnText(Column::TypeIcon, ""); - m_listView->setColumnText(Column::OfferDate, i18n("Started at")); - m_listView->setColumnText(Column::Status, i18n("Status")); - m_listView->setColumnText(Column::FileName, i18n("File")); - m_listView->setColumnText(Column::PartnerNick, i18n("Partner")); - m_listView->setColumnText(Column::Progress, i18n("Progress")); - m_listView->setColumnText(Column::Position, i18n("Position")); - m_listView->setColumnText(Column::TimeRemaining, i18n("Remaining")); - m_listView->setColumnText(Column::CPS, i18n("Speed")); - m_listView->setColumnText(Column::SenderAddress, i18n("Sender Address")); - - m_listView->setColumnWidth(Column::TypeIcon, 16); - m_listView->setColumnWidth(Column::OfferDate, 90); - m_listView->setColumnWidth(Column::Status, 80); - m_listView->setColumnWidth(Column::FileName, 150); - m_listView->setColumnWidth(Column::PartnerNick, 70); - m_listView->setColumnWidth(Column::Progress, 90); - m_listView->setColumnWidth(Column::Position, 120); - m_listView->setColumnWidth(Column::TimeRemaining, 80); - m_listView->setColumnWidth(Column::CPS, 70); - m_listView->setColumnWidth(Column::SenderAddress, 120); - - m_listView->setColumnWidthMode(Column::FileName, QListView::Manual); - - m_listView->setColumnAlignment(Column::OfferDate, AlignHCenter); - m_listView->setColumnAlignment(Column::Progress, AlignHCenter); - m_listView->setColumnAlignment(Column::Position, AlignHCenter); - m_listView->setColumnAlignment(Column::TimeRemaining, AlignHCenter); - m_listView->setColumnAlignment(Column::CPS, AlignHCenter); - - m_listView->setSorting(Column::OfferDate, false); - - connect(m_listView,SIGNAL (selectionChanged()),this,SLOT (updateButton()) ); - - // button - - QHBox* buttonsBox=new QHBox(this); - buttonsBox->setSpacing(spacing()); - - // convenience, undeffed below again to avoid name clashes - #define icon(s) KGlobal::iconLoader()->loadIconSet( s, KIcon::Small ) - - m_buttonAccept = new QPushButton(icon("player_play"), i18n("Accept"), buttonsBox, "start_dcc"); - m_buttonAbort = new QPushButton(icon("stop"), i18n("Abort"), buttonsBox, "abort_dcc"); - m_buttonClear = new QPushButton(icon("editdelete"), i18n("Clear"), buttonsBox, "clear_dcc"); - m_buttonOpen = new QPushButton(icon("exec"), i18n("Open File"), buttonsBox, "open_dcc_file"); - m_buttonRemove = new QPushButton(icon("edittrash"), i18n("Remove File"), buttonsBox, "remove_dcc_file"); - m_buttonDetail = new QPushButton(icon("view_text"), i18n("Transfer Details"), buttonsBox, "detail_dcc"); - - QToolTip::add( m_buttonAccept, i18n( "Start receiving" ) ); - QToolTip::add( m_buttonAbort, i18n( "Abort the transfer(s)" ) ); - QToolTip::add( m_buttonClear, i18n( "Remove from this panel" ) ); - QToolTip::add( m_buttonOpen, i18n( "Run the file" ) ); - QToolTip::add( m_buttonRemove, i18n( "Remove the received file(s)" ) ); - QToolTip::add( m_buttonDetail, i18n( "View DCC transfer details" ) ); - - connect( m_buttonAccept, SIGNAL(clicked()), this, SLOT(acceptDcc()) ); - connect( m_buttonAbort, SIGNAL(clicked()), this, SLOT(abortDcc()) ); - connect( m_buttonClear, SIGNAL(clicked()), this, SLOT(clearDcc()) ); - connect( m_buttonOpen, SIGNAL(clicked()), this, SLOT(runDcc()) ); - connect( m_buttonRemove, SIGNAL(clicked()), this, SLOT(removeFile()) ); - connect( m_buttonDetail, SIGNAL(clicked()), this, SLOT(openDetail()) ); - - // popup menu - - m_popup = new KPopupMenu(this); - m_popup->insertItem( i18n("&Select All Items"), Popup::SelectAll); - m_popup->insertItem( i18n("S&elect All Completed Items"), Popup::SelectAllCompleted); - m_popup->insertSeparator(); // ----- - m_popup->insertItem(icon("player_play"), i18n("&Accept"), Popup::Accept); - m_popup->insertItem(icon("stop"), i18n("A&bort"), Popup::Abort); - m_popup->insertSeparator(); // ----- - m_popup->insertItem(icon("editdelete"), i18n("&Clear"), Popup::Clear); - m_popup->insertSeparator(); // ----- - m_popup->insertItem(icon("exec"), i18n("&Open File"), Popup::Open); - m_popup->insertItem(icon("edittrash"), i18n("&Remove File"), Popup::Remove); - m_popup->insertItem(icon("messagebox_info"), i18n("File &Information"), Popup::Info); - m_popup->insertSeparator(); // ----- - m_popup->insertItem(icon("view_text"), i18n("DCC Transfer &Details"), Popup::Detail); - - #undef icon - - connect(m_listView, SIGNAL(contextMenuRequested(QListViewItem*,const QPoint&,int)), this, SLOT(popupRequested(QListViewItem*,const QPoint&,int))); - connect(m_popup, SIGNAL(activated(int)), this, SLOT(popupActivated(int))); - - // misc. - connect(m_listView, SIGNAL(doubleClicked(QListViewItem*,const QPoint&,int)), this, SLOT(doubleClicked(QListViewItem*,const QPoint&,int))); - - updateButton(); -} - -DccPanel::~DccPanel() -{ - kdDebug() << "DccPanel::~DccPanel()" << endl; -} - -void DccPanel::dccStatusChanged(const DccTransfer* /* item */) -{ - updateButton(); - activateTabNotification(Konversation::tnfSystem); -} - -void DccPanel::updateButton() -{ - bool accept = true, - abort = false, - clear = false, - detail = true, - info = true, - open = true, - remove = true, - selectAll = false, - selectAllCompleted = false; - - int selectedItems = 0; - QListViewItemIterator it( m_listView ); - - while( it.current() ) - { - DccTransfer* item = static_cast( it.current() ); - - DccTransfer::DccType type = item->getType(); - DccTransfer::DccStatus status = item->getStatus(); - - selectAll = true; - selectAllCompleted |= ( status >= DccTransfer::Done ); - - if( it.current()->isSelected() ) - { - ++selectedItems; - - accept &= ( status == DccTransfer::Queued ); - - abort |= ( status < DccTransfer::Done ); - - clear |= ( status >= DccTransfer::Done ); - - info &= ( type == DccTransfer::Send || - status == DccTransfer::Done ); - - open &= ( type == DccTransfer::Send || - status == DccTransfer::Done ); - - remove &= ( type == DccTransfer::Receive && - status == DccTransfer::Done ); - } - ++it; - } - - if( !selectedItems ) - { - accept = false; - abort = false; - clear = false; - detail = false; - info = false; - open = false; - remove = false; - } - - if (!kapp->authorize("allow_downloading")) - { - accept = false; - } - - m_buttonAccept->setEnabled( accept ); - m_buttonAbort->setEnabled( abort ); - m_buttonClear->setEnabled( clear ); - m_buttonOpen->setEnabled( open ); - m_buttonRemove->setEnabled( remove ); - m_buttonDetail->setEnabled( detail ); - - m_popup->setItemEnabled( Popup::SelectAll, selectAll ); - m_popup->setItemEnabled( Popup::SelectAllCompleted, selectAllCompleted ); - m_popup->setItemEnabled( Popup::Accept, accept ); - m_popup->setItemEnabled( Popup::Abort, abort ); - m_popup->setItemEnabled( Popup::Clear, clear ); - m_popup->setItemEnabled( Popup::Open, open ); - m_popup->setItemEnabled( Popup::Remove, remove ); - m_popup->setItemEnabled( Popup::Info, info ); - m_popup->setItemEnabled( Popup::Detail, detail ); -} - -void DccPanel::selectMe(DccTransfer* item) -{ - m_listView->clearSelection(); - m_listView->setSelected(item, true); - updateButton(); -} - -void DccPanel::acceptDcc() -{ - QListViewItemIterator it( m_listView ); - while( it.current() ) - { - if( it.current()->isSelected() ) - { - DccTransfer* item=static_cast( it.current() ); - if( item->getType() == DccTransfer::Receive && item->getStatus() == DccTransfer::Queued ) - item->start(); - } - ++it; - } -} - -void DccPanel::abortDcc() -{ - QListViewItemIterator it( m_listView ); - while( it.current() ) - { - if( it.current()->isSelected() ) - { - DccTransfer* item=static_cast( it.current() ); - if( item->getStatus() < DccTransfer::Done ) - item->abort(); - } - ++it; - } -} - -void DccPanel::clearDcc() -{ - QPtrList lst; - QListViewItemIterator it( m_listView ); - while( it.current() ) - { - DccTransfer* item = static_cast( it.current() ); - // should we check that [item] is not null? - if( it.current()->isSelected() && item->getStatus() >= DccTransfer::Done ) - lst.append( it.current() ); - ++it; - } - - // Figure out the first 'gap' in the selection and select that item, - // or, if there are no gaps, select first item below the selection - QPtrListIterator selected( lst ); - bool itemSelected = false; - while( selected.current() ) - { - if (selected.current()->itemBelow() && !lst.containsRef(selected.current()->itemBelow())) - { - m_listView->setSelected(selected.current()->itemBelow(),true); - m_listView->setCurrentItem(selected.current()->itemBelow()); - itemSelected = true; - break; - } - ++selected; - } - - // When there are neither gaps in nor items below the selection, select the first item - if (!itemSelected) - { - m_listView->setSelected(m_listView->firstChild(),true); - m_listView->setCurrentItem(m_listView->firstChild()); - } - - lst.setAutoDelete( true ); - while( lst.remove() ); - updateButton(); -} - -void DccPanel::runDcc() -{ - QListViewItemIterator it( m_listView ); - while( it.current() ) - { - if( it.current()->isSelected() ) - { - DccTransfer* item=static_cast( it.current() ); - if( item->getType() == DccTransfer::Send || item->getStatus() == DccTransfer::Done ) - item->runFile(); - } - ++it; - } -} - -void DccPanel::removeFile() -{ - // count deletable files first - int deletableFiles = 0; - QListViewItemIterator it( m_listView ); - while ( it.current() ) - { - if ( it.current()->isSelected() ) - { - DccTransfer* item = static_cast( it.current() ); - if( item->getType() == DccTransfer::Receive && item->getStatus() == DccTransfer::Done ) - ++deletableFiles; - } - ++it; - } - - int ret = KMessageBox::warningContinueCancel( this, - i18n( "Do you really want to remove the selected file?", "Do you really want to remove the selected %n files?", deletableFiles ), - i18n( "Delete Confirmation" ), - i18n( "&Delete" ), - "RemoveDCCReceivedFile", - KMessageBox::Dangerous - ); - if ( ret == KMessageBox::Continue ) - { - QListViewItemIterator it = QListViewItemIterator( m_listView ); - while( it.current() ) - { - if( it.current()->isSelected() ) - { - DccTransfer* item=static_cast( it.current() ); - if( item->getType() == DccTransfer::Receive && item->getStatus() == DccTransfer::Done ) - item->removeFile(); - } - ++it; - } - } -} - -void DccPanel::showFileInfo() -{ - QListViewItemIterator it( m_listView ); - while( it.current() ) - { - if( it.current()->isSelected() ) - { - DccTransfer* item=static_cast( it.current() ); - if( item->getType() == DccTransfer::Send || item->getStatus() == DccTransfer::Done ) - item->openFileInfoDialog(); - } - ++it; - } -} - -void DccPanel::openDetail() -{ - QListViewItemIterator it( m_listView ); - while( it.current() ) - { - if( it.current()->isSelected() ) - { - DccTransfer* item=static_cast( it.current() ); - item->openDetailDialog(); - } - ++it; - } -} - -void DccPanel::selectAll() -{ - QListViewItemIterator it( m_listView ); - while ( it.current() ) - { - m_listView->setSelected( *it, true ); - ++it; - } - updateButton(); -} - -void DccPanel::selectAllCompleted() -{ - QListViewItemIterator it( m_listView ); - while ( it.current() ) - { - DccTransfer* item=static_cast( it.current() ); - m_listView->setSelected( *it, item->getStatus() >= DccTransfer::Done ); - ++it; - } - updateButton(); -} - -void DccPanel::popupRequested(QListViewItem* /* item */, const QPoint& pos, int /* col */) // slot -{ - updateButton(); - m_popup->popup(pos); -} - -void DccPanel::popupActivated( int id ) // slot -{ - if ( id == Popup::Abort ) abortDcc(); - else if ( id == Popup::Accept ) acceptDcc(); - else if ( id == Popup::Clear ) clearDcc(); - else if ( id == Popup::Detail ) openDetail(); - else if ( id == Popup::Info ) showFileInfo(); - else if ( id == Popup::Open ) runDcc(); - else if ( id == Popup::Remove ) removeFile(); - else if ( id == Popup::SelectAll ) selectAll(); - else if ( id == Popup::SelectAllCompleted ) selectAllCompleted(); -} - -void DccPanel::doubleClicked(QListViewItem* _item, const QPoint& /* _pos */, int /* _col */) -{ - DccTransfer* item = static_cast(_item); - if(item->getType() == DccTransfer::Send || item->getStatus() == DccTransfer::Done) - new KRun( item->getFileURL() ); -} - -DccTransfer* DccPanel::getTransferByPort(const QString& port,DccTransfer::DccType type,bool resumed) -{ - int index=0; - DccTransfer* item; - do - { - // TODO: Get rid of this cast - item=static_cast(getListView()->itemAtIndex(index++)); - if(item) - { - if( (item->getStatus()==DccTransfer::Queued || item->getStatus()==DccTransfer::WaitingRemote) && - item->getType()==type && - !(resumed && !item->isResumed()) && - item->getOwnPort()==port) return item; - } - } while(item); - - return 0; -} - -// To find the resuming dcc over firewalls that change the port numbers -DccTransfer* DccPanel::getTransferByName(const QString& name,DccTransfer::DccType type,bool resumed) -{ - int index=0; - DccTransfer* item; - do - { - // TODO: Get rid of this cast - item=static_cast(getListView()->itemAtIndex(index++)); - if(item) - { - if( (item->getStatus()==DccTransfer::Queued || item->getStatus()==DccTransfer::WaitingRemote) && - item->getType()==type && - !(resumed && !item->isResumed()) && - item->getFileName()==name) return item; - } - } while(item); - - return 0; -} - -bool DccPanel::isLocalFileInWritingProcess( const KURL& url ) -{ - int index=0; - DccTransfer* item; - do - { - // TODO: Get rid of this cast - item=static_cast(getListView()->itemAtIndex(index++)); - if(item) - { - if( item->getType() == DccTransfer::Receive && - ( item->getStatus() == DccTransfer::Connecting || - item->getStatus() == DccTransfer::Receiving ) && - item->getFileURL() == url ) - { - return true; - } - } - } while(item); - - return false; -} - -// virtual -void DccPanel::childAdjustFocus() -{ -} - -KListView* DccPanel::getListView() -{ - return m_listView; -} - -#include "dccpanel.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dccpanel.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dccpanel.h --- konversation-1.0.1/konversation/src/dccpanel.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dccpanel.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,116 +0,0 @@ -/* - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. -*/ - -/* - begin: Mit Aug 7 2002 - copyright: (C) 2002 by Dario Abatianni - email: eisfuchs@tigress.com -*/ - -#ifndef DCCPANEL_H -#define DCCPANEL_H - -/* - @author Dario Abatianni -*/ - -#include "chatwindow.h" -#include "dcctransfer.h" - -class QContextMenuEvent; -class QPushButton; -class KListView; -class KPopupMenu; - -class DccPanel : public ChatWindow -{ - Q_OBJECT - - public: - class Column - { - public: - enum Object - { - TypeIcon, - OfferDate, - Status, - FileName, - PartnerNick, - Progress, - Position, - TimeRemaining, - CPS, - SenderAddress, - COUNT - }; - }; - - class Popup - { - public: - enum Object - { - SelectAll, - SelectAllCompleted, - Accept, - Abort, - Clear, - Open, - Remove, - Info, - Detail - }; - }; - - DccPanel(QWidget* parent); - ~DccPanel(); - - KListView* getListView(); - DccTransfer* getTransferByPort(const QString& port,DccTransfer::DccType type,bool resumed=false); - DccTransfer* getTransferByName(const QString& name,DccTransfer::DccType type,bool resumed=false); - - bool isLocalFileInWritingProcess( const KURL& localUrl ); - - void selectMe(DccTransfer* item); - - public slots: - void dccStatusChanged(const DccTransfer* item); - - protected slots: - void acceptDcc(); - void abortDcc(); - void clearDcc(); - void runDcc(); - void removeFile(); - void showFileInfo(); - void openDetail(); - void selectAll(); - void selectAllCompleted(); - - void popupRequested(QListViewItem* item,const QPoint& pos,int col); - void popupActivated(int id); - - void doubleClicked(QListViewItem* _item,const QPoint& _pos,int _col); - - void updateButton(); - - protected: - /** Called from ChatWindow adjustFocus */ - virtual void childAdjustFocus(); - - KListView* m_listView; - KPopupMenu* m_popup; - - QPushButton* m_buttonAccept; - QPushButton* m_buttonAbort; - QPushButton* m_buttonClear; - QPushButton* m_buttonOpen; - QPushButton* m_buttonRemove; - QPushButton* m_buttonDetail; -}; -#endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcc_preferences.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcc_preferences.cpp --- konversation-1.0.1/konversation/src/dcc_preferences.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dcc_preferences.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -10,11 +10,12 @@ Copyright (C) 2006 John Tapsell */ +#include "dcc_preferences.h" + #include #include #include -#include "dcc_preferences.h" DCC_Config::DCC_Config(QWidget *parent, const char* name) : DCC_ConfigUI(parent,name) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcc_preferences.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcc_preferences.h --- konversation-1.0.1/konversation/src/dcc_preferences.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dcc_preferences.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,6 +15,7 @@ #include "dcc_preferencesui.h" + class QComboBox; class DCC_Config : public DCC_ConfigUI diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcc_preferencesui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcc_preferencesui.ui --- konversation-1.0.1/konversation/src/dcc_preferencesui.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dcc_preferencesui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -12,8 +12,8 @@ 0 0 - 553 - 501 + 578 + 517 @@ -26,22 +26,6 @@ 0 - - - kcfg_DccAddPartner - - - &Add sender to file name - - - - - kcfg_DccCreateFolder - - - Cr&eate folder for sender - - dccPathLbl @@ -69,6 +53,22 @@ 2 + + + kcfg_DccAddPartner + + + &Add sender to file name + + + + + kcfg_DccCreateFolder + + + Cr&eate folder for sender + + kcfg_DccSpaceToUnderscore @@ -80,21 +80,20 @@ - + - kcfg_DccBufferSize - - - bytes + kcfg_DccAutoGet - - 65536 + + Automaticall&y accept download offer - - 512 + + + + kcfg_DccAutoResume - - 128 + + Au&tomatically resume download @@ -105,7 +104,24 @@ Enable fast DCC send (Might &not work with all clients) - + + + spacer4_2 + + + Vertical + + + Expanding + + + + 20 + 16 + + + + textLabel6 @@ -116,7 +132,18 @@ kcfg_DccBufferSize - + + + textLabel7 + + + DCC send t&imeout: + + + kcfg_DccSendTimeout + + + kcfg_DccIPv4Fallback @@ -127,7 +154,24 @@ If this option enabled dcc transfers for IPv6 connections will be done over IPv4 interface set here - + + + kcfg_DccBufferSize + + + bytes + + + 65536 + + + 512 + + + 128 + + + kcfg_DccSendTimeout @@ -141,26 +185,45 @@ 1 + + + kcfg_DccIPv4FallbackIface + + + false + + + + + kcfg_DccPassiveSend + + + Enable passive DCC send + + + + + - spacer3 + spacer5 Horizontal - Expanding + Maximum - 202 + 70 20 - spacer3_2 + spacer3 Horizontal @@ -170,31 +233,74 @@ - 202 + 70 20 - + - kcfg_DccAutoGet + spacer3_2 - - Automaticall&y accept download offer + + Horizontal - - - - textLabel7 + + Expanding - - DCC send t&imeout: + + + 70 + 20 + - - kcfg_DccSendTimeout + + + + groupBox1 + + IP + + + + unnamed + + + + kcfg_DccSpecificOwnIp + + + + + textLabel4 + + + &Method to get own IP: + + + kcfg_DccMethodToGetOwnIp + + + + + ownIP + + + O&wn IP: + + + kcfg_DccSpecificOwnIp + + + + + kcfg_DccMethodToGetOwnIp + + + - + groupBox2 @@ -277,7 +383,7 @@ kcfg_DccSpecificSendPorts - Enable specific &ports for DCC send: + Enable specific &ports for DCC transfer server: @@ -341,103 +447,10 @@ - - - spacer4_2 - - - Vertical - - - Expanding - - - - 20 - 10 - - - - - - kcfg_DccAutoResume - - - Au&tomatically resume download - - - - - kcfg_DccIPv4FallbackIface - - - false - - - - - groupBox1 - - - IP - - - - unnamed - - - - kcfg_DccSpecificOwnIp - - - - - textLabel4 - - - &Method to get own IP: - - - kcfg_DccMethodToGetOwnIp - - - - - ownIP - - - O&wn IP: - - - kcfg_DccSpecificOwnIp - - - - - kcfg_DccMethodToGetOwnIp - - - - - - - spacer5 - - - Horizontal - - - Maximum - - - - 196 - 20 - - - + + kcfg_DccSpecificSendPorts @@ -483,11 +496,18 @@ + kcfg_DccPath kcfg_DccAddPartner kcfg_DccCreateFolder + kcfg_DccSpaceToUnderscore kcfg_DccAutoGet kcfg_DccAutoResume + kcfg_DccFastSend + kcfg_DccPassiveSend + kcfg_DccIPv4Fallback + kcfg_DccIPv4FallbackIface kcfg_DccSendTimeout + kcfg_DccBufferSize kcfg_DccMethodToGetOwnIp kcfg_DccSpecificOwnIp kcfg_DccSpecificSendPorts @@ -496,8 +516,6 @@ kcfg_DccSpecificChatPorts kcfg_DccChatPortsFirst kcfg_DccChatPortsLast - kcfg_DccBufferSize - kcfg_DccFastSend diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dccrecipientdialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dccrecipientdialog.cpp --- konversation-1.0.1/konversation/src/dccrecipientdialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dccrecipientdialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,13 +12,14 @@ email: eisfuchs@tigress.com */ +#include "dccrecipientdialog.h" + #include #include #include #include -#include "dccrecipientdialog.h" QString DccRecipientDialog::selectedNickname; // static diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dccrecipientdialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dccrecipientdialog.h --- konversation-1.0.1/konversation/src/dccrecipientdialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dccrecipientdialog.h 2008-08-06 16:56:27.000000000 +0100 @@ -17,9 +17,6 @@ #include -/* - @author Dario Abatianni -*/ class KLineEdit; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dccresumedialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dccresumedialog.cpp --- konversation-1.0.1/konversation/src/dccresumedialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dccresumedialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -10,6 +10,9 @@ Copyright (C) 2004 Shintaro Matsuoka */ +#include "dccresumedialog.h" +#include "dcctransferrecv.h" + #include #include #include @@ -20,8 +23,6 @@ #include #include -#include "dcctransferrecv.h" -#include "dccresumedialog.h" DccResumeDialog::ReceiveAction DccResumeDialog::ask(DccTransferRecv* item, const QString& message, int enabledActions, ReceiveAction defaultAction) { @@ -48,7 +49,7 @@ ReceiveAction ra = dlg.m_selectedAction; if(ra == RA_Rename) - item->m_fileURL = dlg.m_urlreqFileURL->url(); + item->setFileURL( dlg.m_urlreqFileURL->url() ); return ra; } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dccresumedialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dccresumedialog.h --- konversation-1.0.1/konversation/src/dccresumedialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dccresumedialog.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,9 +15,6 @@ #include -/* - @author Dario Abatianni -*/ class KURLRequester; class DccTransferRecv; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransfer.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransfer.cpp --- konversation-1.0.1/konversation/src/dcctransfer.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransfer.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -1,355 +1,159 @@ /* - begin: Mit Aug 7 2002 - copyright: (C) 2002 by Dario Abatianni - email: eisfuchs@tigress.com -*/ -// Copyright (C) 2004,2005 Shintaro Matsuoka -// Copyright (C) 2004,2005 John Tapsell - -/* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. */ -#include +/* + Copyright (C) 2002-2004 Dario Abatianni + Copyright (C) 2004-2007 Shintaro Matsuoka + Copyright (C) 2004,2005 John Tapsell +*/ + +#include "dcctransfer.h" +#include "preferences.h" + +#include #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include "dccdetaildialog.h" -#include "dccpanel.h" -#include "dcctransfer.h" -#include "konversationapplication.h" -#include "config/preferences.h" -#define TIME_REMAINING_NOT_AVAILABLE -1 -#define TIME_REMAINING_INFINITE -2 +DccTransfer::DccTransfer( DccType dccType, QObject* parent ) : QObject(parent) +{ + kdDebug() << "DccTransfer::DccTransfer()" << endl; -#define CPS_CALCULATING -1 -#define CPS_NOT_IN_TRANSFER -2 + m_type = dccType; -DccTransfer::DccTransfer( DccPanel* panel, DccType dccType, const QString& partnerNick ) -: KListViewItem( panel->getListView() ) -{ - m_dccType = dccType; - m_partnerNick = partnerNick; + m_status = Configuring; - m_dccStatus = Queued; + m_fileSize = 0; m_resumed = false; + m_reverse = false; + m_connectionId = -1; // Not configured + m_timeLeft = DccTransfer::NotInTransfer; m_transferringPosition = 0; m_transferStartPosition = 0; - m_timeOffer = QDateTime::currentDateTime(); + m_averageSpeed = 0.0; + m_currentSpeed = 0.0; m_bufferSize = Preferences::dccBufferSize(); m_buffer = new char[ m_bufferSize ]; - m_autoUpdateViewTimer = 0; - m_transferLoggerTimer = 0; + connect( &m_loggerTimer, SIGNAL( timeout() ), this, SLOT( logTransfer() ) ); - m_progressBar = new KProgress( 100, listView()->viewport() ); - m_progressBar->setCenterIndicator( true ); - m_progressBar->setPercentageVisible( true ); - - m_detailDialog = 0; - - m_panel = panel; - - s_dccStatusText[ Queued ] = i18n("Queued"); - s_dccStatusText[ Preparing ] = i18n("Preparing"); - s_dccStatusText[ WaitingRemote ] = i18n("Offering"); - s_dccStatusText[ Connecting ] = i18n("Connecting"); - s_dccStatusText[ Sending ] = i18n("Sending"); - s_dccStatusText[ Receiving ] = i18n("Receiving"); - s_dccStatusText[ Done ] = i18n("Done"); - s_dccStatusText[ Failed ] = i18n("Failed"); - s_dccStatusText[ Aborted ] = i18n("Aborted"); - s_dccStatusText[ Removed ] = i18n("Removed"); + m_timeOffer = QDateTime::currentDateTime(); } DccTransfer::~DccTransfer() { - stopAutoUpdateView(); - closeDetailDialog(); + kdDebug() << "DccTransfer::~DccTransfer()" << endl; delete[] m_buffer; - delete m_progressBar; -} - -void DccTransfer::updateView() -{ - updateTransferMeters(); - - setPixmap( DccPanel::Column::TypeIcon, getTypeIcon() ); - setPixmap( DccPanel::Column::Status, getStatusIcon() ); - - setText( DccPanel::Column::OfferDate, m_timeOffer.toString( "hh:mm:ss" ) ); - setText( DccPanel::Column::Status, getStatusText() ); - setText( DccPanel::Column::FileName, m_fileURL.fileName() ); - setText( DccPanel::Column::PartnerNick, m_partnerNick ); - setText( DccPanel::Column::Position, getPositionPrettyText() ); - setText( DccPanel::Column::TimeRemaining, getTimeRemainingPrettyText() ); - setText( DccPanel::Column::CPS, getCPSPrettyText() ); - setText( DccPanel::Column::SenderAddress, getSenderAddressPrettyText() ); - - if ( m_fileSize ) - m_progressBar->setProgress( getProgress() ); - else // filesize is unknown - { - m_progressBar->hide(); - setText( DccPanel::Column::Progress, i18n( "unknown" ) ); - } - - if ( m_detailDialog ) - m_detailDialog->updateView(); -} - - -int DccTransfer::compare( QListViewItem* i, int col, bool ascending ) const -{ - DccTransfer* item = static_cast( i ); - - switch ( col ) - { - case DccPanel::Column::TypeIcon: - if ( m_dccType > item->getType() ) return 1; - if ( m_dccType < item->getType() ) return -1; - return 0; - break; - case DccPanel::Column::OfferDate: - if ( m_timeOffer > item->getTimeOffer() ) return 1; - if ( m_timeOffer < item->getTimeOffer() ) return -1; - return 0; - break; - case DccPanel::Column::Status: - if ( m_dccStatus > item->getStatus() ) return 1; - if ( m_dccStatus < item->getStatus() ) return -1; - return 0; - break; - case DccPanel::Column::Position: - if ( m_transferringPosition > item->getTransferringPosition() ) return 1; - if ( m_transferringPosition < item->getTransferringPosition() ) return -1; - return 0; - break; - case DccPanel::Column::TimeRemaining: - if ( getTimeRemaining() > item->getTimeRemaining() ) return 1; - if ( getTimeRemaining() < item->getTimeRemaining() ) return -1; - return 0; - break; - case DccPanel::Column::CPS: - if ( getCPS() > item->getCPS() ) return 1; - if ( getCPS() < item->getCPS() ) return -1; - return 0; - break; - default: - return QListViewItem::compare( i, col, ascending ); - } -} - -void DccTransfer::initTransferMeter() -{ - kdDebug() << "DccTransfer::initTransferMeter()" << endl; - m_transferLoggerTimer = new QTimer( this ); - connect( m_transferLoggerTimer, SIGNAL( timeout() ), this, SLOT( slotLogTransfer() ) ); - m_timeTransferStarted = QDateTime::currentDateTime(); - m_transferLoggerBaseTime.start(); - m_transferLoggerTimer->start( 100 ); - startAutoUpdateView(); -} - -void DccTransfer::finishTransferMeter() -{ - stopAutoUpdateView(); - if ( m_timeTransferFinished.isNull() ) - m_timeTransferFinished = QDateTime::currentDateTime(); - if ( m_transferLoggerTimer ) - { - m_transferLoggerTimer->stop(); - delete m_transferLoggerTimer; - m_transferLoggerTimer = 0; - } + m_loggerTimer.stop(); } -void DccTransfer::startAutoUpdateView() +DccTransfer::DccTransfer( const DccTransfer& obj ) + : QObject() { - stopAutoUpdateView(); - m_autoUpdateViewTimer = new QTimer( this ); - connect( m_autoUpdateViewTimer, SIGNAL( timeout() ), this, SLOT( updateView()) ); - m_autoUpdateViewTimer->start( 500 ); + m_buffer = 0; + m_bufferSize = 0; + m_averageSpeed = obj.getAverageSpeed(); + m_currentSpeed = obj.getCurrentSpeed(); + m_status = obj.getStatus(); + m_statusDetail = obj.getStatusDetail(); + m_type = obj.getType(); + m_fileName = obj.getFileName(); + m_fileSize = obj.getFileSize(); + m_fileURL = obj.getFileURL(); + // m_loggerBaseTime + // m_loggerTimer + m_ownIp = obj.getOwnIp(); + m_ownPort = obj.getOwnPort(); + m_partnerIp = obj.getPartnerIp(); + m_partnerNick = obj.getPartnerNick(); + m_partnerPort = obj.getPartnerPort(); + m_resumed = obj.isResumed(); + m_reverse = obj.isReverse(); + m_connectionId = obj.getConnectionId(); + m_timeLeft = obj.getTimeLeft(); + m_timeOffer = obj.getTimeOffer(); + m_timeTransferFinished = obj.getTimeTransferFinished(); + m_timeTransferStarted = obj.getTimeTransferStarted(); + // m_transferLogPosition + // m_transferLogTime + m_transferringPosition = obj.getTransferringPosition(); + m_transferStartPosition = obj.getTransferStartPosition(); } -void DccTransfer::stopAutoUpdateView() +void DccTransfer::setConnectionId( int id ) { - if ( m_autoUpdateViewTimer ) - { - m_autoUpdateViewTimer->stop(); - delete m_autoUpdateViewTimer; - m_autoUpdateViewTimer = 0; - } + if ( getStatus() == Configuring || getStatus() == Queued ) + m_connectionId = id; } -void DccTransfer::slotLogTransfer() +void DccTransfer::setPartnerNick( const QString& nick ) { - m_transferLogTime.append( m_transferLoggerBaseTime.elapsed() ); - m_transferLogPosition.append( m_transferringPosition ); + if ( getStatus() == Configuring || getStatus() == Queued ) + m_partnerNick = nick; } -void DccTransfer::paintCell( QPainter* painter, const QColorGroup& colorgroup, int column, int width, int alignment ) // virtual public +bool DccTransfer::queue() { - KListViewItem::paintCell( painter, colorgroup, column, width, alignment ); - if ( column == DccPanel::Column::Progress ) - showProgressBar(); -} + kdDebug() << "DccTransfer::queue()" << endl; + if ( getStatus() != Configuring ) + return false; -void DccTransfer::showProgressBar() -{ - if ( m_fileSize ) - { - QRect rect = listView()->itemRect( this ); - QHeader *head = listView()->header(); - rect.setLeft( head->sectionPos( DccPanel::Column::Progress ) - head->offset() ); - rect.setWidth( head->sectionSize( DccPanel::Column::Progress ) ); - m_progressBar->setGeometry( rect ); - m_progressBar->show(); - } -} + if ( m_fileName.isEmpty() ) + return false; -void DccTransfer::runFile() -{ - if ( m_dccType == Send || m_dccStatus == Done ) - new KRun( m_fileURL, listView() ); -} + if ( m_connectionId == -1 || m_partnerNick.isEmpty() ) + return false; -void DccTransfer::removeFile() -{ - if ( m_dccType != Receive || m_dccStatus != Done ) - return; - // is it better to show the progress dialog? - KIO::SimpleJob* deleteJob = KIO::file_delete( m_fileURL, false ); - connect( deleteJob, SIGNAL( result( KIO::Job* ) ), this, SLOT( slotRemoveFileDone( KIO::Job* ) ) ); + setStatus( Queued ); + return true; } -void DccTransfer::slotRemoveFileDone( KIO::Job* job ) +void DccTransfer::startTransferLogger() { - if ( job->error() ) - KMessageBox::sorry( listView(), i18n("Cannot remove file '%1'.").arg( m_fileURL.url() ), i18n("DCC Error") ); - else - { - setStatus( Removed ); - updateView(); - } -} - -void DccTransfer::openFileInfoDialog() -{ - if ( m_dccType == Send || m_dccStatus == Done ) - { - QStringList infoList; - - QString path=m_fileURL.path(); - - // get meta info object - KFileMetaInfo fileInfo(path,QString::null,KFileMetaInfo::Everything); - - // is there any info for this file? - if(!fileInfo.isEmpty()) - { - // get list of meta information groups - QStringList groupList=fileInfo.groups(); - // look inside for keys - for(unsigned int index=0;index"+infoList.join("
")+"", - i18n("File Information") - ); - #endif - } - } - else - { - KMessageBox::sorry(listView(),i18n("No detailed information for this file found."),i18n("File Information")); - } - } + m_timeTransferStarted = QDateTime::currentDateTime(); + m_loggerBaseTime.start(); + m_loggerTimer.start( 100 ); } -void DccTransfer::openDetailDialog() +void DccTransfer::finishTransferLogger() { - if ( !m_detailDialog ) - m_detailDialog = new DccDetailDialog( this ); - m_detailDialog->show(); + if ( m_timeTransferFinished.isNull() ) + m_timeTransferFinished = QDateTime::currentDateTime(); + m_loggerTimer.stop(); + updateTransferMeters(); } -void DccTransfer::closeDetailDialog() +// called by m_loggerTimer +void DccTransfer::logTransfer() { - if ( m_detailDialog ) - { - delete m_detailDialog; - m_detailDialog = 0; - } + m_transferLogTime.append( m_loggerBaseTime.elapsed() ); + m_transferLogPosition.append( m_transferringPosition ); + updateTransferMeters(); } void DccTransfer::setStatus( DccStatus status, const QString& statusDetail ) { - bool changed = ( status != m_dccStatus ); - DccStatus oldStatus = m_dccStatus; - m_dccStatus = status; - m_dccStatusDetail = statusDetail; + bool changed = ( status != m_status ); + DccStatus oldStatus = m_status; + m_status = status; + m_statusDetail = statusDetail; if ( changed ) - emit statusChanged( this, m_dccStatus, oldStatus ); + emit statusChanged( this, m_status, oldStatus ); } void DccTransfer::updateTransferMeters() { const int timeToCalc = 5; - if ( m_dccStatus == Sending || m_dccStatus == Receiving ) + if ( getStatus() == Transferring ) { - // update CPS + // update CurrentSpeed // remove too old data QValueList::iterator itTime = m_transferLogTime.begin(); @@ -362,236 +166,193 @@ // shift the base of the time (m_transferLoggerBaseTime) // reason: QTime can't handle a time longer than 24 hours - int shiftOffset = m_transferLoggerBaseTime.restart(); + int shiftOffset = m_loggerBaseTime.restart(); itTime = m_transferLogTime.begin(); for ( ; itTime != m_transferLogTime.end() ; ++itTime ) (*itTime) = (*itTime) - shiftOffset; if ( m_transferLogTime.count() >= 2 ) - m_cps = (double)( m_transferLogPosition.last() - m_transferLogPosition.front() ) / (double)( m_transferLogTime.last() - m_transferLogTime.front() ) * 1000; + { + // FIXME: precision of average speed is too bad + m_averageSpeed = (double)( m_transferringPosition - m_transferStartPosition ) / (double)m_timeTransferStarted.secsTo( QDateTime::currentDateTime() ); + m_currentSpeed = (double)( m_transferLogPosition.last() - m_transferLogPosition.front() ) / (double)( m_transferLogTime.last() - m_transferLogTime.front() ) * 1000; + } else // avoid zero devision - m_cps = CPS_CALCULATING; + { + m_averageSpeed = DccTransfer::Calculating; + m_currentSpeed = DccTransfer::Calculating; + } // update the remaining time - if ( m_cps <= 0 ) - m_timeRemaining = TIME_REMAINING_INFINITE; + if ( m_currentSpeed <= 0 ) + m_timeLeft = DccTransfer::InfiniteValue; else - m_timeRemaining = (int)( (double)( m_fileSize - m_transferringPosition ) / m_cps ); + m_timeLeft = (int)( (double)( m_fileSize - m_transferringPosition ) / m_currentSpeed ); } - else if ( m_dccStatus >= Done ) + else if ( m_status >= Done ) { - // avoid zero devision - if ( m_timeTransferStarted.secsTo( m_timeTransferFinished ) <= 0 ) - m_cps = CPS_NOT_IN_TRANSFER; + if ( m_timeTransferStarted.secsTo( m_timeTransferFinished ) > 1 ) + m_averageSpeed = (double)( m_transferringPosition - m_transferStartPosition ) / (double)m_timeTransferStarted.secsTo( m_timeTransferFinished ); else - m_cps = (double)( m_transferringPosition - m_transferStartPosition ) / (double)m_timeTransferStarted.secsTo( m_timeTransferFinished ); - m_timeRemaining = TIME_REMAINING_NOT_AVAILABLE; + m_averageSpeed = DccTransfer::InfiniteValue; + m_currentSpeed = 0; + m_timeLeft = DccTransfer::NotInTransfer; } else { - m_cps = 0; - m_timeRemaining = TIME_REMAINING_NOT_AVAILABLE; + m_averageSpeed = 0; + m_currentSpeed = 0; + m_timeLeft = DccTransfer::NotInTransfer; } } -QPixmap DccTransfer::getStatusIcon() const +QString DccTransfer::sanitizeFileName( const QString& fileName ) { - QString icon; - switch ( m_dccStatus ) - { - case Queued: - icon = "player_stop"; - break; - case Preparing: - case WaitingRemote: - case Connecting: - icon = "goto"; - break; - case Sending: - case Receiving: - icon = "player_play"; - break; - case Done: - icon = "ok"; - break; - case Aborted: - case Failed: - icon = "stop"; - break; - case Removed: - icon = "trashcan_full"; - break; - default: - break; - } - return KGlobal::iconLoader()->loadIcon( icon, KIcon::Small ); + QString fileNameTmp = QFileInfo( fileName ).fileName(); + if ( fileNameTmp.startsWith( "." ) ) + fileNameTmp.replace( 0, 1, '_' ); // Don't create hidden files + if ( fileNameTmp.isEmpty() ) + fileNameTmp = "unnamed"; + return fileNameTmp; } -QString DccTransfer::getStatusText() const +//FIXME: IPv6 support +QString DccTransfer::getNumericalIpText( const QString& ipString ) { - return s_dccStatusText[ m_dccStatus ]; + QHostAddress ip; + ip.setAddress( ipString ); + + return QString::number( ip.ip4Addr() ); } -QString DccTransfer::getFileSizePrettyText() const +unsigned long DccTransfer::intel( unsigned long value ) { - return KIO::convertSize( m_fileSize ); + value = ( (value & 0xff000000) >> 24 ) + + ( (value & 0xff0000) >> 8 ) + + ( (value & 0xff00) << 8 ) + + ( (value & 0xff) << 24 ); + + return value; } -int DccTransfer::getProgress() const +DccTransfer::DccType DccTransfer::getType() const { - return (int)( ( (double)m_transferringPosition / (double)m_fileSize ) * 100 ); + return m_type; } -QString DccTransfer::getPositionPrettyText( bool detailed ) const +DccTransfer::DccStatus DccTransfer::getStatus() const { - if ( detailed ) - return KGlobal::locale()->formatNumber( m_transferringPosition, 0 ) + " / " + - KGlobal::locale()->formatNumber( m_fileSize, 0 ); - else - return KIO::convertSize( m_transferringPosition ) + " / " + KIO::convertSize( m_fileSize ); + return m_status; } -QString DccTransfer::getTimeRemainingPrettyText() const +const QString& DccTransfer::getStatusDetail() const { - QString text; - - if ( m_timeRemaining == TIME_REMAINING_NOT_AVAILABLE ) - ; - else if ( m_timeRemaining == TIME_REMAINING_INFINITE ) - text = "?"; - else - { - int remSec = m_timeRemaining; - int remHour = remSec / 3600; remSec -= remHour * 3600; - int remMin = remSec / 60; remSec -= remMin * 60; - - // remHour can be more than 25, so we can't use QTime here. - text = QString( "%1:%2:%3" ) - .arg( QString::number( remHour ).rightJustify( 2, '0', false ) ) - .arg( QString::number( remMin ).rightJustify( 2, '0' ) ) - .arg( QString::number( remSec ).rightJustify( 2, '0' ) ); - } - - return text; + return m_statusDetail; } -QString DccTransfer::getCPSPrettyText() const +QDateTime DccTransfer::getTimeOffer() const { - if ( m_cps == CPS_CALCULATING ) - return QString( "?" ); - else if ( m_cps == CPS_NOT_IN_TRANSFER ) - return QString(); - else - return i18n("%1/sec").arg( KIO::convertSize( (KIO::fileoffset_t)m_cps ) ); + return m_timeOffer; } -QString DccTransfer::getSenderAddressPrettyText() const +int DccTransfer::getConnectionId() const { - if ( m_dccType == Send ) - return QString( "%1:%2" ).arg( m_ownIp ).arg( m_ownPort ); - else - return QString( "%1:%2" ).arg( m_partnerIp ).arg( m_partnerPort ); + return m_connectionId; } -//FIXME: IPv6 support -QString DccTransfer::getNumericalIpText( const QString& ipString ) +QString DccTransfer::getOwnIp() const { - QHostAddress ip; - ip.setAddress( ipString ); - - return QString::number( ip.ip4Addr() ); + return m_ownIp; } -unsigned long DccTransfer::intel( unsigned long value ) +QString DccTransfer::getOwnPort() const { - value = ( (value & 0xff000000) >> 24 ) + - ( (value & 0xff0000) >> 8 ) + - ( (value & 0xff00) << 8 ) + - ( (value & 0xff) << 24 ); - - return value; + return m_ownPort; } -DccTransfer::DccType DccTransfer::getType() const -{ - return m_dccType; +QString DccTransfer::getPartnerNick() const +{ + return m_partnerNick; } -DccTransfer::DccStatus DccTransfer::getStatus() const -{ - return m_dccStatus; +QString DccTransfer::getPartnerIp() const +{ + return m_partnerIp; } -const QString& DccTransfer::getStatusDetail() const +QString DccTransfer::getPartnerPort() const { - return m_dccStatusDetail; + return m_partnerPort; } -QDateTime DccTransfer::getTimeOffer() const +QString DccTransfer::getFileName() const { - return m_timeOffer; + return m_fileName; } -QString DccTransfer::getOwnIp() const -{ - return m_ownIp; +KIO::filesize_t DccTransfer::getFileSize() const +{ + return m_fileSize; } -QString DccTransfer::getOwnPort() const -{ - return m_ownPort; +KIO::fileoffset_t DccTransfer::getTransferringPosition() const +{ + return m_transferringPosition; } -QString DccTransfer::getPartnerNick() const -{ - return m_partnerNick; +KIO::fileoffset_t DccTransfer::getTransferStartPosition() const +{ + return m_transferStartPosition; } -QString DccTransfer::getPartnerIp() const -{ - return m_partnerIp; +KURL DccTransfer::getFileURL() const +{ + return m_fileURL; } -QString DccTransfer::getPartnerPort() const -{ - return m_partnerPort; +bool DccTransfer::isResumed() const +{ + return m_resumed; } -QString DccTransfer::getFileName() const -{ - return m_fileName; +bool DccTransfer::isReverse() const +{ + return m_reverse; } -KIO::filesize_t DccTransfer::getFileSize() const -{ - return m_fileSize; +QString DccTransfer::getReverseToken() const +{ + return m_reverseToken; } -KIO::fileoffset_t DccTransfer::getTransferringPosition() const -{ - return m_transferringPosition; +transferspeed_t DccTransfer::getAverageSpeed() const +{ + return m_averageSpeed; } -KURL DccTransfer::getFileURL() const -{ - return m_fileURL; +transferspeed_t DccTransfer::getCurrentSpeed() const +{ + return m_currentSpeed; } -bool DccTransfer::isResumed() const -{ - return m_resumed; +int DccTransfer::getTimeLeft() const +{ + return m_timeLeft; } -unsigned long DccTransfer::getCPS() const -{ - return (unsigned long)m_cps; +int DccTransfer::getProgress() const +{ + return (int)( ( (double)getTransferringPosition() / (double)getFileSize() ) * 100 ); } -int DccTransfer::getTimeRemaining() const -{ - return m_timeRemaining; +QDateTime DccTransfer::getTimeTransferStarted() const +{ + return m_timeTransferStarted; } -QString DccTransfer::s_dccStatusText[ DccTransfer::DccStatusCount ]; +QDateTime DccTransfer::getTimeTransferFinished() const +{ + return m_timeTransferFinished; +} #include "dcctransfer.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransferdetailedinfopanel.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransferdetailedinfopanel.cpp --- konversation-1.0.1/konversation/src/dcctransferdetailedinfopanel.cpp 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransferdetailedinfopanel.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,214 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + Copyright (C) 2007 Shintaro Matsuoka +*/ + +#include "dcctransferdetailedinfopanel.h" +#include "channel.h" +#include "dcctransfer.h" +#include "dcctransfermanager.h" +#include "dcctransferrecv.h" +#include "dcctransferpanelitem.h" +#include "konversationapplication.h" +#include "connectionmanager.h" +#include "server.h" + +#include +#include + +#include +#include +#include +#include +#include +#include + + +DccTransferDetailedInfoPanel::DccTransferDetailedInfoPanel( QWidget* parent, const char* name ) + : DccTransferDetailedInfoPanelUI( parent, name ) +{ + m_autoViewUpdateTimer = new QTimer( this ); + + connect( m_urlreqLocation, SIGNAL( textChanged( const QString& ) ), this, SLOT( slotLocationChanged( const QString& ) ) ); + connect( m_buttonOpenFolder, SIGNAL( clicked() ), this, SLOT( slotOpenFolderButtonClicked() ) ); + connect( KonversationApplication::instance()->getDccTransferManager(), SIGNAL( fileURLChanged( DccTransferRecv* ) ), + this, SLOT( updateView() ) ); // it's a little rough.. +} + +DccTransferDetailedInfoPanel::~DccTransferDetailedInfoPanel() +{ +} + +void DccTransferDetailedInfoPanel::setItem( DccTransferPanelItem* item ) +{ + m_autoViewUpdateTimer->stop(); + + // disconnect all slots once + disconnect( this ); + // we can't do disconnect( m_item->transfer(), 0, this, 0 ) here + // because m_item can have been deleted already. + + // set up the auto view-update timer + connect( m_autoViewUpdateTimer, SIGNAL( timeout() ), this, SLOT( updateView() ) ); + + m_item = item; + + // If the file is already being transferred, the timer must be started here, + // otherwise the information will not be updated every 0.5sec + if (m_item->transfer()->getStatus() == DccTransfer::Transferring) + m_autoViewUpdateTimer->start(500, false); + connect( m_item->transfer(), SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, SLOT( slotTransferStatusChanged( DccTransfer*, int, int ) ) ); + + updateView(); +} + +void DccTransferDetailedInfoPanel::updateView() +{ + DccTransfer* transfer = m_item->transfer(); + + // Type: + QString type( transfer->getType() == DccTransfer::Send ? i18n( "DCC Send" ) : i18n( "DCC Receive" ) ); + if ( transfer->isReverse() ) + type += i18n( " (Reverse DCC)" ); + m_labelDccType->setText( type ); + + // Filename: + m_labelFilename->setText( transfer->getFileName() ); + + // Location: + m_urlreqLocation->setURL( transfer->getFileURL().prettyURL() ); + //m_urlreqLocation->lineEdit()->setFocusPolicy( transfer->getStatus() == DccTransfer::Queued ? StrongFocus : ClickFocus ); + m_urlreqLocation->lineEdit()->setReadOnly( transfer->getStatus() != DccTransfer::Queued ); + m_urlreqLocation->lineEdit()->setFrame( transfer->getStatus() == DccTransfer::Queued ); + m_urlreqLocation->button()->setEnabled( transfer->getStatus() == DccTransfer::Queued ); + m_buttonOpenFolder->setEnabled( !m_urlreqLocation->lineEdit()->text().isEmpty() ); + + // Partner: + QString partnerInfoServerName; + if ( transfer->getConnectionId() == -1 ) + partnerInfoServerName = i18n( "Unknown server" ); + else if ( KonversationApplication::instance()->getConnectionManager()->getServerByConnectionId( transfer->getConnectionId() ) ) + partnerInfoServerName = KonversationApplication::instance()->getConnectionManager()->getServerByConnectionId( transfer->getConnectionId() )->getServerName(); + else + partnerInfoServerName = i18n( "Unknown server" ); + QString partnerInfo( i18n( "%1 on %2" ) + .arg( transfer->getPartnerNick().isEmpty() ? "?" : transfer->getPartnerNick() ) + .arg( partnerInfoServerName ) ); + if ( !transfer->getPartnerIp().isEmpty() ) + partnerInfo += i18n( ", %1 (port %2)" ).arg( transfer->getPartnerIp() ).arg( transfer->getPartnerPort() ); + m_labelPartner->setText( partnerInfo ); + + // Self: + if ( transfer->getOwnIp().isEmpty() ) + m_labelSelf->setText( "" ); + else + m_labelSelf->setText( i18n( "%1 (port %2)" ).arg( transfer->getOwnIp() ).arg( transfer->getOwnPort() ) ); + + // Status: + if ( transfer->getStatus() == DccTransfer::Transferring ) + m_labelStatus->setText( m_item->getStatusText() + " ( " + m_item->getCurrentSpeedPrettyText() + " )" ); + else + m_labelStatus->setText( transfer->getStatusDetail().isEmpty() ? m_item->getStatusText() : m_item->getStatusText() + " (" + transfer->getStatusDetail() + ')' ); + + // Progress: + m_progress->setProgress( transfer->getProgress() ); + + // Current Position: + m_labelCurrentPosition->setText( KGlobal::locale()->formatNumber( transfer->getTransferringPosition(), 0 ) ); + + // File Size: + m_labelFileSize->setText( KGlobal::locale()->formatNumber( transfer->getFileSize(), 0 ) ); + + // Current Speed: + m_labelCurrentSpeed->setText( m_item->getCurrentSpeedPrettyText() ); + + // Average Speed: + m_labelAverageSpeed->setText( m_item->getAverageSpeedPrettyText() ); + + // Resumed: + if ( transfer->isResumed() ) + m_labelIsResumed->setText( i18n( "Yes, %1" ).arg( KGlobal::locale()->formatNumber( transfer->getTransferStartPosition(), 0 ) ) ); + else + m_labelIsResumed->setText( i18n( "No" ) ); + + // Transferring Time: + if ( transfer->getTimeTransferStarted().isNull() ) + m_labelTransferringTime->setText( "" ); + else + { + int transferringTime; + + // The transfer is still in progress + if ( transfer->getTimeTransferFinished().isNull() ) + transferringTime = transfer->getTimeTransferStarted().secsTo( QDateTime::currentDateTime() ); + // The transfer has finished + else + transferringTime = transfer->getTimeTransferStarted().secsTo( transfer->getTimeTransferFinished() ); + + if ( transferringTime >= 1 ) + m_labelTransferringTime->setText( DccTransferPanelItem::secToHMS( transferringTime ) ); + else + m_labelTransferringTime->setText( i18n( "< 1sec" ) ); + } + + // Estimated Time Left: + m_labelTimeLeft->setText( m_item->getTimeLeftPrettyText() ); + + // Offered at: + m_labelTimeOffered->setText( transfer->getTimeOffer().toString( "hh:mm:ss" ) ); + + // Started at: + if ( !transfer->getTimeTransferStarted().isNull() ) + m_labelTimeStarted->setText( transfer->getTimeTransferStarted().toString( "hh:mm:ss" ) ); + else + m_labelTimeStarted->setText( "" ); + + // Finished at: + if ( !transfer->getTimeTransferFinished().isNull() ) + m_labelTimeFinished->setText( transfer->getTimeTransferFinished().toString( "hh:mm:ss" ) ); + else + m_labelTimeFinished->setText( "" ); +} + +void DccTransferDetailedInfoPanel::slotTransferStatusChanged( DccTransfer* /* transfer */, int newStatus, int oldStatus ) +{ + updateView(); + if ( newStatus == DccTransfer::Transferring ) + { + // start auto view-update timer + m_autoViewUpdateTimer->start( 500, false ); + } + else if ( oldStatus == DccTransfer::Transferring ) + { + // stop auto view-update timer + m_autoViewUpdateTimer->stop(); + } +} + +void DccTransferDetailedInfoPanel::slotLocationChanged( const QString& url ) +{ + if ( m_item->transfer()->getType() == DccTransfer::Receive ) + { + DccTransferRecv* transfer = static_cast< DccTransferRecv* >( m_item->transfer() ); + transfer->setFileURL( KURL::fromPathOrURL( url ) ); + } +} + +void DccTransferDetailedInfoPanel::slotOpenFolderButtonClicked() +{ + QString urlString = m_urlreqLocation->lineEdit()->text(); + if ( !urlString.isEmpty() ) + { + KURL url = KURL::fromPathOrURL( urlString ); + url.setFileName( QString() ); + new KRun( url, 0, true, true ); + } +} + +#include "dcctransferdetailedinfopanel.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransferdetailedinfopanel.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransferdetailedinfopanel.h --- konversation-1.0.1/konversation/src/dcctransferdetailedinfopanel.h 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransferdetailedinfopanel.h 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,44 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + Copyright (C) 2007 Shintaro Matsuoka +*/ + +#ifndef DCCTRANSFERDETAILEDINFOPANEL_H +#define DCCTRANSFERDETAILEDINFOPANEL_H + +#include "dcctransferdetailedinfopanelui.h" + + +class QTimer; + +class DccTransfer; +class DccTransferPanelItem; + +class DccTransferDetailedInfoPanel : public DccTransferDetailedInfoPanelUI +{ + Q_OBJECT + + public: + explicit DccTransferDetailedInfoPanel( QWidget* parent = 0, const char* name = 0 ); + virtual ~DccTransferDetailedInfoPanel(); + + void setItem( DccTransferPanelItem* item ); + + private slots: + void updateView(); + void slotTransferStatusChanged( DccTransfer* transfer, int newStatus, int oldStatus ); + void slotLocationChanged( const QString& url ); + void slotOpenFolderButtonClicked(); + + private: + DccTransferPanelItem* m_item; + QTimer* m_autoViewUpdateTimer; +}; + +#endif // DCCTRANSFERDETAILEDINFOPANEL_H diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransferdetailedinfopanelui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransferdetailedinfopanelui.ui --- konversation-1.0.1/konversation/src/dcctransferdetailedinfopanelui.ui 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransferdetailedinfopanelui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,492 @@ + +DccTransferDetailedInfoPanelUI + + + DccTransferDetailedInfoPanelUI + + + + 0 + 0 + 646 + 289 + + + + + 7 + 1 + 0 + 0 + + + + + unnamed + + + + layout7 + + + + unnamed + + + + m_labelFilename + + + + + m_labelDccType + + + + + textLabel4 + + + Filename: + + + + + textLabel1_3 + + + Self: + + + + + textLabel12 + + + Type: + + + + + textLabel10 + + + Status: + + + + + textLabel3 + + + Location: + + + + + textLabel18 + + + Progress: + + + + + m_labelStatus + + + + + m_labelPartner + + + + + m_progress + + + + + textLabel23 + + + Partner: + + + + + layout6 + + + + unnamed + + + + m_urlreqLocation + + + + + m_buttonOpenFolder + + + Open Folder + + + + + + + + + + m_labelSelf + + + + + + + line1 + + + HLine + + + Sunken + + + Horizontal + + + + + layout26 + + + + unnamed + + + + layout24 + + + + unnamed + + + + m_labelCurrentSpeed + + + + 0 + 5 + 0 + 0 + + + + + 130 + 0 + + + + AlignVCenter|AlignRight + + + + + textLabel21 + + + File Size: + + + + + m_labelIsResumed + + + + 0 + 5 + 0 + 0 + + + + + 130 + 0 + + + + AlignVCenter|AlignRight + + + + + m_labelFileSize + + + + 0 + 5 + 0 + 0 + + + + + 130 + 0 + + + + AlignVCenter|AlignRight + + + + + textLabel1 + + + Average Speed: + + + + + textLabel14 + + + Resumed: + + + + + m_labelCurrentPosition + + + + 0 + 5 + 0 + 0 + + + + + 130 + 0 + + + + AlignVCenter|AlignRight + + + + + textLabel1_2 + + + Current Speed: + + + + + textLabel19 + + + Current Position: + + + + + m_labelAverageSpeed + + + + 0 + 5 + 0 + 0 + + + + + 130 + 0 + + + + AlignVCenter|AlignRight + + + + + + + line3 + + + VLine + + + Sunken + + + Vertical + + + + + layout25 + + + + unnamed + + + + textLabel8 + + + Estimated Time Left: + + + + + textLabel5 + + + Offered at: + + + + + m_labelTimeFinished + + + AlignVCenter|AlignRight + + + + + m_labelTransferringTime + + + + 0 + 5 + 0 + 0 + + + + + 130 + 0 + + + + AlignVCenter|AlignRight + + + + + textLabel7 + + + Finished at: + + + + + textLabel6_2 + + + Started at: + + + + + m_labelTimeLeft + + + + 0 + 5 + 0 + 0 + + + + + 130 + 0 + + + + AlignVCenter|AlignRight + + + + + m_labelTimeOffered + + + AlignVCenter|AlignRight + + + + + textLabel6 + + + Transferring Time: + + + + + m_labelTimeStarted + + + AlignVCenter|AlignRight + + + + + + + spacer2 + + + Horizontal + + + Expanding + + + + 110 + 20 + + + + + + + + + + kprogress.h + kurlrequester.h + ksqueezedtextlabel.h + klineedit.h + kpushbutton.h + + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransfer.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransfer.h --- konversation-1.0.1/konversation/src/dcctransfer.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransfer.h 2008-08-06 16:56:27.000000000 +0100 @@ -1,10 +1,6 @@ /* - begin: Mit Aug 7 2002 - copyright: (C) 2002 by Dario Abatianni - email: eisfuchs@tigress.com + This class represents a DCC transfer. */ -// Copyright (C) 2004,2005 Shintaro Matsuoka -// Copyright (C) 2004,2005 John Tapsell /* This program is free software; you can redistribute it and/or modify @@ -13,71 +9,66 @@ (at your option) any later version. */ +/* + Copyright (C) 2002-2004 Dario Abatianni + Copyright (C) 2004-2007 Shintaro Matsuoka + Copyright (C) 2004,2005 John Tapsell +*/ + #ifndef DCCTRANSFER_H #define DCCTRANSFER_H #include +#include +#include -#include #include #include -class QStringList; -class QTimer; - -class KProgress; - -namespace KIO -{ - class Job; -} - -class DccDetailDialog; -class DccPanel; - -/* - @author Dario Abatianni -*/ +typedef double transferspeed_t; -class DccTransfer : public QObject, public KListViewItem +class DccTransfer : public QObject { Q_OBJECT - friend class DccDetailDialog; public: enum DccType { - Send, Receive, - DccTypeCount + Send }; enum DccStatus { - Queued = 0, // Newly added DCC, RECV: Waiting for local user's response + Configuring = 0, // Not queud yet (this means that user can't see the item at this time) + Queued, // Newly added DCC, waiting user's response Preparing, // Opening KIO to write received data WaitingRemote, // Waiting for remote host's response Connecting, // RECV: trying to connect to the server - Sending, // Sending - Receiving, // Receiving - Done, // Transfer done - Failed, // Transfer failed - Aborted, // Transfer aborted by user - Removed, // The file was removed - DccStatusCount + Transferring, + Done, + Failed, + Aborted }; - DccTransfer( DccPanel* panel, DccType dccType, const QString& partnerNick ); - virtual ~DccTransfer(); + enum UnavailableStatus + { + Calculating = -1, + NotInTransfer = -2, + InfiniteValue = -3 + }; - virtual void paintCell( QPainter* painter, const QColorGroup& colorgroup, int column, int width, int alignment ); + DccTransfer( DccType dccType, QObject* parent ); + virtual ~DccTransfer(); - virtual int compare( QListViewItem* i, int col, bool ascending ) const; + // info of DccTransfer can be copied with this constructor. + DccTransfer( const DccTransfer& obj ); DccType getType() const; DccStatus getStatus() const; const QString& getStatusDetail() const; QDateTime getTimeOffer() const; + int getConnectionId() const; QString getOwnIp() const; QString getOwnPort() const; QString getPartnerNick() const; @@ -86,43 +77,55 @@ QString getFileName() const; KIO::filesize_t getFileSize() const; KIO::fileoffset_t getTransferringPosition() const; + KIO::fileoffset_t getTransferStartPosition() const; KURL getFileURL() const; bool isResumed() const; - unsigned long getCPS() const; - int getTimeRemaining() const; + bool isReverse() const; + QString getReverseToken() const; + transferspeed_t getAverageSpeed() const; + transferspeed_t getCurrentSpeed() const; + int getTimeLeft() const; int getProgress() const; + QDateTime getTimeTransferStarted() const; + QDateTime getTimeTransferFinished() const; - void runFile(); - void removeFile(); - void openFileInfoDialog(); - - void openDetailDialog(); - void closeDetailDialog(); - - signals: - void done( const DccTransfer* item ); - void statusChanged( const DccTransfer* item, int newStatus, int oldStatus ); + // common settings for DccTransferRecv / DccTransferSend - public slots: - virtual void start() = 0; - virtual void abort() = 0; + // REQUIRED + void setConnectionId( int connectionId ); + // REQUIRED + void setPartnerNick( const QString& nick ); + + signals: + void transferStarted( DccTransfer* item ); + void done( DccTransfer* item ); + void statusChanged( DccTransfer* item, int newStatus, int oldStatus ); - protected slots: - void updateView(); + public slots: + virtual bool queue(); + virtual void start() {}; + virtual void abort() {}; protected: - void setStatus( DccStatus status, const QString& statusDetail = QString::null ); - void initTransferMeter(); - void finishTransferMeter(); + void setStatus( DccStatus status, const QString& statusDetail = QString() ); + void startTransferLogger(); + void finishTransferLogger(); + static QString sanitizeFileName( const QString& fileName ); static QString getNumericalIpText( const QString& ipString ); static unsigned long intel( unsigned long value ); + protected slots: + void logTransfer(); + + protected: // transfer information - DccType m_dccType; - DccStatus m_dccStatus; - QString m_dccStatusDetail; + DccType m_type; + DccStatus m_status; + QString m_statusDetail; bool m_resumed; + bool m_reverse; + QString m_reverseToken; KIO::fileoffset_t m_transferringPosition; KIO::fileoffset_t m_transferStartPosition; @@ -131,6 +134,8 @@ QValueList m_transferPositionLog; // write per packet to calc CPS */ + // we'll communicate with the partner via this server + int m_connectionId; QString m_partnerNick; QString m_partnerIp; // null when unknown QString m_partnerPort; @@ -157,52 +162,25 @@ */ KURL m_fileURL; - DccPanel* m_panel; - - private slots: - void slotRemoveFileDone( KIO::Job* job ); - - void slotLogTransfer(); - private: - void updateTransferMeters(); + DccTransfer& operator = ( const DccTransfer& obj ); - void showProgressBar(); // called from printCell() - - void startAutoUpdateView(); - void stopAutoUpdateView(); - - // called from updateView() - virtual QString getTypeText() const = 0; - virtual QPixmap getTypeIcon() const = 0; - QPixmap getStatusIcon() const; - QString getStatusText() const; - QString getFileSizePrettyText() const; - QString getPositionPrettyText( bool detailed = false ) const; - QString getTimeRemainingPrettyText() const; - QString getCPSPrettyText() const; - QString getSenderAddressPrettyText() const; + void updateTransferMeters(); + private: QDateTime m_timeOffer; QDateTime m_timeTransferStarted; //QDateTime m_timeLastActive; QDateTime m_timeTransferFinished; - QTimer* m_transferLoggerTimer; - QTime m_transferLoggerBaseTime; // it's used for calculating CPS + QTimer m_loggerTimer; + QTime m_loggerBaseTime; // for calculating CPS QValueList m_transferLogTime; QValueList m_transferLogPosition; - // transfer meters; - double m_cps; // bytes(characters) per second - int m_timeRemaining; - - // UI - QTimer* m_autoUpdateViewTimer; - KProgress* m_progressBar; - DccDetailDialog* m_detailDialog; - - static QString s_dccStatusText[ DccStatusCount ]; - + transferspeed_t m_averageSpeed; + transferspeed_t m_currentSpeed; + int m_timeLeft; }; -#endif // DCCTRANSFER_H + +#endif // DCCTRANSFER_H diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransfermanager.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransfermanager.cpp --- konversation-1.0.1/konversation/src/dcctransfermanager.cpp 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransfermanager.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,238 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + Copyright (C) 2007 Shintaro Matsuoka +*/ + +#include "dcctransfermanager.h" +#include "dcctransferrecv.h" +#include "dcctransfersend.h" +#include "konversationapplication.h" +#include "preferences.h" + +#include + + +DccTransferManager::DccTransferManager( QObject* parent ) + : QObject( parent ) +{ + // initial number + m_nextReverseTokenNumber = 1001; + + m_defaultIncomingFolder = Preferences::dccPath(); + + connect( KonversationApplication::instance(), SIGNAL( appearanceChanged() ), + this, SLOT( slotSettingsChanged() ) ); +} + +DccTransferManager::~DccTransferManager() +{ + m_sendItems.clear(); + m_recvItems.clear(); +} + +DccTransferRecv* DccTransferManager::newDownload() +{ + DccTransferRecv* transfer = new DccTransferRecv(this); + m_recvItems.push_back( transfer ); + connect( transfer, SIGNAL( done( DccTransfer* ) ), this, SLOT( removeRecvItem( DccTransfer* ) ) ); + initTransfer( transfer ); + return transfer; +} + +DccTransferSend* DccTransferManager::newUpload() +{ + DccTransferSend* transfer = new DccTransferSend(this); + m_sendItems.push_back( transfer ); + connect( transfer, SIGNAL( done( DccTransfer* ) ), this, SLOT( removeSendItem( DccTransfer* ) ) ); + initTransfer( transfer ); + return transfer; +} + +DccTransferRecv* DccTransferManager::resumeDownload( int connectionId, const QString& partnerNick, const QString& fileName, const QString& ownPort, unsigned long position ) +{ + DccTransferRecv* transfer = 0; + + // find applicable one + QValueListConstIterator< DccTransferRecv* > it; + for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it ) + { + if ( ( (*it)->getStatus() == DccTransfer::Queued || (*it)->getStatus() == DccTransfer::WaitingRemote ) && + (*it)->getConnectionId() == connectionId && + (*it)->getPartnerNick() == partnerNick && + (*it)->getFileName() == fileName && + (*it)->isResumed() ) + { + transfer = (*it); + kdDebug() << "DccTransferManager::resumeDownload(): filename match: " << fileName << ", claimed port: " << ownPort << ", item port: " << transfer->getOwnPort() << endl; + // the port number can be changed behind NAT, so we pick an item which only the filename is correspondent in that case. + if ( transfer->getOwnPort() == ownPort ) + { + break; + } + } + } + + if ( transfer ) + transfer->startResume( position ); + + return transfer; +} + +DccTransferSend* DccTransferManager::resumeUpload( int connectionId, const QString& partnerNick, const QString& fileName, const QString& ownPort, unsigned long position ) +{ + DccTransferSend* transfer = 0; + + // find applicable one + QValueListConstIterator< DccTransferSend* > it; + for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it ) + { + if ( ( (*it)->getStatus() == DccTransfer::Queued || (*it)->getStatus() == DccTransfer::WaitingRemote ) && + (*it)->getConnectionId() == connectionId && + (*it)->getPartnerNick() == partnerNick && + (*it)->getFileName() == fileName && + !(*it)->isResumed() ) + { + transfer = (*it); + kdDebug() << "DccTransferManager::resumeUpload(): filename match: " << fileName << ", claimed port: " << ownPort << ", item port: " << transfer->getOwnPort() << endl; + // the port number can be changed behind NAT, so we pick an item which only the filename is correspondent in that case. + if ( transfer->getOwnPort() == ownPort ) + { + break; + } + } + } + + if ( transfer ) + transfer->setResume( position ); + + return transfer; +} + +DccTransferSend* DccTransferManager::startReverseSending( int connectionId, const QString& partnerNick, const QString& fileName, const QString& partnerHost, const QString& partnerPort, unsigned long fileSize, const QString& token ) +{ + kdDebug() << "DccTransferManager::startReverseSending(): server group ID: " << connectionId << ", partner: " << partnerNick << ", filename: " << fileName << ", partner IP: " << partnerHost << ", parnter port: " << partnerPort << ", filesize: " << fileSize << ", token: " << token << endl; + DccTransferSend* transfer = 0; + + // find applicable one + QValueListConstIterator< DccTransferSend* > it; + for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it ) + { + if ( + (*it)->getStatus() == DccTransfer::WaitingRemote && + (*it)->getConnectionId() == connectionId && + (*it)->getPartnerNick() == partnerNick && + (*it)->getFileName() == fileName && + (*it)->getFileSize() == fileSize && + (*it)->getReverseToken() == token + ) + { + transfer = (*it); + break; + } + } + + if ( transfer ) + transfer->connectToReceiver( partnerHost, partnerPort ); + + return transfer; +} + +void DccTransferManager::initTransfer( DccTransfer* transfer ) +{ + connect( transfer, SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, SLOT( slotTransferStatusChanged( DccTransfer*, int, int ) ) ); + + emit newTransferAdded( transfer ); +} + +bool DccTransferManager::isLocalFileInWritingProcess( const KURL& url ) const +{ + QValueListConstIterator< DccTransferRecv* > it; + for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it ) + { + if ( ( (*it)->getStatus() == DccTransfer::Connecting || + (*it)->getStatus() == DccTransfer::Transferring ) && + (*it)->getFileURL() == url ) + { + return true; + } + } + return false; +} + +int DccTransferManager::generateReverseTokenNumber() +{ + return m_nextReverseTokenNumber++; +} + +bool DccTransferManager::hasActiveTransfers() +{ + QValueListConstIterator< DccTransferSend* > it; + for ( it = m_sendItems.begin() ; it != m_sendItems.end() ; ++it ) + { + if ((*it)->getStatus() == DccTransfer::Transferring) + return true; + } + + QValueListConstIterator< DccTransferRecv* > it2; + for ( it2 = m_recvItems.begin() ; it2 != m_recvItems.end() ; ++it2 ) + { + if ((*it2)->getStatus() == DccTransfer::Transferring) + return true; + } + + return false; +} + +void DccTransferManager::slotTransferStatusChanged( DccTransfer* item, int newStatus, int oldStatus ) +{ + kdDebug() << "DccTransferManager::slotTransferStatusChanged(): " << oldStatus << " -> " << newStatus << " " << item->getFileName() << " (" << item->getType() << ")" << endl; + + if ( newStatus == DccTransfer::Queued ) + emit newTransferQueued( item ); +} + +void DccTransferManager::slotSettingsChanged() +{ + // update the default incoming directory for already existed DCCRECV items + if ( Preferences::dccPath() != m_defaultIncomingFolder ) + { + QValueListConstIterator< DccTransferRecv* > it; + for ( it = m_recvItems.begin() ; it != m_recvItems.end() ; ++it ) + { + if ( (*it)->getStatus() == DccTransfer::Queued && + (*it)->getFileURL().directory() == m_defaultIncomingFolder ) + { + KURL url; + url.setDirectory( Preferences::dccPath() ); + url.setFileName( (*it)->getFileURL().fileName() ); + (*it)->setFileURL( url ); + + emit fileURLChanged( *it ); + } + } + + m_defaultIncomingFolder = Preferences::dccPath(); + } +} + +void DccTransferManager::removeSendItem( DccTransfer* item_ ) +{ + DccTransferSend* item = static_cast< DccTransferSend* > ( item_ ); + m_sendItems.remove( item ); + item->deleteLater(); +} + +void DccTransferManager::removeRecvItem( DccTransfer* item_ ) +{ + DccTransferRecv* item = static_cast< DccTransferRecv* > ( item_ ); + m_recvItems.remove( item ); + item->deleteLater(); +} + +#include "dcctransfermanager.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransfermanager.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransfermanager.h --- konversation-1.0.1/konversation/src/dcctransfermanager.h 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransfermanager.h 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,95 @@ +/* + DccTransferManager controls DccTransfer instances. + All DccTransferRecv/DccTransferSend instances are created and deleted by this class. + Each DccTransfer instance is deleted immediately after its transfer done. +*/ + +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + Copyright (C) 2007 Shintaro Matsuoka +*/ + +#ifndef DCCTRANSFERMANAGER_H +#define DCCTRANSFERMANAGER_H + +#include "dcctransfer.h" + +#include +#include + + +class KURL; + +class DccTransferRecv; +class DccTransferSend; + +class DccTransferManager : public QObject +{ + Q_OBJECT + + public: + DccTransferManager( QObject* parent = 0 ); + ~DccTransferManager(); + + signals: + /* + * The status of the item is DccTransfer::Configuring when this signal is emitted. + */ + void newTransferAdded( DccTransfer* transfer ); + /* + * The status of the item is DccTransfer::Queued when this signal is emitted. + */ + void newTransferQueued( DccTransfer* transfer ); + + void fileURLChanged( DccTransferRecv* transfer ); + + public: + DccTransferRecv* newDownload(); + DccTransferSend* newUpload(); + + /** + * @return a DccTransferRecv item if applicable one found, otherwise 0. + */ + DccTransferRecv* resumeDownload(int connectionId, const QString& partnerNick, const QString& fileName, const QString& ownPort, unsigned long position ); + + /** + * @return a DccTransferSend item if applicable one found, otherwise 0. + */ + DccTransferSend* resumeUpload(int connectionId, const QString& partnerNick, const QString& fileName, const QString& ownPort, unsigned long position ); + + DccTransferSend* startReverseSending(int connectionId, const QString& partnerNick, const QString& fileName, const QString& partnerHost, const QString& partnerPort, unsigned long fileSize, const QString& token ); + + bool isLocalFileInWritingProcess( const KURL& localUrl ) const; + + int generateReverseTokenNumber(); + + bool hasActiveTransfers(); + + private: + /* + * initTransfer() does the common jobs for newDownload() and newUpload() + */ + void initTransfer( DccTransfer* transfer ); + + private slots: + void slotTransferStatusChanged( DccTransfer* item, int newStatus, int oldStatus ); + void removeSendItem( DccTransfer* item ); + void removeRecvItem( DccTransfer* item ); + + void slotSettingsChanged(); + + private: + QValueList< DccTransferSend* > m_sendItems; + QValueList< DccTransferRecv* > m_recvItems; + + int m_nextReverseTokenNumber; + QString m_defaultIncomingFolder; // store here to know if this settings is changed +}; + +#endif // DCCTRANSFERMANAGER_H diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransferpanel.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransferpanel.cpp --- konversation-1.0.1/konversation/src/dcctransferpanel.cpp 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransferpanel.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,459 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + begin: Mit Aug 7 2002 + copyright: (C) 2002 by Dario Abatianni + email: eisfuchs@tigress.com +*/ +// Copyright (C) 2004-2008 Shintaro Matsuoka + +#include "dcctransferpanel.h" +#include "konversationapplication.h" +#include "dcctransferdetailedinfopanel.h" +#include "dcctransfermanager.h" +#include "dcctransferpanelitem.h" +#include "dcctransfersend.h" +#include "preferences.h" + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +DccTransferPanel::DccTransferPanel(QWidget* parent) : ChatWindow(parent) +{ + setType(ChatWindow::DccTransferPanel); + setName(i18n("DCC Status")); + + initGUI(); + + connect( KonversationApplication::instance()->getDccTransferManager(), SIGNAL( newTransferAdded( DccTransfer* ) ), this, SLOT( slotNewTransferAdded( DccTransfer* ) ) ); +} + +DccTransferPanel::~DccTransferPanel() +{ + // remember column widths + QValueList columnWidths; + for ( uint i = 0 ; i < Column::COUNT ; ++i ) + columnWidths.push_back( m_listView->columnWidth( i ) ); + Preferences::setDccColumnWidths( columnWidths ); +} + +void DccTransferPanel::initGUI() +{ + setSpacing( 0 ); + + m_listView = new KListView(this,"dcc_control_panel"); + + m_listView->setSelectionMode(QListView::Extended); + m_listView->setDragEnabled(true); + m_listView->setAcceptDrops(true); + m_listView->setSorting(-1,false); + m_listView->setAllColumnsShowFocus(true); + + for(unsigned int i=0 ; i < Column::COUNT ; ++i) + m_listView->addColumn(""); + + //m_listView->setColumnText(Column::TypeIcon, ""); + m_listView->setColumnText(Column::OfferDate, i18n("Started at")); + m_listView->setColumnText(Column::Status, i18n("Status")); + m_listView->setColumnText(Column::FileName, i18n("File")); + m_listView->setColumnText(Column::PartnerNick, i18n("Partner")); + m_listView->setColumnText(Column::Progress, i18n("Progress")); + m_listView->setColumnText(Column::Position, i18n("Position")); + m_listView->setColumnText(Column::TimeLeft, i18n("Remaining")); + m_listView->setColumnText(Column::CurrentSpeed, i18n("Speed")); + m_listView->setColumnText(Column::SenderAddress, i18n("Sender Address")); + + QValueList columnWidths = Preferences::dccColumnWidths(); + for ( uint i = 0 ; i < Column::COUNT && i < columnWidths.count() ; ++i ) + m_listView->setColumnWidth( i, columnWidths[i] ); + + m_listView->setColumnWidthMode(Column::FileName, QListView::Manual); + + m_listView->setColumnAlignment(Column::OfferDate, AlignHCenter); + m_listView->setColumnAlignment(Column::Progress, AlignHCenter); + m_listView->setColumnAlignment(Column::Position, AlignHCenter); + m_listView->setColumnAlignment(Column::TimeLeft, AlignHCenter); + m_listView->setColumnAlignment(Column::CurrentSpeed, AlignHCenter); + + m_listView->setSorting(Column::OfferDate, false); + + connect(m_listView,SIGNAL (selectionChanged()),this,SLOT (updateButton()) ); + + // detailed info panel + m_detailPanel = new DccTransferDetailedInfoPanel(this); + + // button + + QHBox* buttonsBox=new QHBox(this); + buttonsBox->setSpacing(spacing()); + + // convenience, undeffed below again to avoid name clashes + #define icon(s) KGlobal::iconLoader()->loadIconSet( s, KIcon::Small ) + + m_buttonAccept = new QPushButton(icon("player_play"), i18n("Accept"), buttonsBox, "start_dcc"); + m_buttonAbort = new QPushButton(icon("stop"), i18n("Abort"), buttonsBox, "abort_dcc"); + m_buttonClear = new QPushButton(icon("editdelete"), i18n("Clear"), buttonsBox, "clear_dcc"); + m_buttonOpen = new QPushButton(icon("exec"), i18n("Open File"), buttonsBox, "open_dcc_file"); + m_buttonDetail = new QPushButton(icon("view_text"), i18n("Details"), buttonsBox, "detail_dcc"); + m_buttonDetail->setToggleButton( true ); + + QToolTip::add( m_buttonAccept, i18n( "Start receiving" ) ); + QToolTip::add( m_buttonAbort, i18n( "Abort the transfer(s)" ) ); + QToolTip::add( m_buttonOpen, i18n( "Run the file" ) ); + QToolTip::add( m_buttonDetail, i18n( "View DCC transfer details" ) ); + + connect( m_buttonAccept, SIGNAL(clicked()), this, SLOT(acceptDcc()) ); + connect( m_buttonAbort, SIGNAL(clicked()), this, SLOT(abortDcc()) ); + connect( m_buttonClear, SIGNAL(clicked()), this, SLOT(clearDcc()) ); + connect( m_buttonOpen, SIGNAL(clicked()), this, SLOT(runDcc()) ); + //connect( m_buttonDetail, SIGNAL(clicked()), this, SLOT(openDetail()) ); + connect( m_buttonDetail, SIGNAL(toggled(bool)), m_detailPanel, SLOT(setShown(bool)) ); + m_buttonDetail->setOn(true); + + + // popup menu + + m_popup = new KPopupMenu(this); + m_popup->insertItem( i18n("&Select All Items"), Popup::SelectAll); + m_popup->insertItem( i18n("S&elect All Completed Items"), Popup::SelectAllCompleted); + m_popup->insertSeparator(); // ----- + m_popup->insertItem(icon("player_play"), i18n("&Accept"), Popup::Accept); + m_popup->insertItem(icon("stop"), i18n("A&bort"), Popup::Abort); + m_popup->insertSeparator(); // ----- + // FIXME: make it neat + m_popup->insertItem(icon("redo"), i18n("Resend"), Popup::Resend); + m_popup->insertItem(icon("editdelete"), i18n("&Clear"), Popup::Clear); + m_popup->insertSeparator(); // ----- + m_popup->insertItem(icon("exec"), i18n("&Open File"), Popup::Open); + m_popup->insertItem(icon("messagebox_info"), i18n("File &Information"), Popup::Info); + + #undef icon + + connect(m_listView, SIGNAL(contextMenuRequested(QListViewItem*,const QPoint&,int)), this, SLOT(popupRequested(QListViewItem*,const QPoint&,int))); + connect(m_popup, SIGNAL(activated(int)), this, SLOT(popupActivated(int))); + + // misc. + connect(m_listView, SIGNAL(doubleClicked(QListViewItem*,const QPoint&,int)), this, SLOT(doubleClicked(QListViewItem*,const QPoint&,int))); + + connect(m_listView, SIGNAL(currentChanged(QListViewItem*)), this, SLOT(setDetailPanelItem(QListViewItem*))); + + updateButton(); +} + +void DccTransferPanel::slotNewTransferAdded( DccTransfer* transfer ) +{ + DccTransferPanelItem* item = new DccTransferPanelItem( this, transfer ); + connect( transfer, SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, SLOT( slotTransferStatusChanged() ) ); + if ( m_listView->childCount() == 1 ) + { + m_listView->clearSelection(); + m_listView->setSelected( item, true ); + m_listView->setCurrentItem( item ); + updateButton(); + setDetailPanelItem( item ); + } +} + +void DccTransferPanel::slotTransferStatusChanged() +{ + updateButton(); + activateTabNotification(Konversation::tnfSystem); +} + +void DccTransferPanel::updateButton() +{ + bool accept = true, + abort = false, + clear = false, + info = true, + open = true, + resend = false, + selectAll = false, + selectAllCompleted = false; + + int selectedItems = 0; + QListViewItemIterator it( m_listView ); + + while( it.current() ) + { + DccTransferPanelItem* item = static_cast( it.current() ); + + DccTransfer::DccType type = item->transfer()->getType(); + DccTransfer::DccStatus status = item->transfer()->getStatus(); + + selectAll = true; + selectAllCompleted |= ( status >= DccTransfer::Done ); + + if( it.current()->isSelected() ) + { + ++selectedItems; + + accept &= ( status == DccTransfer::Queued ); + + abort |= ( status < DccTransfer::Done ); + + clear |= ( status >= DccTransfer::Done ); + + info &= ( type == DccTransfer::Send || + status == DccTransfer::Done ); + + open &= ( type == DccTransfer::Send || + status == DccTransfer::Done ); + + resend |= ( type == DccTransfer::Send && + status >= DccTransfer::Done ); + } + ++it; + } + + if( !selectedItems ) + { + accept = false; + abort = false; + clear = false; + info = false; + open = false; + resend = false; + } + + if (!kapp->authorize("allow_downloading")) + { + accept = false; + } + + m_buttonAccept->setEnabled( accept ); + m_buttonAbort->setEnabled( abort ); + m_buttonClear->setEnabled( clear ); + m_buttonOpen->setEnabled( open ); + + m_popup->setItemEnabled( Popup::SelectAll, selectAll ); + m_popup->setItemEnabled( Popup::SelectAllCompleted, selectAllCompleted ); + m_popup->setItemEnabled( Popup::Accept, accept ); + m_popup->setItemEnabled( Popup::Abort, abort ); + m_popup->setItemEnabled( Popup::Clear, clear ); + m_popup->setItemEnabled( Popup::Open, open ); + m_popup->setItemEnabled( Popup::Resend, resend ); + m_popup->setItemEnabled( Popup::Info, info ); +} + +void DccTransferPanel::setDetailPanelItem(QListViewItem* item_) +{ + if ( item_ ) + { + DccTransferPanelItem* item = static_cast< DccTransferPanelItem* >( item_ ); + m_detailPanel->setItem( item ); + } +} + +void DccTransferPanel::acceptDcc() +{ + QListViewItemIterator it( m_listView ); + while( it.current() ) + { + if( it.current()->isSelected() ) + { + DccTransferPanelItem* item=static_cast( it.current() ); + DccTransfer* transfer = item->transfer(); + if( transfer->getType() == DccTransfer::Receive && transfer->getStatus() == DccTransfer::Queued ) + transfer->start(); + } + ++it; + } +} + +void DccTransferPanel::abortDcc() +{ + QListViewItemIterator it( m_listView ); + while( it.current() ) + { + if( it.current()->isSelected() ) + { + DccTransferPanelItem* item=static_cast( it.current() ); + DccTransfer* transfer = item->transfer(); + if( transfer->getStatus() < DccTransfer::Done ) + transfer->abort(); + } + ++it; + } +} + +void DccTransferPanel::resendFile() +{ + QListViewItemIterator it( m_listView ); + while( it.current() ) + { + if( it.current()->isSelected() ) + { + DccTransferPanelItem* item=static_cast( it.current() ); + DccTransfer* transfer = item->transfer(); + if( transfer->getType() == DccTransfer::Send && transfer->getStatus() >= DccTransfer::Done ) + { + DccTransferSend* newTransfer = KonversationApplication::instance()->getDccTransferManager()->newUpload(); + + newTransfer->setConnectionId( transfer->getConnectionId() ); + newTransfer->setPartnerNick( transfer->getPartnerNick() ); + newTransfer->setFileURL( transfer->getFileURL() ); + newTransfer->setFileName( transfer->getFileName() ); + // FIXME + newTransfer->setOwnIp( transfer->getOwnIp() ); + + if ( newTransfer->queue() ) + newTransfer->start(); + } + } + ++it; + } +} + +void DccTransferPanel::clearDcc() +{ + QPtrList lst; + QListViewItemIterator it( m_listView ); + while( it.current() ) + { + DccTransferPanelItem* item = static_cast( it.current() ); + // should we check that [item] is not null? + if( it.current()->isSelected() && item->transfer()->getStatus() >= DccTransfer::Done ) + lst.append( it.current() ); + ++it; + } + + // Figure out the first 'gap' in the selection and select that item, + // or, if there are no gaps, select first item below the selection + QPtrListIterator selected( lst ); + bool itemSelected = false; + while( selected.current() ) + { + if (selected.current()->itemBelow() && !lst.containsRef(selected.current()->itemBelow())) + { + m_listView->setSelected(selected.current()->itemBelow(),true); + m_listView->setCurrentItem(selected.current()->itemBelow()); + itemSelected = true; + break; + } + ++selected; + } + + // When there are neither gaps in nor items below the selection, select the first item + if (!itemSelected) + { + m_listView->setSelected(m_listView->firstChild(),true); + m_listView->setCurrentItem(m_listView->firstChild()); + } + + lst.setAutoDelete( true ); + while( lst.remove() ) ; + updateButton(); +} + +void DccTransferPanel::runDcc() +{ + QListViewItemIterator it( m_listView ); + while( it.current() ) + { + if( it.current()->isSelected() ) + { + DccTransferPanelItem* item=static_cast( it.current() ); + DccTransfer* transfer = item->transfer(); + if( transfer->getType() == DccTransfer::Send || transfer->getStatus() == DccTransfer::Done ) + item->runFile(); + } + ++it; + } +} + +void DccTransferPanel::showFileInfo() +{ + QListViewItemIterator it( m_listView ); + while( it.current() ) + { + if( it.current()->isSelected() ) + { + DccTransferPanelItem* item=static_cast( it.current() ); + if( item->transfer()->getType() == DccTransfer::Send || item->transfer()->getStatus() == DccTransfer::Done ) + item->openFileInfoDialog(); + } + ++it; + } +} + +void DccTransferPanel::selectAll() +{ + QListViewItemIterator it( m_listView ); + while ( it.current() ) + { + m_listView->setSelected( *it, true ); + ++it; + } + updateButton(); +} + +void DccTransferPanel::selectAllCompleted() +{ + QListViewItemIterator it( m_listView ); + while ( it.current() ) + { + DccTransferPanelItem* item=static_cast( it.current() ); + m_listView->setSelected( *it, item->transfer()->getStatus() >= DccTransfer::Done ); + ++it; + } + updateButton(); +} + +void DccTransferPanel::popupRequested(QListViewItem* /* item */, const QPoint& pos, int /* col */) // slot +{ + updateButton(); + m_popup->popup(pos); +} + +void DccTransferPanel::popupActivated( int id ) // slot +{ + if ( id == Popup::Abort ) abortDcc(); + else if ( id == Popup::Accept ) acceptDcc(); + else if ( id == Popup::Clear ) clearDcc(); + else if ( id == Popup::Info ) showFileInfo(); + else if ( id == Popup::Open ) runDcc(); + else if ( id == Popup::SelectAll ) selectAll(); + else if ( id == Popup::SelectAllCompleted ) selectAllCompleted(); + else if ( id == Popup::Resend ) resendFile(); +} + +void DccTransferPanel::doubleClicked(QListViewItem* _item, const QPoint& /* _pos */, int /* _col */) +{ + DccTransferPanelItem* item = static_cast(_item); + item->runFile(); +} + +// virtual +void DccTransferPanel::childAdjustFocus() +{ +} + +KListView* DccTransferPanel::getListView() +{ + return m_listView; +} + +#include "dcctransferpanel.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransferpanel.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransferpanel.h --- konversation-1.0.1/konversation/src/dcctransferpanel.h 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransferpanel.h 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,113 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +/* + begin: Mit Aug 7 2002 + copyright: (C) 2002 by Dario Abatianni + email: eisfuchs@tigress.com +*/ +// Copyright (C) 2004-2007 Shintaro Matsuoka + +#ifndef DCCTRANSFERPANEL_H +#define DCCTRANSFERPANEL_H + +#include "chatwindow.h" +#include "dcctransferpanelitem.h" + + +class QContextMenuEvent; +class QPushButton; +class KListView; +class KPopupMenu; + +class DccTransferDetailedInfoPanel; + +class DccTransferPanel : public ChatWindow +{ + Q_OBJECT + + public: + class Column + { + public: + enum Object + { + TypeIcon, + OfferDate, + Status, + FileName, + PartnerNick, + Progress, + Position, + TimeLeft, + CurrentSpeed, + SenderAddress, + COUNT + }; + }; + + class Popup + { + public: + enum Object + { + SelectAll, + SelectAllCompleted, + Accept, + Abort, + Clear, + Open, + Info, + Resend + }; + }; + + DccTransferPanel(QWidget* parent); + ~DccTransferPanel(); + + KListView* getListView(); + + protected slots: + void slotNewTransferAdded( DccTransfer* transfer ); + void slotTransferStatusChanged(); + + void acceptDcc(); + void abortDcc(); + void resendFile(); + void clearDcc(); + void runDcc(); + void showFileInfo(); + void selectAll(); + void selectAllCompleted(); + + void popupRequested(QListViewItem* item,const QPoint& pos,int col); + void popupActivated(int id); + + void doubleClicked(QListViewItem* _item,const QPoint& _pos,int _col); + + void updateButton(); + + void setDetailPanelItem(QListViewItem* item_); + + protected: + /** Called from ChatWindow adjustFocus */ + virtual void childAdjustFocus(); + + void initGUI(); + + KListView* m_listView; + KPopupMenu* m_popup; + + DccTransferDetailedInfoPanel* m_detailPanel; + + QPushButton* m_buttonAccept; + QPushButton* m_buttonAbort; + QPushButton* m_buttonClear; + QPushButton* m_buttonOpen; + QPushButton* m_buttonDetail; +}; +#endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransferpanelitem.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransferpanelitem.cpp --- konversation-1.0.1/konversation/src/dcctransferpanelitem.cpp 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransferpanelitem.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,403 @@ +/* + begin: Mit Aug 7 2002 + copyright: (C) 2002 by Dario Abatianni + email: eisfuchs@tigress.com +*/ +// Copyright (C) 2004-2007 Shintaro Matsuoka +// Copyright (C) 2004,2005 John Tapsell + +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +#include "dcctransferpanelitem.h" +#include "dcctransferpanel.h" +#include "konversationapplication.h" +#include "config/preferences.h" + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +DccTransferPanelItem::DccTransferPanelItem( DccTransferPanel* panel, DccTransfer* transfer ) + : KListViewItem( panel->getListView() ) + , m_panel( panel ) + , m_transfer( transfer ) + , m_isTransferInstanceBackup( false ) +{ + m_autoUpdateViewTimer = 0; + + m_progressBar = new KProgress( 100, listView()->viewport() ); + m_progressBar->setCenterIndicator( true ); + m_progressBar->setPercentageVisible( true ); + + connect( m_transfer, SIGNAL( transferStarted( DccTransfer* ) ), this, SLOT( startAutoViewUpdate() ) ); + connect( m_transfer, SIGNAL( done( DccTransfer* ) ), this, SLOT( stopAutoViewUpdate() ) ); + connect( m_transfer, SIGNAL( done( DccTransfer* ) ), this, SLOT( backupTransferInfo( DccTransfer* ) ) ); + + connect( m_transfer, SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, SLOT( slotStatusChanged( DccTransfer*, int, int ) ) ); + + updateView(); +} + +DccTransferPanelItem::~DccTransferPanelItem() +{ + kdDebug() << "DccTransferPanelItem::~DccTransferPanelItem()" << endl; + stopAutoViewUpdate(); + delete m_progressBar; + if ( m_isTransferInstanceBackup ) + delete m_transfer; +} + +void DccTransferPanelItem::updateView() +{ + setPixmap( DccTransferPanel::Column::TypeIcon, getTypeIcon() ); + setPixmap( DccTransferPanel::Column::Status, getStatusIcon() ); + + setText( DccTransferPanel::Column::OfferDate, m_transfer->getTimeOffer().toString( "hh:mm:ss" ) ); + setText( DccTransferPanel::Column::Status, getStatusText() ); + setText( DccTransferPanel::Column::FileName, m_transfer->getFileName() ); + setText( DccTransferPanel::Column::PartnerNick, m_transfer->getPartnerNick() ); + setText( DccTransferPanel::Column::Position, getPositionPrettyText() ); + setText( DccTransferPanel::Column::TimeLeft, getTimeLeftPrettyText() ); + setText( DccTransferPanel::Column::CurrentSpeed, getCurrentSpeedPrettyText() ); + setText( DccTransferPanel::Column::SenderAddress, getSenderAddressPrettyText() ); + + if ( m_transfer->getFileSize() ) + m_progressBar->setProgress( m_transfer->getProgress() ); + else // filesize is unknown + { + m_progressBar->hide(); + setText( DccTransferPanel::Column::Progress, i18n( "unknown" ) ); + } +} + + +int DccTransferPanelItem::compare( QListViewItem* i, int col, bool ascending ) const +{ + DccTransferPanelItem* item = static_cast( i ); + + switch ( col ) + { + case DccTransferPanel::Column::TypeIcon: + if ( m_transfer->getType() > item->transfer()->getType() ) return 1; + if ( m_transfer->getType() < item->transfer()->getType() ) return -1; + return 0; + break; + case DccTransferPanel::Column::OfferDate: + if ( m_transfer->getTimeOffer() > item->transfer()->getTimeOffer() ) return 1; + if ( m_transfer->getTimeOffer() < item->transfer()->getTimeOffer() ) return -1; + return 0; + break; + case DccTransferPanel::Column::Status: + if ( m_transfer->getStatus() > item->transfer()->getStatus() ) return 1; + if ( m_transfer->getStatus() < item->transfer()->getStatus() ) return -1; + return 0; + break; + case DccTransferPanel::Column::Position: + if ( m_transfer->getTransferringPosition() > item->transfer()->getTransferringPosition() ) return 1; + if ( m_transfer->getTransferringPosition() < item->transfer()->getTransferringPosition() ) return -1; + return 0; + break; + case DccTransferPanel::Column::TimeLeft: + if ( m_transfer->getTimeLeft() > item->transfer()->getTimeLeft() ) return 1; + if ( m_transfer->getTimeLeft() < item->transfer()->getTimeLeft() ) return -1; + return 0; + break; + case DccTransferPanel::Column::CurrentSpeed: + if ( m_transfer->getCurrentSpeed() > item->transfer()->getCurrentSpeed() ) return 1; + if ( m_transfer->getCurrentSpeed() < item->transfer()->getCurrentSpeed() ) return -1; + return 0; + break; + default: + return QListViewItem::compare( i, col, ascending ); + } + return QListViewItem::compare( i, col, ascending ); +} + +void DccTransferPanelItem::slotStatusChanged( DccTransfer* /* transfer */, int newStatus, int /* oldStatus */ ) +{ + updateView(); + + if ( newStatus == DccTransfer::Transferring ) + startAutoViewUpdate(); +} + +void DccTransferPanelItem::startAutoViewUpdate() +{ + stopAutoViewUpdate(); + m_autoUpdateViewTimer = new QTimer( this ); + connect( m_autoUpdateViewTimer, SIGNAL( timeout() ), this, SLOT( updateView()) ); + m_autoUpdateViewTimer->start( 500 ); +} + +void DccTransferPanelItem::stopAutoViewUpdate() +{ + if ( m_autoUpdateViewTimer ) + { + m_autoUpdateViewTimer->stop(); + delete m_autoUpdateViewTimer; + m_autoUpdateViewTimer = 0; + } +} + +void DccTransferPanelItem::paintCell( QPainter* painter, const QColorGroup& colorgroup, int column, int width, int alignment ) // virtual public +{ + KListViewItem::paintCell( painter, colorgroup, column, width, alignment ); + if ( column == DccTransferPanel::Column::Progress ) + showProgressBar(); +} + +void DccTransferPanelItem::showProgressBar() +{ + if ( m_transfer->getFileSize() ) + { + QRect rect = listView()->itemRect( this ); + QHeader *head = listView()->header(); + rect.setLeft( head->sectionPos( DccTransferPanel::Column::Progress ) - head->offset() ); + rect.setWidth( head->sectionSize( DccTransferPanel::Column::Progress ) ); + m_progressBar->setGeometry( rect ); + m_progressBar->show(); + } +} + +void DccTransferPanelItem::runFile() +{ + if ( m_transfer->getType() == DccTransfer::Send || m_transfer->getStatus() == DccTransfer::Done ) + new KRun( m_transfer->getFileURL(), listView() ); +} + +void DccTransferPanelItem::openFileInfoDialog() +{ + if ( m_transfer->getType() == DccTransfer::Send || m_transfer->getStatus() == DccTransfer::Done ) + { + QStringList infoList; + + QString path=m_transfer->getFileURL().path(); + + // get meta info object + KFileMetaInfo fileInfo(path,QString(),KFileMetaInfo::Everything); + + // is there any info for this file? + if(!fileInfo.isEmpty()) + { + // get list of meta information groups + QStringList groupList=fileInfo.groups(); + // look inside for keys + for(unsigned int index=0;index"+infoList.join("
")+"", + i18n("File Information") + ); + #endif + } + } + else + { + KMessageBox::sorry(listView(),i18n("No detailed information for this file found."),i18n("File Information")); + } + } +} + +void DccTransferPanelItem::backupTransferInfo( DccTransfer* transfer ) +{ + kdDebug() << "DccTransferPanelItem::backupTransferInfo()" << endl; + // instances of DccTransfer are deleted immediately after the transfer is done + // so we need to make a backup of DccTransfer. + + m_transfer = new DccTransfer( *transfer ); + m_isTransferInstanceBackup = true; +} + +QString DccTransferPanelItem::getTypeText() const +{ + if ( m_transfer->getType() == DccTransfer::Send ) + return i18n( "Send" ); + else + return i18n( "Receive" ); +} + +QPixmap DccTransferPanelItem::getTypeIcon() const +{ + if ( m_transfer->getType() == DccTransfer::Send ) + return KGlobal::iconLoader()->loadIcon( "up", KIcon::Small ); + else + return KGlobal::iconLoader()->loadIcon( "down", KIcon::Small ); +} + +QPixmap DccTransferPanelItem::getStatusIcon() const +{ + QString icon; + switch ( m_transfer->getStatus() ) + { + case DccTransfer::Queued: + icon = "player_stop"; + break; + case DccTransfer::Preparing: + case DccTransfer::WaitingRemote: + case DccTransfer::Connecting: + icon = "goto"; + break; + case DccTransfer::Transferring: + icon = "player_play"; + break; + case DccTransfer::Done: + icon = "ok"; + break; + case DccTransfer::Aborted: + case DccTransfer::Failed: + icon = "stop"; + break; + default: + break; + } + return KGlobal::iconLoader()->loadIcon( icon, KIcon::Small ); +} + +QString DccTransferPanelItem::getStatusText() const +{ + DccTransfer::DccStatus status = m_transfer->getStatus(); + DccTransfer::DccType type = m_transfer->getType(); + + if ( status == DccTransfer::Queued ) + return i18n( "Queued" ); + else if ( status == DccTransfer::Preparing ) + return i18n( "Preparing" ); + else if ( status == DccTransfer::WaitingRemote ) + return i18n( "Awaiting" ); + else if ( status == DccTransfer::Connecting ) + return i18n( "Connecting" ); + else if ( status == DccTransfer::Transferring && type == DccTransfer::Receive ) + return i18n( "Receiving" ); + else if ( status == DccTransfer::Transferring && type == DccTransfer::Send ) + return i18n( "Sending" ); + else if ( status == DccTransfer::Done ) + return i18n( "Done" ); + else if ( status == DccTransfer::Failed ) + return i18n( "Failed" ); + else if ( status == DccTransfer::Aborted ) + return i18n( "Aborted" ); + + return QString(); +} + +QString DccTransferPanelItem::getFileSizePrettyText() const +{ + return KIO::convertSize( m_transfer->getFileSize() ); +} + +QString DccTransferPanelItem::getPositionPrettyText( bool detailed ) const +{ + if ( detailed ) + return KGlobal::locale()->formatNumber( m_transfer->getTransferringPosition(), 0 ) + " / " + + KGlobal::locale()->formatNumber( m_transfer->getFileSize(), 0 ); + else + return KIO::convertSize( m_transfer->getTransferringPosition() ) + " / " + KIO::convertSize( m_transfer->getFileSize() ); +} + +QString DccTransferPanelItem::getTimeLeftPrettyText() const +{ + QString text; + + if ( m_transfer->getTimeLeft() == DccTransfer::NotInTransfer ) + ; + else if ( m_transfer->getTimeLeft() == DccTransfer::InfiniteValue ) + text = "?"; + else + text = secToHMS( m_transfer->getTimeLeft() ); + + return text; +} + +QString DccTransferPanelItem::getAverageSpeedPrettyText() const +{ + return getSpeedPrettyText( m_transfer->getAverageSpeed() ); +} + +QString DccTransferPanelItem::getCurrentSpeedPrettyText() const +{ + return getSpeedPrettyText( m_transfer->getCurrentSpeed() ); +} + +QString DccTransferPanelItem::getSenderAddressPrettyText() const +{ + if ( m_transfer->getType() == DccTransfer::Send ) + return QString( "%1:%2" ).arg( m_transfer->getOwnIp() ).arg( m_transfer->getOwnPort() ); + else + return QString( "%1:%2" ).arg( m_transfer->getPartnerIp() ).arg( m_transfer->getPartnerPort() ); +} + +QString DccTransferPanelItem::getSpeedPrettyText( transferspeed_t speed ) +{ + if ( speed == DccTransfer::Calculating || speed == DccTransfer::InfiniteValue ) + return QString( "?" ); + else if ( speed == DccTransfer::NotInTransfer ) + return QString(); + else + return i18n("%1/sec").arg( KIO::convertSize( (KIO::fileoffset_t)speed ) ); +} + +QString DccTransferPanelItem::secToHMS( long sec ) +{ + int remSec = sec; + int remHour = remSec / 3600; remSec -= remHour * 3600; + int remMin = remSec / 60; remSec -= remMin * 60; + + // remHour can be more than 25, so we can't use QTime here. + return QString( "%1:%2:%3" ) + .arg( QString::number( remHour ).rightJustify( 2, '0', false ) ) + .arg( QString::number( remMin ).rightJustify( 2, '0' ) ) + .arg( QString::number( remSec ).rightJustify( 2, '0' ) ); +} + +#include "dcctransferpanelitem.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransferpanelitem.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransferpanelitem.h --- konversation-1.0.1/konversation/src/dcctransferpanelitem.h 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransferpanelitem.h 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,98 @@ +/* + begin: Mit Aug 7 2002 + copyright: (C) 2002 by Dario Abatianni + email: eisfuchs@tigress.com +*/ +// Copyright (C) 2004-2007 Shintaro Matsuoka +// Copyright (C) 2004,2005 John Tapsell + +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ + +#ifndef DCCTRANSFERPANELITEM_H +#define DCCTRANSFERPANELITEM_H + +#include "dcctransfer.h" + +#include + +#include +#include +#include + + +class QStringList; +class QTimer; + +class KProgress; + +namespace KIO +{ + class Job; +} + +class DccTransferPanel; + +class DccTransferPanelItem : public QObject, public KListViewItem +{ + Q_OBJECT + + public: + DccTransferPanelItem( DccTransferPanel* panel, DccTransfer* transfer ); + virtual ~DccTransferPanelItem(); + + virtual void paintCell( QPainter* painter, const QColorGroup& colorgroup, int column, int width, int alignment ); + + virtual int compare( QListViewItem* i, int col, bool ascending ) const; + + void runFile(); + void openFileInfoDialog(); + + DccTransfer* transfer() const { return m_transfer; } + + // called from updateView() + QString getTypeText() const; + QPixmap getTypeIcon() const; + QPixmap getStatusIcon() const; + QString getStatusText() const; + QString getFileSizePrettyText() const; + QString getPositionPrettyText( bool detailed = false ) const; + QString getTimeLeftPrettyText() const; + QString getAverageSpeedPrettyText() const; + QString getCurrentSpeedPrettyText() const; + QString getSenderAddressPrettyText() const; + + static QString getSpeedPrettyText( transferspeed_t speed ); + static QString secToHMS( long sec ); + + private slots: + void slotStatusChanged( DccTransfer* transfer, int newStatus, int oldStatus ); + void updateView(); + + private: + DccTransferPanel* m_panel; + DccTransfer* m_transfer; + bool m_isTransferInstanceBackup; + + private slots: + void startAutoViewUpdate(); + void stopAutoViewUpdate(); + + void backupTransferInfo( DccTransfer* transfer ); + + private: + void updateTransferInfo(); + void updateTransferMeters(); + + void showProgressBar(); // called from printCell() + + // UI + QTimer* m_autoUpdateViewTimer; + KProgress* m_progressBar; +}; + +#endif // DCCTRANSFERPANELITEM_H diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransferrecv.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransferrecv.cpp --- konversation-1.0.1/konversation/src/dcctransferrecv.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransferrecv.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -4,7 +4,7 @@ copyright: (C) 2002 by Dario Abatianni email: eisfuchs@tigress.com */ -// Copyright (C) 2004,2005 Shintaro Matsuoka +// Copyright (C) 2004-2007 Shintaro Matsuoka // Copyright (C) 2004,2005 John Tapsell /* @@ -14,13 +14,20 @@ (at your option) any later version. */ -#include +#include "dcctransferrecv.h" +#include "dcccommon.h" +#include "channel.h" +#include "dcctransfermanager.h" +#include "konversationapplication.h" +#include "connectionmanager.h" +#include "server.h" #include #include #include #include #include +#include #include #include #include @@ -30,109 +37,38 @@ #include #include -#include "dccpanel.h" -#include "dccresumedialog.h" -#include "dcctransferrecv.h" -#include "konversationapplication.h" + +class DccResumeDialog; /* *flow chart* DccTransferRecv() - start() : called from DccPanel or DccDetailDialog when user pushes the accept button + start() : called from DccTransferPanel when user pushes the accept button | \ | requestResume() : called when user chooses to resume in DccResumeDialog. it emits the signal ResumeRequest() | - | startResume() : called from "Server" + | startResume() : called by "Server" | | connectToSender() -connectionSuccess() : called from recvSocket +connectionSuccess() : called by recvSocket */ -DccTransferRecv::DccTransferRecv( DccPanel* panel, const QString& partnerNick, const KURL& defaultFolderURL, const QString& fileName, unsigned long fileSize, const QString& partnerIp, const QString& partnerPort ) -: DccTransfer( panel, DccTransfer::Receive, partnerNick ) +DccTransferRecv::DccTransferRecv(QObject* parent) + : DccTransfer( DccTransfer::Receive, parent ) { - kdDebug() << "DccTransferRecv::DccTransferRecv() [BEGIN]" << endl - << "DccTransferRecv::DccTransferRecv(): Partner: " << partnerNick << endl - << "DccTransferRecv::DccTransferRecv(): File: " << fileName << endl - << "DccTransferRecv::DccTransferRecv(): Sanitised Filename: " << m_fileName << endl - << "DccTransferRecv::DccTransferRecv(): FileSize: " << fileSize << endl - << "DccTransferRecv::DccTransferRecv(): Partner Address: " << partnerIp << ":" << partnerPort << endl; + kdDebug() << "DccTransferRecv::DccTransferRecv()" << endl; + m_serverSocket = 0; m_recvSocket = 0; m_writeCacheHandler = 0; - m_fileName = fileName; - m_fileSize = fileSize; - m_partnerIp = partnerIp; - m_partnerPort = partnerPort; - m_connectionTimer = new QTimer( this ); connect( m_connectionTimer, SIGNAL( timeout() ), this, SLOT( connectionTimeout() ) ); //timer hasn't started yet. qtimer will be deleted automatically when 'this' object is deleted - - // determine default incoming file URL - - // set default folder - if ( !defaultFolderURL.isEmpty() ) - m_fileURL = defaultFolderURL; - else - // default folder is *not* specified - m_fileURL.setPath( KUser( KUser::UseRealUserID ).homeDir() ); - // add a slash if there is none - m_fileURL.adjustPath( 1 ); - // Append folder with partner's name if wanted - if ( Preferences::dccCreateFolder() ) - m_fileURL.addPath( m_partnerNick + '/' ); - - if (!kapp->authorize("allow_downloading")) - { - //note we have this after the initialisations so that item looks okay - //Do not have the rights to send the file. Shouldn't have gotten this far anyway - failed(i18n("The admin has restricted the right to receive files")); - return; - } - - // set default filename - // note: Don't edit m_fileName. (i.e. leave it as it is) - // because we need the original file name to resume its transfer. - //Just incase anyone tries to do anything nasty - QString fileNameTmp = QFileInfo( m_fileName ).fileName(); - if ( fileNameTmp.startsWith( "." ) ) - fileNameTmp.replace( 0, 1, '_' ); // Don't create hidden files - if ( fileNameTmp.isEmpty() ) - fileNameTmp = "unnamed"; - - // Append partner's name to file name if wanted - if ( Preferences::dccAddPartner() ) - m_fileURL.addPath( m_partnerNick + '.' + fileNameTmp ); - else - m_fileURL.addPath( fileNameTmp ); - - kdDebug() << "DccTransferRecv::calculateSaveToFileURL(): Default URL: " << m_fileURL.prettyURL() << endl; - - setStatus( Queued ); - updateView(); - - panel->selectMe( this ); - - // TODO: should we support it? - if ( fileSize == 0 ) - { - failed( i18n( "Unsupported negotiation (filesize=0)" ) ); - return; - } - - if ( Preferences::dccAutoGet() ) - { - kdDebug() << "DccTransferRecv::DccTransferRecv(): starting automatically..." << endl; - start(); - } - - kdDebug() << "DccTransferRecv::DccTransferRecv() [END]" << endl; } DccTransferRecv::~DccTransferRecv() @@ -155,7 +91,12 @@ kdDebug() << "DccTransferRecv::cleanUp()" << endl; stopConnectionTimer(); - finishTransferMeter(); + finishTransferLogger(); + if ( m_serverSocket ) + { + m_serverSocket->close(); + m_serverSocket = 0; + } if ( m_recvSocket ) { m_recvSocket->close(); @@ -172,16 +113,119 @@ // just for convenience void DccTransferRecv::failed( const QString& errorMessage ) { - // don't show the dialog if user didn't take action on this DCC - bool bNeedToOpenDetail = ( m_dccStatus != Queued ); - setStatus( Failed, errorMessage ); - updateView(); cleanUp(); emit done( this ); +} + +void DccTransferRecv::setPartnerIp( const QString& ip ) +{ + if ( getStatus() == Configuring ) + m_partnerIp = ip; +} + +void DccTransferRecv::setPartnerPort( const QString& port ) +{ + if ( getStatus() == Configuring ) + m_partnerPort = port; +} - if ( bNeedToOpenDetail ) - openDetailDialog(); +void DccTransferRecv::setFileSize( unsigned long fileSize ) +{ + if ( getStatus() == Configuring ) + m_fileSize = fileSize; +} + +void DccTransferRecv::setFileName( const QString& fileName ) +{ + if ( getStatus() == Configuring ) + m_fileName = fileName; +} + +void DccTransferRecv::setFileURL( const KURL& url ) +{ + if ( getStatus() == Configuring || getStatus() == Queued ) + m_fileURL = url; +} + +void DccTransferRecv::setReverse( bool reverse, const QString& reverseToken ) +{ + if ( getStatus() == Configuring ) + { + m_reverse = reverse; + if ( reverse ) + { + m_partnerPort = QString::number( 0 ); + m_reverseToken = reverseToken; + } + } +} + +bool DccTransferRecv::queue() +{ + kdDebug() << "DccTransferRecv::queue()" << endl; + + if ( getStatus() != Configuring ) + return false; + + if ( m_partnerIp.isEmpty() || m_partnerPort.isEmpty() ) + return false; + + if (!kapp->authorize("allow_downloading")) + { + //note we have this after the initialisations so that item looks okay + //Do not have the rights to send the file. Shouldn't have gotten this far anyway + failed(i18n("The admin has restricted the right to receive files")); + return false; + } + + // check if the sender IP is valid + if ( m_partnerIp == "0.0.0.0" ) + { + failed( i18n( "Invalid sender address (%1)" ).arg( m_partnerIp ) ); + return false; + } + + // TODO: should we support it? + if ( m_fileSize == 0 ) + { + failed( i18n( "Unsupported negotiation (filesize=0)" ) ); + return false; + } + + if ( m_fileName.isEmpty() ) + { + m_fileName = "unnamed_file"; + } + + if ( m_fileURL.isEmpty() ) + { + // determine default incoming file URL + + // set default folder + if ( !Preferences::dccPath().isEmpty() ) + m_fileURL = KURL( Preferences::dccPath() ); + else + m_fileURL.setPath( KUser( KUser::UseRealUserID ).homeDir() ); // default folder is *not* specified + + // add a slash if there is none + m_fileURL.adjustPath( 1 ); + + // Append folder with partner's name if wanted + if ( Preferences::dccCreateFolder() ) + m_fileURL.addPath( m_partnerNick + '/' ); + + // Just incase anyone tries to do anything nasty + QString fileNameSanitized = sanitizeFileName( m_fileName ); + + // Append partner's name to file name if wanted + if ( Preferences::dccAddPartner() ) + m_fileURL.addPath( m_partnerNick + '.' + fileNameSanitized ); + else + m_fileURL.addPath( fileNameSanitized ); + } + + return DccTransfer::queue(); } void DccTransferRecv::abort() // public slot @@ -194,7 +238,6 @@ } setStatus( Aborted ); - updateView(); cleanUp(); emit done( this ); } @@ -203,7 +246,7 @@ { kdDebug() << "DccTransferRecv::start() [BEGIN]" << endl; - if ( m_dccStatus != Queued ) + if ( getStatus() != Queued ) return; setStatus( Preparing ); @@ -263,7 +306,6 @@ case DccResumeDialog::RA_Cancel: default: setStatus( Queued ); - updateView(); } } @@ -287,8 +329,8 @@ QStringList::ConstIterator it; for ( it=dirList.begin() ; it!=dirList.end() ; ++it ) - if ( !KIO::NetAccess::exists( *it, true, listView() ) ) - if ( !KIO::NetAccess::mkdir( *it, listView(), -1 ) ) + if ( !KIO::NetAccess::exists( *it, true, NULL ) ) + if ( !KIO::NetAccess::mkdir( *it, NULL, -1 ) ) return false; return true; @@ -306,7 +348,7 @@ disconnect( transferJob, 0, 0, 0 ); transferJob->kill(); - if ( m_panel->isLocalFileInWritingProcess( m_fileURL ) ) + if ( KonversationApplication::instance()->getDccTransferManager()->isLocalFileInWritingProcess( m_fileURL ) ) { askAndPrepareLocalKio( i18n( "The file is used by another transfer.
" "%1
" ) @@ -381,24 +423,59 @@ connect( m_writeCacheHandler, SIGNAL( gotError( const QString& ) ), this, SLOT( slotLocalGotWriteError( const QString& ) ) ); if ( !m_resumed ) - connectToSender(); + connectWithSender(); else requestResume(); } +void DccTransferRecv::connectWithSender() +{ + if ( m_reverse ) + { + if ( !startListeningForSender() ) + return; + + Server* server = KonversationApplication::instance()->getConnectionManager()->getServerByConnectionId( m_connectionId ); + if ( !server ) + { + failed( i18n( "Could not send Reverse DCC SEND acknowledgement to the partner via the IRC server." ) ); + } + + m_ownIp = DccCommon::getOwnIp( server ); + m_ownPort = QString::number( DccCommon::getServerSocketPort( m_serverSocket ) ); + + setStatus( WaitingRemote, i18n( "Waiting for connection" ) ); + + server->dccReverseSendAck( m_partnerNick, m_fileName, DccCommon::textIpToNumericalIp( m_ownIp ), m_ownPort, m_fileSize, m_reverseToken ); + + //FIXME: add connection timer here + } + else + { + connectToSendServer(); + } +} + void DccTransferRecv::requestResume() { kdDebug() << "DccTransferRecv::requestResume()" << endl; setStatus( WaitingRemote, i18n( "Waiting for remote host's acceptance" ) ); - updateView(); startConnectionTimer( 30 ); kdDebug() << "DccTransferRecv::requestResume(): requesting resume for " << m_partnerNick << " file " << m_fileName << " partner " << m_partnerPort << endl; //TODO m_filename could have been sanitized - will this effect this? - emit resumeRequest( m_partnerNick, m_fileName, m_partnerPort, m_transferringPosition ); + Server* server = KonversationApplication::instance()->getConnectionManager()->getServerByConnectionId( m_connectionId ); + if ( !server ) + { + kdDebug() << "DccTransferSend::start(): could not retrieve the instance of Server. Connection id: " << m_connectionId << endl; + failed( i18n( "Could not send DCC RECV resume request to the partner via the IRC server." ) ); + return; + } + + server->dccResumeGetRequest( m_partnerNick, m_fileName, m_partnerPort, m_transferringPosition ); } // public slot @@ -417,17 +494,16 @@ return; } - connectToSender(); + connectWithSender(); } -void DccTransferRecv::connectToSender() +void DccTransferRecv::connectToSendServer() { - kdDebug() << "DccTransferRecv::connectToSender()" << endl; + kdDebug() << "DccTransferRecv::connectToSendServer()" << endl; // connect to sender setStatus( Connecting ); - updateView(); m_recvSocket = new KNetwork::KStreamSocket( m_partnerIp, m_partnerPort, this); @@ -439,29 +515,76 @@ m_recvSocket->enableRead( false ); m_recvSocket->enableWrite( false ); - connect( m_recvSocket, SIGNAL( connected( const KResolverEntry& ) ), this, SLOT( connectionSuccess() ) ); + connect( m_recvSocket, SIGNAL( connected( const KResolverEntry& ) ), this, SLOT( startReceiving() ) ); connect( m_recvSocket, SIGNAL( gotError( int ) ), this, SLOT( connectionFailed( int ) ) ); - connect( m_recvSocket, SIGNAL( closed() ), this, SLOT( slotSocketClosed() ) ); - connect( m_recvSocket, SIGNAL( readyRead() ), this, SLOT( readData() ) ); - connect( m_recvSocket, SIGNAL( readyWrite() ), this, SLOT( sendAck() ) ); - kdDebug() << "DccTransferRecv::connectToSender(): attempting to connect to " << m_partnerIp << ":" << m_partnerPort << endl; + kdDebug() << "DccTransferRecv::connectToServer(): attempting to connect to " << m_partnerIp << ":" << m_partnerPort << endl; m_recvSocket->connect(); } -void DccTransferRecv::connectionSuccess() // slot +bool DccTransferRecv::startListeningForSender() +{ + // Set up server socket + QString failedReason; + if ( Preferences::dccSpecificSendPorts() ) + m_serverSocket = DccCommon::createServerSocketAndListen( this, &failedReason, Preferences::dccSendPortsFirst(), Preferences::dccSendPortsLast() ); + else + m_serverSocket = DccCommon::createServerSocketAndListen( this, &failedReason ); + if ( !m_serverSocket ) + { + failed( failedReason ); + return false; + } + + connect( m_serverSocket, SIGNAL( readyAccept() ), this, SLOT( slotServerSocketReadyAccept() ) ); + connect( m_serverSocket, SIGNAL( gotError( int ) ), this, SLOT( slotServerSocketGotError( int ) ) ); + + return true; +} + +void DccTransferRecv::slotServerSocketReadyAccept() +{ + //stopConnectionTimer() + + m_recvSocket = static_cast( m_serverSocket->accept() ); + if ( !m_recvSocket ) + { + failed( i18n( "Could not accept the connection. (Socket Error)" ) ); + return; + } + + connect( m_recvSocket, SIGNAL( gotError( int ) ), this, SLOT( connectionFailed( int ) ) ); + + // we don't need ServerSocket anymore + m_serverSocket->close(); + + startReceiving(); +} + +void DccTransferRecv::slotServerSocketGotError( int /* errorCode*/ ) +{ + failed( i18n( "Socket error: %1" ).arg( m_serverSocket->errorString() ) ); +} + +void DccTransferRecv::startReceiving() { - kdDebug() << "DccTransferRecv::connectionSuccess()" << endl; + kdDebug() << "DccTransferRecv::startReceiving()" << endl; - setStatus( Receiving ); - updateView(); + m_recvSocket->setBlocking( false ); // asynchronous mode + + connect( m_recvSocket, SIGNAL( readyRead() ), this, SLOT( readData() ) ); + connect( m_recvSocket, SIGNAL( readyWrite() ), this, SLOT( sendAck() ) ); + connect( m_recvSocket, SIGNAL( closed() ), this, SLOT( slotSocketClosed() ) ); + + setStatus( Transferring ); m_transferStartPosition = m_transferringPosition; m_recvSocket->enableRead( true ); + m_recvSocket->enableWrite( false ); - initTransferMeter(); // initialize CPS counter, ETA counter, etc... + startTransferLogger(); // initialize CPS counter, ETA counter, etc... } // slot @@ -496,7 +619,8 @@ { kdDebug() << "DccTransferRecv::sendAck(): Sent final ACK." << endl; m_recvSocket->enableRead( false ); - finishTransferMeter(); + disconnect( m_recvSocket, 0, 0, 0 ); + finishTransferLogger(); m_writeCacheHandler->close(); // WriteCacheHandler will send the signal done() } else if ( m_transferringPosition > (KIO::fileoffset_t)m_fileSize ) @@ -510,7 +634,6 @@ { kdDebug() << "DccTransferRecv::slotLocalWriteDone()" << endl; setStatus( Done ); - updateView(); cleanUp(); emit done( this ); } @@ -546,8 +669,8 @@ void DccTransferRecv::slotSocketClosed() { - finishTransferMeter(); - if ( m_dccStatus == Receiving ) + finishTransferLogger(); + if ( getStatus() == Transferring ) failed( i18n( "Remote user disconnected" ) ); } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransferrecv.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransferrecv.h --- konversation-1.0.1/konversation/src/dcctransferrecv.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransferrecv.h 2008-08-06 16:56:27.000000000 +0100 @@ -4,7 +4,7 @@ copyright: (C) 2002 by Dario Abatianni email: eisfuchs@tigress.com */ -// Copyright (C) 2004,2005 Shintaro Matsuoka +// Copyright (C) 2004-2007 Shintaro Matsuoka // Copyright (C) 2004,2005 John Tapsell /* @@ -17,10 +17,12 @@ #ifndef DCCTRANSFERRECV_H #define DCCTRANSFERRECV_H +#include "dcctransfer.h" +// TODO: remove the dependence +#include "dccresumedialog.h" + #include -#include "dccresumedialog.h" -#include "dcctransfer.h" class QFile; class QTimer; @@ -33,30 +35,37 @@ namespace KNetwork { + class KServerSocket; class KStreamSocket; } -class DccPanel; - class DccTransferRecvWriteCacheHandler; class DccTransferRecv : public DccTransfer { Q_OBJECT - friend class DccDetailDialog; - friend class DccResumeDialog; public: - /** Constructor. This sets up the variables and updates the view, so the - * user can see the filename, filesize etc, and can accept it. */ - DccTransferRecv( DccPanel* panel, const QString& partnerNick, const KURL& defaultFolderURL, const QString& fileName, unsigned long fileSize, const QString& partnerIp, const QString& partnerPort ); + DccTransferRecv(QObject* parent); virtual ~DccTransferRecv(); - signals: - // emitted by requestResume() - void resumeRequest( const QString& partnerNick, const QString& fileName, const QString& partnerPort, KIO::filesize_t filePosition); + // REQUIRED + void setPartnerIp( const QString& ip ); + // REQUIRED + void setPartnerPort( const QString& port ); + // REQUIRED + void setFileSize( unsigned long fileSize ); + // OPTIONAL, if not specified, "unnamed_file" + // TODO: "$sendername-$receiveddate" is better + void setFileName( const QString& fileName ); + // OPTIONAL, if not specified, default folder + the file name + void setFileURL( const KURL& url ); + // OPTIONAL + void setReverse( bool reverse, const QString& reverseToken ); public slots: + virtual bool queue(); + /** The user has accepted the download. * Check we are saving it somewhere valid, create any directories needed, and * connect to remote host. @@ -79,16 +88,21 @@ void slotLocalGotWriteError( const QString& errorString ); // Remote DCC - void connectionSuccess(); + void connectWithSender(); + void startReceiving(); void connectionFailed( int errorCode ); void readData(); void sendAck(); void connectionTimeout(); void slotSocketClosed(); + // Reverse DCC + void slotServerSocketReadyAccept(); + void slotServerSocketGotError( int errorCode ); + protected: void cleanUp(); - void failed(const QString& errorMessage = QString::null ); + void failed(const QString& errorMessage = QString() ); // (startPosition == 0) means "don't resume" void prepareLocalKio( bool overwrite, bool resume, KIO::fileoffset_t startPosition = 0 ); @@ -107,7 +121,10 @@ bool createDirs(const KURL &dirURL) const; void requestResume(); - void connectToSender(); + // for non-reverse DCC + void connectToSendServer(); + // for reverse DCC + bool startListeningForSender(); void startConnectionTimer( int sec ); void stopConnectionTimer(); @@ -122,6 +139,8 @@ bool m_saveToFileExists; bool m_partialFileExists; QTimer* m_connectionTimer; + + KNetwork::KServerSocket* m_serverSocket; KNetwork::KStreamSocket* m_recvSocket; private: @@ -134,7 +153,7 @@ Q_OBJECT public: - DccTransferRecvWriteCacheHandler( KIO::TransferJob* transferJob ); + explicit DccTransferRecvWriteCacheHandler( KIO::TransferJob* transferJob ); virtual ~DccTransferRecvWriteCacheHandler(); void append( char* data, int size ); @@ -161,4 +180,5 @@ QValueList m_cacheList; QDataStream* m_cacheStream; }; -#endif // DCCTRANSFERRECV_H + +#endif // DCCTRANSFERRECV_H diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransfersend.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransfersend.cpp --- konversation-1.0.1/konversation/src/dcctransfersend.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransfersend.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -4,7 +4,7 @@ copyright: (C) 2002 by Dario Abatianni email: eisfuchs@tigress.com */ -// Copyright (C) 2004,2005 Shintaro Matsuoka +// Copyright (C) 2004-2007 Shintaro Matsuoka // Copyright (C) 2004,2005 John Tapsell /* @@ -14,6 +14,14 @@ (at your option) any later version. */ +#include "dcctransfersend.h" +#include "channel.h" +#include "dcccommon.h" +#include "dcctransfermanager.h" +#include "konversationapplication.h" +#include "connectionmanager.h" +#include "server.h" + #include #include #include @@ -26,37 +34,123 @@ #include #include -#include #include -#include #include #include #include #include #include + +// TODO: remove the dependence #include -#include "dccpanel.h" -#include "dcctransfersend.h" -#include "konversationapplication.h" using namespace KNetwork; -DccTransferSend::DccTransferSend( DccPanel* panel, const QString& partnerNick, const KURL& fileURL, const QString& ownIp, const QString &altFileName, uint fileSize ) -: DccTransfer( panel, DccTransfer::Send, partnerNick ) +DccTransferSend::DccTransferSend(QObject* parent) + : DccTransfer( DccTransfer::Send, parent ) +{ + kdDebug() << "DccTransferSend::DccTransferSend()" << endl; + + m_serverSocket = 0; + m_sendSocket = 0; + + m_connectionTimer = new QTimer( this ); + connect( m_connectionTimer, SIGNAL( timeout() ), this, SLOT( slotConnectionTimeout() ) ); + + // set defualt values + m_reverse = Preferences::dccPassiveSend(); +} + +DccTransferSend::~DccTransferSend() +{ + cleanUp(); +} + +void DccTransferSend::cleanUp() +{ + kdDebug() << "DccTransferSend::cleanUp()" << endl; + stopConnectionTimer(); + finishTransferLogger(); + if ( !m_tmpFile.isEmpty() ) + KIO::NetAccess::removeTempFile( m_tmpFile ); + m_tmpFile = QString(); + m_file.close(); + if ( m_sendSocket ) + { + m_sendSocket->close(); + m_sendSocket = 0; // the instance will be deleted automatically by its parent + } + if ( m_serverSocket ) + { + m_serverSocket->close(); + m_serverSocket = 0; // the instance will be deleted automatically by its parent + } +} + +// just for convenience +void DccTransferSend::failed( const QString& errorMessage ) +{ + setStatus( Failed, errorMessage ); + cleanUp(); + emit done( this ); +} + +void DccTransferSend::setFileURL( const KURL& url ) +{ + if ( getStatus() == Configuring ) + m_fileURL = url; +} + +void DccTransferSend::setFileName( const QString& fileName ) +{ + if ( getStatus() == Configuring ) + m_fileName = fileName; +} + +void DccTransferSend::setOwnIp( const QString& ownIp ) +{ + if ( getStatus() == Configuring ) + m_ownIp = ownIp; +} + +void DccTransferSend::setFileSize( KIO::filesize_t fileSize ) { - kdDebug() << "DccTransferSend::DccTransferSend()" << endl - << "DccTransferSend::DccTransferSend(): Partner: " << partnerNick << endl - << "DccTransferSend::DccTransferSend(): File: " << fileURL.prettyURL() << endl; + if ( getStatus() == Configuring ) + m_fileSize = fileSize; +} + +void DccTransferSend::setReverse( bool reverse ) +{ + if ( getStatus() == Configuring ) + m_reverse = reverse; +} + +bool DccTransferSend::queue() +{ + kdDebug() << "DccTransferSend::queue()" << endl; + + if ( getStatus() != Configuring ) + return false; + + if ( m_ownIp.isEmpty() ) + m_ownIp = DccCommon::getOwnIp( KonversationApplication::instance()->getConnectionManager()->getServerByConnectionId( m_connectionId ) ); + + if ( !kapp->authorize( "allow_downloading" ) ) + { + //Do not have the rights to send the file. Shouldn't have gotten this far anyway + //Note this is after the initialisation so the view looks correct still + failed(i18n("The admin has restricted the right to send files")); + return false; + } - m_fileName = fileURL.fileName(); - m_fileURL = fileURL; - m_ownIp = ownIp; + if ( m_fileName.isEmpty() ) + m_fileName = sanitizeFileName( m_fileURL.fileName() ); - if(Preferences::dccIPv4Fallback()) + if ( Preferences::dccIPv4Fallback() ) { - KIpAddress ip(m_ownIp); - if(ip.isIPv6Addr()) + KIpAddress ip( m_ownIp ); + if ( ip.isIPv6Addr() ) { /* This is fucking ugly but there is no KDE way to do this yet :| -cartman */ struct ifreq ifr; @@ -64,64 +158,46 @@ int sock = socket(AF_INET, SOCK_DGRAM, 0); strncpy( ifr.ifr_name, address, IF_NAMESIZE ); ifr.ifr_addr.sa_family = AF_INET; - if( ioctl( sock, SIOCGIFADDR, &ifr ) >= 0 ) - m_ownIp = inet_ntoa( ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr ); + if ( ioctl( sock, SIOCGIFADDR, &ifr ) >= 0 ) + m_ownIp = inet_ntoa( ( (struct sockaddr_in *)&ifr.ifr_addr )->sin_addr ); kdDebug() << "Falling back to IPv4 address " << m_ownIp << endl; } } - if ( altFileName.isEmpty() ) - m_fileName = m_fileURL.fileName(); - else - m_fileName = altFileName; - - m_serverSocket = 0; - m_sendSocket = 0; m_fastSend = Preferences::dccFastSend(); kdDebug() << "DccTransferSend::DccTransferSend(): Fast DCC send: " << m_fastSend << endl; - m_connectionTimer = new QTimer( this ); - - if (!kapp->authorize("allow_downloading")) - { - //Do not have the rights to send the file. Shouldn't have gotten this far anyway - //Note this is after the initialisation so the view looks correct still - failed(i18n("The admin has restricted the right to send files")); - return; - } - - connect( m_connectionTimer, SIGNAL( timeout() ), this, SLOT( connectionTimeout() ) ); - //timer hasn't started yet. qtimer will be deleted automatically when 'this' object is deleted - //Check the file exists - if ( !KIO::NetAccess::exists( m_fileURL, true, listView() ) ) + if ( !KIO::NetAccess::exists( m_fileURL, true, NULL ) ) { failed( i18n( "The url \"%1\" does not exist" ).arg( m_fileURL.prettyURL() ) ); - return; + return false; } //FIXME: KIO::NetAccess::download() is a synchronous function. we should use KIO::get() instead. //Download the file. Does nothing if it's local (file:/) - if ( !KIO::NetAccess::download( m_fileURL, m_tmpFile, listView() ) ) + if ( !KIO::NetAccess::download( m_fileURL, m_tmpFile, NULL ) ) { failed( i18n( "Could not retrieve \"%1\"" ).arg( m_fileURL.prettyURL() ) ); kdDebug() << "DccTransferSend::DccTransferSend(): KIO::NetAccess::download() failed. reason: " << KIO::NetAccess::lastErrorString() << endl; - return; + return false; } //Some protocols, like http, maybe not return a filename, and altFileName may be empty, So prompt the user for one. if ( m_fileName.isEmpty() ) { bool pressedOk; - m_fileName = KInputDialog::getText( i18n( "Enter Filename" ), i18n( "The file that you are sending to %1 does not have a filename.
Please enter a filename to be presented to the receiver, or cancel the dcc transfer" ).arg( getPartnerNick() ), "unknown", &pressedOk, listView() ); + m_fileName = KInputDialog::getText( i18n( "Enter Filename" ), i18n( "The file that you are sending to %1 does not have a filename.
Please enter a filename to be presented to the receiver, or cancel the dcc transfer" ).arg( getPartnerNick() ), "unknown", &pressedOk, NULL ); if ( !pressedOk ) { failed( i18n( "No filename was given" ) ); - return; + return false; } } + //FIXME: if "\\\"" works well on other IRC clients, replace "\"" with "\\\"" + m_fileName.replace( "\"", "_" ); if (Preferences::dccSpaceToUnderscore()) m_fileName.replace( " ", "_" ); else { @@ -131,60 +207,10 @@ m_file.setName( m_tmpFile ); - if ( fileSize > 0 ) - m_fileSize = fileSize; - else + if ( m_fileSize == 0 ) m_fileSize = m_file.size(); - updateView(); - - panel->selectMe( this ); -} - -DccTransferSend::~DccTransferSend() -{ - cleanUp(); -} - -QString DccTransferSend::getTypeText() const -{ - return i18n( "Send" ); -} - -QPixmap DccTransferSend::getTypeIcon() const -{ - return KGlobal::iconLoader()->loadIcon( "up", KIcon::Small ); -} - -void DccTransferSend::cleanUp() -{ - kdDebug() << "DccTransferSend::cleanUp()" << endl; - stopConnectionTimer(); - finishTransferMeter(); - if ( !m_tmpFile.isEmpty() ) - KIO::NetAccess::removeTempFile( m_tmpFile ); - m_tmpFile = QString(); - m_file.close(); - if ( m_sendSocket ) - { - m_sendSocket->close(); - m_sendSocket = 0; // the instance will be deleted automatically by its parent - } - if ( m_serverSocket ) - { - m_serverSocket->close(); - m_serverSocket = 0; // the instance will be deleted automatically by its parent - } -} - -// just for convenience -void DccTransferSend::failed( const QString& errorMessage ) -{ - setStatus( Failed, errorMessage ); - updateView(); - cleanUp(); - emit done( this ); - openDetailDialog(); + return DccTransfer::queue(); } void DccTransferSend::abort() // public slot @@ -192,7 +218,6 @@ kdDebug() << "DccTransferSend::abort()" << endl; setStatus( Aborted ); - updateView(); cleanUp(); emit done( this ); } @@ -204,86 +229,102 @@ if ( getStatus() != Queued ) return; - // Set up server socket - m_serverSocket = new KNetwork::KServerSocket( this ); - m_serverSocket->setFamily( KNetwork::KResolver::InetFamily ); - - // user is specifying ports - if ( Preferences::dccSpecificSendPorts() ) - { - // set port - bool found = false; // whether succeeded to set port - unsigned long port = Preferences::dccSendPortsFirst(); - for ( ; port <= Preferences::dccSendPortsLast() ; ++port ) - { - kdDebug() << "DccTransferSend::start(): trying port " << port << endl; - m_serverSocket->setAddress( QString::number( port ) ); - bool success = m_serverSocket->listen(); - if ( found = ( success && m_serverSocket->error() == KNetwork::KSocketBase::NoError ) ) - break; - m_serverSocket->close(); - } - if ( !found ) - { - failed( i18n( "No vacant port" ) ); - return; - } + // common procedure + + Server* server = KonversationApplication::instance()->getConnectionManager()->getServerByConnectionId( m_connectionId ); + if ( !server ) + { + kdDebug() << "DccTransferSend::start(): could not retrieve the instance of Server. Connection id: " << m_connectionId << endl; + failed( i18n( "Could not send a DCC SEND request to the partner via the IRC server." ) ); + return; } - else // user isn't specifying ports + + if ( !m_reverse ) { - // Let the operating system choose a port - m_serverSocket->setAddress( "0" ); + // Normal DCC SEND + kdDebug() << "DccTransferSend::start(): normal DCC SEND" << endl; - if ( !m_serverSocket->listen() ) + // Set up server socket + QString failedReason; + if ( Preferences::dccSpecificSendPorts() ) + m_serverSocket = DccCommon::createServerSocketAndListen( this, &failedReason, Preferences::dccSendPortsFirst(), Preferences::dccSendPortsLast() ); + else + m_serverSocket = DccCommon::createServerSocketAndListen( this, &failedReason ); + if ( !m_serverSocket ) { - kdDebug() << "DccTransferSend::start(): listen() failed!" << endl; - failed( i18n( "Could not open a socket" ) ); + failed( failedReason ); return; } + + connect( m_serverSocket, SIGNAL( readyAccept() ), this, SLOT( acceptClient() ) ); + connect( m_serverSocket, SIGNAL( gotError( int ) ), this, SLOT( slotGotSocketError( int ) ) ); + connect( m_serverSocket, SIGNAL( closed() ), this, SLOT( slotServerSocketClosed() ) ); + + // Get own port number + m_ownPort = QString::number( DccCommon::getServerSocketPort( m_serverSocket ) ); + + kdDebug() << "DccTransferSend::start(): own Address=" << m_ownIp << ":" << m_ownPort << endl; + + startConnectionTimer( Preferences::dccSendTimeout() ); + + server->dccSendRequest( m_partnerNick, m_fileName, getNumericalIpText( m_ownIp ), m_ownPort, m_fileSize ); } + else + { + // Passive DCC SEND + kdDebug() << "DccTransferSend::start(): passive DCC SEND" << endl; + + int tokenNumber = KonversationApplication::instance()->getDccTransferManager()->generateReverseTokenNumber(); + // TODO: should we append a letter "T" to this token? + m_reverseToken = QString::number( tokenNumber ); - connect( m_serverSocket, SIGNAL( readyAccept() ), this, SLOT( heard() ) ); - connect( m_serverSocket, SIGNAL( gotError( int ) ), this, SLOT( socketError( int ) ) ); - connect( m_serverSocket, SIGNAL( closed() ), this, SLOT( slotServerSocketClosed() ) ); - - // Get our own port number - KNetwork::KSocketAddress ipAddr = m_serverSocket->localAddress(); - const struct sockaddr_in* socketAddress = (sockaddr_in*)ipAddr.address(); - m_ownPort = QString::number( ntohs( socketAddress->sin_port ) ); + kdDebug() << "DccTransferSend::start(): passive DCC key(token): " << m_reverseToken << endl; - kdDebug() << "DccTransferSend::start(): own Address=" << m_ownIp << ":" << m_ownPort << endl; + server->dccPassiveSendRequest( m_partnerNick, m_fileName, getNumericalIpText( m_ownIp ), m_fileSize, m_reverseToken ); + } setStatus( WaitingRemote, i18n( "Waiting remote user's acceptance" ) ); - updateView(); +} - startConnectionTimer( Preferences::dccSendTimeout() ); +void DccTransferSend::connectToReceiver( const QString& partnerHost, const QString& partnerPort ) +{ + // Reverse DCC - emit sendReady( m_partnerNick, m_fileName, getNumericalIpText( m_ownIp ), m_ownPort, m_fileSize ); -} + m_partnerIp = partnerHost; + m_partnerPort = partnerPort; + + m_sendSocket = new KNetwork::KStreamSocket( partnerHost, partnerPort, this ); + + m_sendSocket->setBlocking( false ); + + connect( m_sendSocket, SIGNAL( connected( const KResolverEntry& ) ), this, SLOT( startSending() ) ); + connect( m_sendSocket, SIGNAL( gotError( int ) ), this, SLOT( slotConnectionFailed( int ) ) ); + + setStatus( Connecting ); + m_sendSocket->connect(); +} // public bool DccTransferSend::setResume( unsigned long position ) { kdDebug() << "DccTransferSend::setResume(): position=" << position << endl; - if ( position < m_fileSize ) - { - m_resumed = true; - m_transferringPosition = position; - updateView(); - return true; - } - else - { - kdDebug() << "DccTransferSend::setResume(): Invalid position. (greater than filesize=" << QString::number( m_fileSize ) << ")" << endl; - updateView(); + if ( getStatus() > WaitingRemote ) return false; - } + + if ( position >= m_fileSize ) + return false; + + m_resumed = true; + m_transferringPosition = position; + return true; } -void DccTransferSend::heard() // slot +void DccTransferSend::acceptClient() // slot { - kdDebug() << "DccTransferSend::heard()" << endl; + // Normal DCC + + kdDebug() << "DccTransferSend::acceptClient()" << endl; stopConnectionTimer(); @@ -294,6 +335,14 @@ return; } + // we don't need ServerSocket anymore + m_serverSocket->close(); + + startSending(); +} + +void DccTransferSend::startSending() +{ connect( m_sendSocket, SIGNAL( readyWrite() ), this, SLOT( writeData() ) ); connect( m_sendSocket, SIGNAL( readyRead() ), this, SLOT( getAck() ) ); connect( m_sendSocket, SIGNAL( closed() ), this, SLOT( slotSendSocketClosed() ) ); @@ -304,20 +353,16 @@ m_partnerIp = m_sendSocket->peerAddress().asInet().ipAddress().toString(); m_partnerPort = m_sendSocket->peerAddress().serviceName(); - // we don't need ServerSocket anymore - m_serverSocket->close(); - if ( m_file.open( IO_ReadOnly ) ) { // seek to file position to make resume work m_file.at( m_transferringPosition ); m_transferStartPosition = m_transferringPosition; - setStatus( Sending ); + setStatus( Transferring ); m_sendSocket->enableWrite( true ); m_sendSocket->enableRead( m_fastSend ); - initTransferMeter(); // initialize CPS counter, ETA counter, etc... - updateView(); + startTransferLogger(); // initialize CPS counter, ETA counter, etc... } else failed( i18n( "Could not open the file: %1" ).arg( getQFileErrorString( m_file.status() ) ) ); @@ -361,9 +406,8 @@ if ( pos == m_fileSize ) { kdDebug() << "DccTransferSend::getAck(): Received final ACK." << endl; - finishTransferMeter(); + finishTransferLogger(); setStatus( Done ); - updateView(); cleanUp(); emit done( this ); break; // for safe @@ -371,9 +415,9 @@ } } -void DccTransferSend::socketError( int errorCode ) +void DccTransferSend::slotGotSocketError( int errorCode ) { - kdDebug() << "DccTransferSend::socketError(): code = " << errorCode << " string = " << m_serverSocket->errorString() << endl; + kdDebug() << "DccTransferSend::slotGotSocketError(): code = " << errorCode << " string = " << m_serverSocket->errorString() << endl; failed( i18n( "Socket error: %1" ).arg( m_serverSocket->errorString() ) ); } @@ -393,12 +437,17 @@ } } -void DccTransferSend::connectionTimeout() // slot +void DccTransferSend::slotConnectionTimeout() // slot { - kdDebug() << "DccTransferSend::connectionTimeout()" << endl; + kdDebug() << "DccTransferSend::slotConnectionTimeout()" << endl; failed( i18n( "Timed out" ) ); } +void DccTransferSend::slotConnectionFailed( int /* errorCode */ ) +{ + failed( i18n( "Connection failure: %1" ).arg( m_sendSocket->errorString() ) ); +} + void DccTransferSend::slotServerSocketClosed() { kdDebug() << "DccTransferSend::slotServerSocketClosed()" << endl; @@ -407,8 +456,8 @@ void DccTransferSend::slotSendSocketClosed() { kdDebug() << "DccTransferSend::slotSendSocketClosed()" << endl; - finishTransferMeter(); - if ( m_dccStatus == Sending && m_transferringPosition < (KIO::fileoffset_t)m_fileSize ) + finishTransferLogger(); + if ( getStatus() == Transferring && m_transferringPosition < (KIO::fileoffset_t)m_fileSize ) failed( i18n( "Remote user disconnected" ) ); } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/dcctransfersend.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/dcctransfersend.h --- konversation-1.0.1/konversation/src/dcctransfersend.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/dcctransfersend.h 2008-08-06 16:56:27.000000000 +0100 @@ -4,7 +4,7 @@ copyright: (C) 2002 by Dario Abatianni email: eisfuchs@tigress.com */ -// Copyright (C) 2004,2005 Shintaro Matsuoka +// Copyright (C) 2004-2007 Shintaro Matsuoka // Copyright (C) 2004,2005 John Tapsell /* @@ -19,6 +19,9 @@ #include "dcctransfer.h" +#include + + class QTimer; namespace KNetwork @@ -27,37 +30,52 @@ class KStreamSocket; } -class DccPanel; - class DccTransferSend : public DccTransfer { Q_OBJECT public: - DccTransferSend( DccPanel* panel, const QString& partnerNick, const KURL& fileURL, const QString& ownIp, const QString &altFileName = QString::null, uint fileSize = -1); + DccTransferSend(QObject* parent); virtual ~DccTransferSend(); - bool setResume( unsigned long position ); + // REQUIRED + void setFileURL( const KURL& url ); + // OPTIONAL + void setFileName( const QString& fileName ); + // REQUIED + // FIXME: this setting should be an optional one or be removed: make DccTransferSend itself read the configuration + void setOwnIp( const QString& ownIp ); + // OPTIONAL + void setFileSize( KIO::filesize_t fileSize ); + // OPTIONAL + void setReverse( bool reverse ); - signals: - void sendReady( const QString& partner, const QString& fileName, const QString& ownIp, const QString& ownPort, unsigned long fileSize ); + bool setResume( unsigned long position ); public slots: + virtual bool queue(); virtual void start(); virtual void abort(); + // invoked when the receiver accepts the offer (Reverse DCC) + void connectToReceiver( const QString& partnerHost, const QString& partnerPort ); + protected slots: - void heard(); + void acceptClient(); + // it must be invoked when m_sendSocket is ready + void startSending(); void writeData(); void getAck(); - void socketError( int errorCode ); - void connectionTimeout(); + void slotGotSocketError( int errorCode ); + void slotConnectionTimeout(); + void slotConnectionFailed( int errorCode ); void slotSendSocketClosed(); void slotServerSocketClosed(); protected: void cleanUp(); - void failed(const QString& errorMessage = QString::null ); + void failed(const QString& errorMessage = QString() ); + void startConnectionTimer( int sec ); void stopConnectionTimer(); @@ -75,9 +93,6 @@ bool m_fastSend; QTimer* m_connectionTimer; - - private: - virtual QString getTypeText() const; - virtual QPixmap getTypeIcon() const; }; -#endif // DCCTRANSFERSEND_H + +#endif // DCCTRANSFERSEND_H diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/decoder.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/decoder.h --- konversation-1.0.1/konversation/src/decoder.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/decoder.h 2008-08-06 16:56:27.000000000 +0100 @@ -23,6 +23,7 @@ #define KHTMLDECODER_H #include + class QTextCodec; class QTextDecoder; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/editnotifydialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/editnotifydialog.cpp --- konversation-1.0.1/konversation/src/editnotifydialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/editnotifydialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -11,21 +11,19 @@ email: garycramblitt@comcast.net */ -// Qt includes. +#include "editnotifydialog.h" +#include "konversationapplication.h" +#include "servergroupsettings.h" + #include #include #include -// KDE includes. #include #include #include #include -// Konversation includes. -#include "editnotifydialog.h" -#include "konversationapplication.h" -#include "servergroupsettings.h" EditNotifyDialog::EditNotifyDialog(QWidget* parent, const QString& network, diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/editnotifydialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/editnotifydialog.h --- konversation-1.0.1/konversation/src/editnotifydialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/editnotifydialog.h 2008-08-06 16:56:27.000000000 +0100 @@ -32,9 +32,9 @@ { Q_OBJECT - public: - EditNotifyDialog(QWidget* parent=0,const QString& network=QString::null, - const QString& nickname=QString::null); + public: + explicit EditNotifyDialog(QWidget* parent=0,const QString& network=QString(), + const QString& nickname=QString()); ~EditNotifyDialog(); signals: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/emoticon.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/emoticon.cpp --- konversation-1.0.1/konversation/src/emoticon.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/emoticon.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -23,6 +23,7 @@ #include "konversationapplication.h" #include "config/preferences.h" + namespace Konversation { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/emoticon.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/emoticon.h --- konversation-1.0.1/konversation/src/emoticon.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/emoticon.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,6 +15,7 @@ #include #include + class QFontMetrics; namespace Konversation diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/eventsrc /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/eventsrc --- konversation-1.0.1/konversation/src/eventsrc 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/eventsrc 2008-08-06 16:56:27.000000000 +0100 @@ -41,7 +41,8 @@ Name[ta]=புதியச் செய்தி Name[tr]=Yeni ileti Name[uk]=Нове повідомлення -Name[uz]=Янги хабар +Name[uz]=Yangi xabar +Name[uz@cyrillic]=Янги хабар Name[xx]=xxNew messagexx Name[zh_CN]=新消息 Name[zh_TW]=新的訊息 @@ -92,12 +93,13 @@ Name[ca]=Escriure sobrenom Name[cs]=Zapsána přezdívka Name[da]=Alias skrevet -Name[de]=Nick erwähnt +Name[de]=Spitzname erwähnt Name[el]=Το ψευδώνυμο γράφτηκε Name[es]=Apodo escrito Name[et]=Hüüdnimi kirjutatud Name[fi]=Nimimerkki kirjoitettiin Name[fr]=Pseudonyme écrit +Name[ga]=Scríobhadh do leasainm Name[gl]=Alcume escrito Name[he]=הכינוי נכתב Name[hi]=निक लिखा @@ -107,6 +109,7 @@ Name[ka]=მეტსახელი დაწერილია Name[lt]=Paminėtas slapyvardis Name[nl]=Bijnaam geschreven +Name[pa]=ਨਾਂ ਲਿਖਿਆ Name[pt]=Alcunha escrita Name[pt_BR]=Apelido escrito Name[ru]=Упоминание вашего ника @@ -114,19 +117,19 @@ Name[sr@Latn]=Nadimak je upisan Name[sv]=Något skrivet till smeknamnet Name[ta]=பட்டை எழுத்து -Name[tr]=Rumuz yazıldı +Name[tr]=Takma ad yazıldı Name[uk]=Написане прізвисько Name[xx]=xxNick writtenxx Name[zh_CN]=昵称写入 Name[zh_TW]=有人提到您的暱稱 Comment=Someone wrote your nick in a message Comment[ar]=أحد ما كتب إسمك المستعار في رسالة ما -Comment[bg]=Псевдонимът Ви бе написан в съобщение +Comment[bg]=Псевдонимът ви бе написан в съобщение Comment[bs]=Neko je spomenuo vaš nick u poruci Comment[ca]=Algú ha escrit el vostre sobrenom en un missatge Comment[cs]=Někdo ve zprávě napsal vaší přezdívku Comment[da]=Nogen skrev dit alias i en besked -Comment[de]=Jemand hat Deinen Nick in einer Nachricht erwähnt. +Comment[de]=Jemand hat Ihren Spitznamen in einer Nachricht erwähnt Comment[el]=Κάποιος έγραψε το ψευδώνυμο σας σε ένα μήνυμα Comment[es]=Alguien ha escrito su apodo en un mensaje Comment[et]=Keegi kasutas sõnumis sinu hüüdnime @@ -149,12 +152,61 @@ Comment[sr@Latn]=Neko je napisao vaš nadimak u poruci Comment[sv]=Någon skrev ett meddelande till ditt smeknamn Comment[ta]=உங்கள் வடுத் தகவலில் ஒரு சிலர் எழுதியுள்ளனர் -Comment[tr]=Birisi iletisinde sizin rumuzunuzu yazdı +Comment[tr]=Birisi iletisinde sizin takma adınızı yazdı Comment[uk]=Хтось в повідомленні написав ваше прізвисько Comment[xx]=xxSomeone wrote your nick in a messagexx +Comment[zh_CN]=有人在消息中输入了你的昵称 Comment[zh_TW]=有人在訊息中提到您的暱稱 default_presentation=0 +[queryMessage] +Name=Private message +Name[bg]=Лично съобщение +Name[cs]=Soukromá zpráva +Name[da]=Provat besked +Name[de]=Private Nachricht +Name[el]=Προσωπικό μήνυμα +Name[es]=Mensaje privado +Name[et]=Privaatsõnum +Name[ga]=Teachtaireacht phríobháideach +Name[it]=Messaggio privato +Name[ja]=プライベートメッセージ +Name[nl]=Privaat bericht +Name[pa]=ਪ੍ਰਾਈਵੇਟ ਸੁਨੇਹਾ +Name[pt]=Mensagem privada +Name[pt_BR]=Mensagem particular +Name[sr]=Приватна порука +Name[sr@Latn]=Privatna poruka +Name[sv]=Privat meddelande +Name[tr]=Özel ileti +Name[uk]=Приватне повідомлення +Name[xx]=xxPrivate messagexx +Name[zh_CN]=私人消息 +Name[zh_TW]=私密訊息 +Comment=You received a private message +Comment[bg]=Получихте лично съобщение +Comment[cs]=Obdrželi jste soukromou zprávu +Comment[da]=Du modtog en privat besked +Comment[de]=Sie haben eine private Nachricht erhalten +Comment[el]=Λάβατε ένα προσωπικό μήνυμα +Comment[es]=Ha recibido un mensaje privado +Comment[et]=Sa said privaatsõnumi +Comment[ga]=Fuair tú teachtaireacht phríobháideach +Comment[it]=Hai ricevuto un messaggio privato +Comment[ja]=プライベートメッセージを受け取りました +Comment[nl]=U ontving een privaat bericht +Comment[pt]=Você recebeu uma mensagem privada +Comment[pt_BR]=Você recebeu uma mensagem particular +Comment[sr]=Примили сте приватну поруку +Comment[sr@Latn]=Primili ste privatnu poruku +Comment[sv]=Du har tagit emot ett privat meddelande +Comment[tr]=Bir özel ileti aldınız +Comment[uk]=Ви отримали приватне повідомлення +Comment[xx]=xxYou received a private messagexx +Comment[zh_CN]=您收到了私人消息 +Comment[zh_TW]=您接收到一個私密訊息 +default_presentation=0 + [nickchange] Name=Nick changed Name[ar]=تغيّر الإسم المستعار @@ -163,12 +215,13 @@ Name[ca]=Sobrenom canviat Name[cs]=Přezdívka změněna Name[da]=Alias ændret -Name[de]=Nick gewechselt +Name[de]=Spitzname geändert Name[el]=Το ψευδώνυμο άλλαξε Name[es]=Apodo modificado Name[et]=Hüüdnimi muudetud Name[fi]=Nimimerkki muuttui Name[fr]=Pseudonyme modifié +Name[ga]=Athraíodh leasainm Name[gl]=Alcume trocado Name[he]=הכינוי שונה Name[hi]=निक बदला @@ -186,24 +239,25 @@ Name[sr@Latn]=Nadimak je promenjen Name[sv]=Smeknamn ändrat Name[ta]= மாற்றியப் பட்டை -Name[tr]=Rumuz değiştildi +Name[tr]=Takma ad değişti Name[uk]=Змінене прізвисько Name[xx]=xxNick changedxx Name[zh_CN]=昵称改变 Name[zh_TW]=變更暱稱 Comment=Someone changed their nick Comment[ar]=أحد ما غيّر إسمه المستعار -Comment[bg]=Някой си смени псевдонима +Comment[bg]=Някой си промени псевдонима Comment[bs]=Neko je promijenio svoj nick Comment[ca]=Algú ha canviat el seu sobrenom Comment[cs]=Někdo změnil svou přezdívku Comment[da]=Nogen ændrede deres alias -Comment[de]=Jemand hat seinen Nick gewechselt. +Comment[de]=Jemand hat seinen Spitznamen geändert Comment[el]=Κάποιος άλλαξε το ψευδώνυμο του Comment[es]=Alguien ha cambiado su apodo Comment[et]=Keegi muutis oma hüüdnime Comment[fi]=Joku muutti nimimerkkiään Comment[fr]=Quelqu'un a changé de pseudonyme +Comment[ga]=D'athraigh duine éigin a leasainm Comment[gl]=Alguén trocou de alcume Comment[he]=מישהו שינה את הכינוי שלו Comment[hi]=किसी ने अपना निक बदला @@ -220,7 +274,7 @@ Comment[sr@Latn]=Neko je promenio svoj nadimak Comment[sv]=Någon ändrade sitt smeknamn Comment[ta]=வடுவை ஒரு சிலர் மாற்றினர் -Comment[tr]=Biri rumuzunu değiştirdi +Comment[tr]=Birileri takma adlarını değiştirdi Comment[uk]=Хтось змінив своє прізвисько Comment[xx]=xxSomeone changed their nickxx Comment[zh_CN]=有人改变了昵称 @@ -242,7 +296,7 @@ Name[et]=Sisenev fail Name[fi]=Saapuva tiedosto Name[fr]=Fichier entrant -Name[ga]=Comahd isteach +Name[ga]=Comhad isteach Name[gl]=Ficheiro recebido Name[he]=קובץ נכנס Name[hi]=आनेवाली फाइल @@ -272,7 +326,7 @@ Comment[ca]=Algú desitja enviar-vos un fitxer sobre DCC Comment[cs]=Někdo vám chce přes DCC poslat soubor Comment[da]=Nogen ønsker at transmittere en fil til dig over DCC -Comment[de]=Jemand bietet Dir eine Datei zum DCC Download an. +Comment[de]=Jemand bietet Ihnen eine Datei zum DCC-Download an Comment[el]=Κάποιος θέλει να σας στείλει ένα αρχείο μέσω DCC Comment[es]=Alguien quiere transmitirle un fichero a través de DCC Comment[et]=Keegi tahab sulle faili edastada üle DCC @@ -283,7 +337,7 @@ Comment[hi]=कोई एक फाइल आपके डीसीसी पर ट्रांसमिट करना चाहता है Comment[hu]=Valaki fájl szeretne küldeni Önnek DCC-n keresztül Comment[it]=Qualcuno vuole trasmetterti un file via DCC -Comment[ja]=誰かがDCCであなたにファイルを転送したいそうです +Comment[ja]=誰かが DCC であなたにファイルを転送したいそうです Comment[ka]=ვიღაცას სურს DCC-ს მეშვეობით გადმოგცეთ ფაილი Comment[lt]=Kažkas nori jums atsiųsti bylą per DCC Comment[nl]=Iemand wil via DCC een bestand naar u sturen @@ -309,12 +363,13 @@ Name[ca]=El sobrenom ha accedit al canal Name[cs]=Přezdívka se objevila na kanálu Name[da]=Alias gik med i kanal -Name[de]=Nick betritt Kanal +Name[de]=Benutzer betritt Kanal Name[el]=Το ψευδώνυμο συνδέθηκε στο κανάλι Name[es]=Apodo se ha unido al canal Name[et]=Hüüdnimi ühines kanaliga Name[fi]=Nimimerkki liittyi kanavalle Name[fr]=Un pseudonyme a rejoint le canal +Name[ga]=Chuaigh leasainm le cainéal Name[gl]=Alguén se uniu ao canal Name[he]=כינוי התחבר אל החדר Name[hi]=निक चैनल में शामिल हुआ @@ -332,7 +387,7 @@ Name[sr@Latn]=Nadimak se priključio kanalu Name[sv]=Någon med smeknamnet gick med i en kanal Name[ta]=இணைத்தத் தடப்பட்டை -Name[tr]=Rumuz kanala girdi +Name[tr]=Takma ad kanala girdi Name[uk]=Прізвисько приєдналось до каналу Name[xx]=xxNick joined channelxx Name[zh_CN]=昵称加入频道 @@ -344,12 +399,13 @@ Comment[ca]=Un nou sobrenom ha accedit a un canal Comment[cs]=Na kanálu se objevila nová přezdívka Comment[da]=Nyt alias gik med i en kanal -Comment[de]=Ein neuer Nick betritt einen Kanal. +Comment[de]=Jemand betritt einen Kanal Comment[el]=Νέο ψευδώνυμο συνδέθηκε σε ένα κανάλι Comment[es]=Un nuevo usuario se ha unido a un canal Comment[et]=Kanaliga ühines uus hüüdnimi Comment[fi]=Uusi nimimerkki liittyi kanavalle Comment[fr]=Un pseudonyme a rejoint le canal +Comment[ga]=Chuaigh leasainm nua le cainéal Comment[gl]=Un alcume novo uniu-se ao canal Comment[he]=כינוי חדש התחבר לחדר Comment[hi]=नया निक एक चैनल में शामिल हुआ @@ -381,12 +437,13 @@ Name[ca]=El sobrenom ha abandonat el canal Name[cs]=Přezdívka opustila kanál Name[da]=Alias forlod kanal -Name[de]=Nick verlässt Kanal +Name[de]=Benutzer verlässt Kanal Name[el]=Το ψευδώνυμο έφυγε από το κανάλι Name[es]=Apodo ha dejado el canal Name[et]=Hüüdnimi lahkus kanalilt Name[fi]=Nimimerkki poistui kanavalta Name[fr]=Un pseudonyme a quitté le canal +Name[ga]=D'fhág leasainm cainéal Name[gl]=Alguén deixou o canal Name[he]=כינוי עזב את החדר Name[hi]=निक चैनल छोड़ा @@ -404,7 +461,7 @@ Name[sr@Latn]=Nadimak je napustio kanal Name[sv]=Någon med smeknamnet lämnade en kanal Name[ta]=இடது தடப் பட்டை -Name[tr]=Rumuz kanaldan ayrıldı +Name[tr]=Takma ad kanaldan ayrıldı Name[uk]=Прізвисько покинуло канал Name[xx]=xxNick left channelxx Name[zh_CN]=昵称离开频道 @@ -416,12 +473,13 @@ Comment[ca]=Un sobrenom ha deixat un canal Comment[cs]=Přezdívka opustila kanál Comment[da]=Et alias forlod en kanal -Comment[de]=Jemand verlässt einen Kanal. +Comment[de]=Jemand verlässt einen Kanal Comment[el]=Ένα ψευδώνυμο έφυγε από ένα κανάλι Comment[es]=Un usuario ha abandonado un canal Comment[et]=Hüüdnimi lahkus kanalilt Comment[fi]=Nimimerkki poistui kanavalta Comment[fr]=Un pseudonyme a quitté le canal +Comment[ga]=D'fhág leasainm cainéal Comment[gl]=Alguén abandonou o canal Comment[he]=כינוי עזב את החדר Comment[hu]=Valaki kilépett egy csatornáról @@ -438,7 +496,7 @@ Comment[sr@Latn]=Nadimak je napustio kanal Comment[sv]=Någon med ett smeknamn lämnade en kanal Comment[ta]=தடத்தை விட்டு வடு நீங்கியது -Comment[tr]=Bir rumuz kanaldan ayrıldı +Comment[tr]=Bir takma ad kanaldan ayrıldı Comment[uk]=Прізвисько покинуло канал Comment[xx]=xxA nick left a channelxx Comment[zh_CN]=一个昵称离开了频道 @@ -489,12 +547,13 @@ Comment[ca]=A mode d'usuari o de canal ha estat canviat Comment[cs]=Uživatel nebo kanál byl změněn Comment[da]=En bruger- eller kanaltilstand blev ændret -Comment[de]=Ein Benutzer- oder Kanal-Modus wurde geändert. +Comment[de]=Ein Benutzer- oder Kanal-Modus wurde geändert Comment[el]=Η κατάσταση ενός χρήστης ή καναλιού άλλαξε Comment[es]= Un modo de usuario o de canal ha sido modificado Comment[et]=Kasutaja või kanalirežiim muudeti Comment[fi]=Käyttäjän tai kanavan tila vaihtui Comment[fr]=Un utilisateur ou un mode de canal a été changé +Comment[ga]=Athraíodh mód úsáideora nó mód cainéil Comment[gl]=Foi modificado un modo de usuário ou canal Comment[he]=משתמש או חדר שינה את המצב שלו Comment[hi]=एक उपयोगकर्ता या चैनल मोड बदला @@ -556,11 +615,11 @@ Name[zh_TW]=通知 Comment=A user on your watched nicks list has come online Comment[ar]=مستخدِم مِن أفراد لائحتك لِلأسماء المستعارة سجل دخولهُ -Comment[bg]=Потребител от Вашия списък за наблюдение на псевдоними влезе в канала +Comment[bg]=Потребител от списъка ви с наблюдавани псевдоними влезе в канала Comment[ca]=S'ha connectat un usuari de la vostra llista de sobrenoms vigilats Comment[cs]=Uživatel z vašeho seznamu je online Comment[da]=En bruger på din liste af aliasser gik online -Comment[de]=Ein Benutzer aus Deiner Benachrichtigungsliste ist online. +Comment[de]=Ein Benutzer aus Ihrer "Beobachten"-Liste ist online Comment[el]=Ένας χρήστης από τη λίστα ψευδώνυμων παρακολούθησης συνδέθηκε στο δίκτυο Comment[es]=Un usuario de su lista de apodos vigilados se ha conectado Comment[et]=Jälgitavate hüüdnimede nimekirjas olev kasutaja tuli võrku @@ -622,19 +681,21 @@ Name[tr]=Sorgu Name[uk]=Запит Name[xx]=xxQueryxx +Name[zh_CN]=对话 Name[zh_TW]=查詢 Comment=Someone started a conversation (query) with you Comment[ar]=أحدٌ ما إبتدء مكالمة ( طلب ) معك -Comment[bg]=Някой е започнал разговор (запитване) с Вас +Comment[bg]=Някой започна личен разговор с вас Comment[ca]=Algú ha iniciat una conversa (query) amb vostè Comment[cs]=Někdo s vámi zahájil rozhovor (dotaz) Comment[da]=Nogen startede en konversation (query) med dig -Comment[de]=Jemand hat ein Gespräch (query) mit Dir begonnen. +Comment[de]=Jemand hat ein Gespräch (query) mit Ihnen begonnen Comment[el]=Κάποιος ξεκίνησε μια συζήτηση (ερώτηση) μαζί σας Comment[es]=Alguien empezó una conversación (consulta) con usted Comment[et]=Keegi alustas sinuga vestlust (esitas päringu) Comment[fi]=Joku aloitti keskustelun (kyselyn) kanssasi Comment[fr]=Quelqu'un a commencé une conversation (requête) avec vous +Comment[ga]=Thosaigh duine éigin comhrá (iarratas) leat Comment[gl]=Alguén comezou una conversa (está a procurá-la) privada Comment[he]=מישהו יזם שיחה אתך (query) Comment[hi]=किसी ने आपके साथ वार्तालाप (क्वैरी) प्रारंभ किया @@ -653,6 +714,7 @@ Comment[tr]=Birisi sizinle sohbet başlattı Comment[uk]=Хтось почав з вами розмову (запит) Comment[xx]=xxSomeone started a conversation (query) with youxx +Comment[zh_CN]=有人向您打开了一个对话。 Comment[zh_TW]=有人開啟了與您的私密對話 default_presentation=0 @@ -668,6 +730,7 @@ Name[et]=Väljaviskamine Name[fi]=Ulosheitto Name[fr]=Bannir +Name[ga]=Ciceáil amach Name[gl]=Expulsón Name[he]=בעיטה Name[it]=Espulsione @@ -677,22 +740,24 @@ Name[pt_BR]=Retirar Name[sr]=Избачени Name[sr@Latn]=Izbačeni -Name[tr]=Kanaldan at +Name[tr]=Tekmele Name[uk]=Виштовхнуто Name[xx]=xxKickxx +Name[zh_CN]=踢出 Name[zh_TW]=踢出 Comment=Someone kicked you out of a channel Comment[ar]=أحدٌ ما طلب ركلك خارجأً عن القناة -Comment[bg]=Някой Ви изрита от канала +Comment[bg]=Някой ви изрита от канала Comment[ca]=Algú us ha expulsat d'un canal Comment[cs]=Někdo vás vykopnul z kanálu Comment[da]=Nogen sparkede dig ud af kanalen -Comment[de]=Jemand hat Dich aus einem Kanal geworfen. +Comment[de]=Jemand hat Sie aus einem Kanal geworfen Comment[el]=Κάποιος σας απομάκρυνε από ένα κανάλι Comment[es]=Alguien le ha expulsado de un canal Comment[et]=Keegi viskas su kanalilt välja Comment[fi]=Joku heitti sinut kanavalta ulos Comment[fr]=Quelqu'un vous a banni du canal +Comment[ga]=Chiceáil duine éigin thú amach as cainéal Comment[gl]=Foi expulsado do canal por alguén Comment[he]=מישהו בעט אותך מערוץ Comment[it]=Qualcuno ti ha espulso da un canale @@ -707,9 +772,10 @@ Comment[sr@Latn]=Neko vas je izbacio sa kanala Comment[sv]=Någon sparkade ut dig från en kanal Comment[ta]=யாரோ உங்களை வழிமுறையில் இருந்து வெளித்தள்ளிவிட்டார்கள் -Comment[tr]=Birisi sizi kanaldan attı +Comment[tr]=Birisi sizi odadan tekmeledi Comment[uk]=Хтось виштовхнув вас із каналу Comment[xx]=xxSomeone kicked you out of a channelxx +Comment[zh_CN]=有人把您踢出了频道 Comment[zh_TW]=有人將您踢出頻道 default_presentation=0 @@ -732,12 +798,18 @@ Name[it]=Errore di connessione Name[ja]=接続失敗 Name[ka]=კავშირი ვერ შედგა +Name[lt]=Nepavyko prisijungti Name[nl]=Verbindingsfout Name[pa]=ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ Name[pt]=Erro na ligação Name[pt_BR]=Erro na conexão +Name[sr]=Грешка везе +Name[sr@Latn]=Greška veze Name[sv]=Uppkopplingsfel +Name[tr]=Bağlantı hatası +Name[uk]=Помилка з'єднання Name[xx]=xxConnection failurexx +Name[zh_CN]=连接失败 Name[zh_TW]=連線失敗 Comment=Failed to connect to server Comment[ar]=فشلتُ في الإتصال بِلخادِم @@ -750,16 +822,23 @@ Comment[es]=No ha sido posible conectarse al servidor Comment[et]=Ühendumine serveriga ebaõnnestus Comment[fi]=Palvelimeen yhdistäminen epäonnistui +Comment[ga]=Theip ar nascadh le freastalaí Comment[gl]=Non foi posíbel conectar co servidor Comment[he]=החיבור לשרת נכשל Comment[it]=Connessione al server non riuscita Comment[ja]=サーバへの接続に失敗しました Comment[ka]=სერვერთან დაკავშირება ვერ განხორციელდა +Comment[lt]=Nepavyko prisijungti prie serverio Comment[nl]=Verbinden met de server is mislukt Comment[pt]=Não foi possível ligar ao servidor Comment[pt_BR]=Falha ao conectar-se ao servidor +Comment[sr]=Неуспело повезивање са сервером +Comment[sr@Latn]=Neuspelo povezivanje sa serverom Comment[sv]=Misslyckades koppla upp till server +Comment[tr]=Sunucuya bağlanılamadı +Comment[uk]=Не вдалося з'єднатись з сервером Comment[xx]=xxFailed to connect to serverxx +Comment[zh_CN]=连接服务器失败 Comment[zh_TW]=連線到伺服器失敗 default_presentation=64 @@ -771,22 +850,29 @@ Name[ca]=Heu entrat a un canal Name[cs]=Připojili jste se ke kanálu Name[da]=Du gik med i en kanal -Name[de]=Du betrittst einen Kanal +Name[de]=Sie haben einen Kanel betreten Name[el]=Συνδεθήκατε σε ένα κανάλι Name[es]=Se ha unido a un canal Name[et]=Sa ühinesid kanaliga Name[fi]=Liityit kanavalle +Name[ga]=Chuaigh tú le cainéal Name[gl]=Uniu-se a un canal Name[he]=אתה הצטרפת אל חדר Name[it]=Sei entrato in un canale Name[ja]=チャンネルに入りました Name[ka]=თქვენ შეუერთდით არხს +Name[lt]=Prisijungėte prie kanalo Name[nl]=U nam deel aan een kanaal Name[pa]=ਤੁਸੀਂ ਇੱਕ ਚੈਨਲ 'ਚ ਦਾਖਲ ਹੋ ਗਏ Name[pt]=Você juntou-se a um canal Name[pt_BR]=Você entrou no canal +Name[sr]=Прикључили сте се каналу +Name[sr@Latn]=Priključili ste se kanalu Name[sv]=Du gick med i en kanal +Name[tr]=Bir odaya girdiniz +Name[uk]=Ви приєднались до каналу Name[xx]=xxYou joined a channelxx +Name[zh_CN]=您加入了一个频道 Name[zh_TW]=您加入了一個頻道 Comment=You joined a channel Comment[ar]=إنضممت إلى قناة @@ -795,22 +881,29 @@ Comment[ca]=Heu entrat a un canal Comment[cs]=Připojili jste se ke kanálu Comment[da]=Du gik med i en kanal -Comment[de]=Du betrittst einen Kanal +Comment[de]=Sie haben einen Kanal betreten Comment[el]=Συνδεθήκατε σε ένα κανάλι Comment[es]=Se ha unido a un canal Comment[et]=Sa ühinesid kanaliga Comment[fi]=Liityit kanavalle +Comment[ga]=Chuaigh tú le cainéal Comment[gl]=Uniu-se a un canal Comment[he]=אתה הצטרפת אל חדר Comment[it]=Sei entrato in un canale Comment[ja]=チャンネルに入りました Comment[ka]=თქვენ შეუერთდით არხს +Comment[lt]=Prisijungėte prie kanalo Comment[nl]=U nam deel aan een kanaal Comment[pa]=ਤੁਸੀਂ ਇੱਕ ਚੈਨਲ 'ਚ ਦਾਖਲ ਹੋ ਗਏ Comment[pt]=Você juntou-se a um canal Comment[pt_BR]=Você entrou em um canal +Comment[sr]=Прикључили сте се каналу +Comment[sr@Latn]=Priključili ste se kanalu Comment[sv]=Du gick med i en kanal +Comment[tr]=Bir odaya girdiniz +Comment[uk]=Ви приєднались до каналу Comment[xx]=xxYou joined a channelxx +Comment[zh_CN]=您加入了一个频道 Comment[zh_TW]=您加入了一個頻道 default_presentation=64 @@ -834,33 +927,47 @@ Name[it]=Chat DCC Name[ja]=DCC チャット Name[ka]=Dcc საუბარი +Name[lt]=DCC pokalbis +Name[ms]=Chat DCC Name[nl]=DCC-gesprek Name[pa]=DCC ਗੱਲਬਾਤ Name[pt]=Conversa DCC Name[pt_BR]= Conversa privada (DCC) +Name[sr]=DCC ћаскање +Name[sr@Latn]=DCC ćaskanje Name[sv]=DCC-chatt +Name[tr]=DCC Sohbeti +Name[uk]=Балачка DCC Name[xx]=xxDCC Chatxx +Name[zh_CN]=DCC 聊天 Name[zh_TW]=DCC 聊天 Comment=Someone started a DCC chat with you Comment[ar]=أحدٌ ما إبتدء مكالمة DCC معك -Comment[bg]=Някой е започнал разговор с Вас в DCC +Comment[bg]=Някой е започнал разговор с вас в DCC Comment[ca]=Algú ha iniciat un xat DCC amb vostè Comment[cs]=Někdo si s vámi chce pokecat přes DCC Comment[da]=Nogen startede en dcc-chat med dig -Comment[de]=Jemand hat einen DCC-chat mit Dir begonnen. +Comment[de]=Jemand hat einen DCC-Chat mit Ihnen begonnen Comment[el]=Κάποιος ξεκίνησε μια συζήτηση DCC μαζί σας Comment[es]=Alguien empezó una charla de tipo DCC con usted Comment[et]=Keegi alustas sinuga DCC vestlust Comment[fi]=Joku aloitti DCC-keskustelun kanssasi +Comment[ga]=Thosaigh duine éigin comhrá DCC leat Comment[gl]=Alguén comezou unha conversa DCC contigo Comment[he]=מישהו התחיל שיחת DCC אתך Comment[it]=Qualcuno ha avviato una conversazione DCC con te Comment[ja]=誰かがあなたと DCC チャットを開始しました Comment[ka]=ვიღაცამ თქვენთან dcc საუბარი დაიწყო +Comment[lt]=Kažkas su jumis pradėjo DCC pokalbį Comment[nl]=Iemand begon een DCC-gesprek met u Comment[pt]=Alguém iniciou uma conversa DCC consigo Comment[pt_BR]=Alguém começou uma conversa privada (DCC) com você +Comment[sr]=Неко је започео DCC ћаскање са вама +Comment[sr@Latn]=Neko je započeo DCC ćaskanje sa vama Comment[sv]=Någon startade en DCC-chatt med dig +Comment[tr]=Birisi sizinle DCC sohbeti başlattı +Comment[uk]=Хтось почав з вами DCC-балачку Comment[xx]=xxSomeone started a DCC chat with youxx +Comment[zh_CN]=有人向您打开了一个 DCC 聊天对话 Comment[zh_TW]=有人開啟了與您的 DCC 聊天 default_presentation=0 diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/fontappearance_preferences.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/fontappearance_preferences.ui --- konversation-1.0.1/konversation/src/fontappearance_preferences.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/fontappearance_preferences.ui 2008-08-06 16:56:27.000000000 +0100 @@ -140,6 +140,16 @@ setEnabled(bool) + + kcfg_CustomTextFont + kcfg_TextFont + kcfg_CustomListFont + kcfg_ListFont + kcfg_CustomTabFont + kcfg_TabFont + kcfg_FixedMOTD + kcfg_UseBoldNicks + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/generalbehavior_preferences.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/generalbehavior_preferences.ui --- konversation-1.0.1/konversation/src/generalbehavior_preferences.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/generalbehavior_preferences.ui 2008-08-06 16:56:27.000000000 +0100 @@ -14,8 +14,8 @@ 0 0 - 509 - 549 + 448 + 477 @@ -75,7 +75,40 @@ false - Only notify when a highlight is triggered or your current nick is used + Only &notify when a highlight is triggered or your current nick is used + + + + + spacer51_2 + + + Horizontal + + + Fixed + + + + 31 + 20 + + + + + + kcfg_TrayNotifyBlink + + + Blin&k the icon + + + + + kcfg_HideToTrayOnStartup + + + Hide window on startup @@ -169,27 +202,6 @@ - appStartGBox - - - Application Startup - - - - unnamed - - - - kcfg_ShowServerList - - - &Show server list dialog - - - - - - miscGBox @@ -277,14 +289,6 @@ Use custom web &browser: - - - kcfg_AutojoinOnInvite - - - Automatically &join channel on invite - - @@ -300,12 +304,14 @@ 20 - 10 + 20 + + kcfg_TrayNotify @@ -326,6 +332,22 @@ setEnabled(bool) + + kcfg_ShowTrayIcon + kcfg_TrayNotify + kcfg_TrayNotifyOnlyOwnNick + kcfg_NickCompletionMode + kcfg_NickCompleteSuffixStart + kcfg_NickCompleteSuffixMiddle + kcfg_NickCompletionCaseSensitive + kcfg_DisableNotifyWhileAway + kcfg_UseCustomBrowser + kcfg_WebBrowserCmd + kcfg_CommandChar + kcfg_CustomVersionReplyEnabled + kcfg_CustomVersionReply + kcfg_UseMultiRowInputBox + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/guess_ja.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/guess_ja.cpp --- konversation-1.0.1/konversation/src/guess_ja.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/guess_ja.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -40,8 +40,8 @@ * Maybe we should use QTextCodec::heuristicContentMatch() * But it fails detection. It's not useful. */ -#include "decoder.h" #include "guess_ja.h" +#include "decoder.h" /* DFA tables */ const dfa_table guess_eucj_st[] = { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/highlight.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/highlight.cpp --- konversation-1.0.1/konversation/src/highlight.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/highlight.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -15,6 +15,7 @@ #include "highlight.h" + unsigned int Highlight::s_id = 0; // static Highlight::Highlight(const QString& itemPattern, diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/highlight_preferences.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/highlight_preferences.cpp --- konversation-1.0.1/konversation/src/highlight_preferences.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/highlight_preferences.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -10,9 +10,17 @@ Copyright (C) 2006 John Tapsell */ +#include "highlight_preferences.h" +#include "highlightviewitem.h" +#include "konversationapplication.h" +#include "konversationsound.h" +#include "config/preferences.h" + #include #include #include +#include +#include #include #include @@ -20,18 +28,12 @@ #include #include #include -#include +#include #include #include #include #include -#include "config/preferences.h" - -#include "highlight_preferences.h" -#include "highlightviewitem.h" -#include "konversationapplication.h" -#include "konversationsound.h" Highlight_Config::Highlight_Config(QWidget* parent, const char* name) : Highlight_ConfigUI(parent,name) @@ -78,7 +80,7 @@ connect(patternInput,SIGNAL (textChanged(const QString&)),this,SLOT (highlightTextChanged(const QString&)) ); connect(patternButton,SIGNAL (clicked()),this,SLOT(highlightTextEditButtonClicked())); - connect(patternColor,SIGNAL (activated(const QColor&)),this,SLOT (highlightColorChanged(const QColor&)) ); + connect(patternColor,SIGNAL (changed(const QColor&)),this,SLOT (highlightColorChanged(const QColor&)) ); connect(soundURL, SIGNAL(textChanged(const QString&)), this, SLOT(soundURLChanged(const QString&))); connect(soundPlayBtn, SIGNAL(clicked()), this, SLOT(playSound())); @@ -87,6 +89,8 @@ connect(newButton,SIGNAL (clicked()),this,SLOT (addHighlight()) ); connect(removeButton,SIGNAL (clicked()),this,SLOT (removeHighlight()) ); + + updateButtons(); } Highlight_Config::~Highlight_Config() @@ -141,9 +145,6 @@ highlightItem->changeAcknowledged(); } - // Determine if kdeutils Regular Expression Editor is installed. If so, enable edit button. - patternButton->setEnabled(!KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()); - // tell all now emitted signals that we just clicked on a new item, so they should // not emit the modified() signal. newItemSelected=true; @@ -162,10 +163,13 @@ void Highlight_Config::updateButtons() { bool enabled = highlightListView->selectedItem() != NULL; + // is the kregexpeditor installed? + bool installed = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); // enable or disable edit widgets patternLabel->setEnabled(enabled); patternInput->setEnabled(enabled); - patternButton->setEnabled(enabled); + patternButton->setEnabled(enabled && installed); + colorLabel->setEnabled(enabled); patternColor->setEnabled(enabled); soundURL->setEnabled(enabled); soundLabel->setEnabled(enabled); @@ -173,6 +177,14 @@ autoTextLabel->setEnabled(enabled); autoTextInput->setEnabled(enabled); + if(installed) + { + QToolTip::add(patternButton, i18n("Click to run Regular Expression Editor (KRegExpEditor)")); + } + else + { + QToolTip::add(patternButton, i18n("The Regular Expression Editor (KRegExpEditor) is not installed")); + } } void Highlight_Config::highlightTextChanged(const QString& newPattern) @@ -245,7 +257,7 @@ void Highlight_Config::addHighlight() { - Highlight* newHighlight=new Highlight(i18n("New"),false,QColor("#ff0000"),KURL(),QString::null); + Highlight* newHighlight=new Highlight(i18n("New"),false,QColor("#ff0000"),KURL(),QString()); HighlightViewItem* item=new HighlightViewItem(highlightListView,newHighlight); highlightListView->setSelected(item,true); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/highlight_preferences.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/highlight_preferences.h --- konversation-1.0.1/konversation/src/highlight_preferences.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/highlight_preferences.h 2008-08-06 16:56:27.000000000 +0100 @@ -13,51 +13,50 @@ #ifndef KONVERSATIONHIGHLIGHT_CONFIG_H #define KONVERSATIONHIGHLIGHT_CONFIG_H -#include #include "highlight_preferencesui.h" #include "konvisettingspage.h" -class Highlight_Config; +#include -/** - @author Dario Abatianni -*/ + +class Highlight_Config; +class Highlight; class Highlight_Config : public Highlight_ConfigUI, public KonviSettingsPage { - Q_OBJECT + Q_OBJECT - public: - Highlight_Config(QWidget *parent = 0, const char *name = 0); - ~Highlight_Config(); - - public: - virtual void saveSettings(); - virtual void loadSettings(); - virtual void restorePageToDefaults(); - - virtual bool hasChanged(); - - signals: - void modified(); - - protected slots: - void highlightSelected(QListViewItem* item); - void highlightTextChanged(const QString& newPattern); - void highlightTextEditButtonClicked(); - void highlightColorChanged(const QColor& newColor); - void soundURLChanged(const QString& newURL); - void autoTextChanged(const QString& newText); - void addHighlight(); - void removeHighlight(); - void playSound(); - QPtrList getHighlightList(); // prefs format - QStringList currentHighlightList(); // hasChanged() format - protected: - void updateButtons(); + public: + explicit Highlight_Config(QWidget *parent = 0, const char *name = 0); + ~Highlight_Config(); + + public: + virtual void saveSettings(); + virtual void loadSettings(); + virtual void restorePageToDefaults(); + + virtual bool hasChanged(); + + signals: + void modified(); + + protected slots: + void highlightSelected(QListViewItem* item); + void highlightTextChanged(const QString& newPattern); + void highlightTextEditButtonClicked(); + void highlightColorChanged(const QColor& newColor); + void soundURLChanged(const QString& newURL); + void autoTextChanged(const QString& newText); + void addHighlight(); + void removeHighlight(); + void playSound(); + QPtrList getHighlightList(); // prefs format + QStringList currentHighlightList(); // hasChanged() format + protected: + void updateButtons(); - bool newItemSelected; - QStringList m_oldHighlightList; + bool newItemSelected; + QStringList m_oldHighlightList; }; #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/highlight_preferencesui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/highlight_preferencesui.ui --- konversation-1.0.1/konversation/src/highlight_preferencesui.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/highlight_preferencesui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -8,8 +8,8 @@ 0 0 - 373 - 356 + 614 + 585 @@ -19,84 +19,18 @@ 0 - - - spacer1 - - - Horizontal - - - Expanding - - - - 110 - 20 - - - - - - spacer2 - - - Horizontal - - - Expanding - - - - 50 - 21 - - - - - - kcfg_HighlightSoundsEnabled - - - Ena&ble sound for highlighted list items - - - - - kcfg_HighlightNick - - - Alwa&ys highlight own current nick: - - - - - kcfg_HighlightOwnLines - - - Always highlight own &lines: - - - - - kcfg_HighlightOwnLinesColor - - - - - - + groupBox1 - &Highlight List + Highlight List unnamed - + RegEx @@ -157,166 +91,7 @@ true - - - layout15 - - - - unnamed - - - - soundLabel - - - false - - - &Sound: - - - soundURL - - - - - layout9 - - - - unnamed - - - - patternInput - - - false - - - - - patternButton - - - false - - - - 0 - 0 - 0 - 0 - - - - ... - - - - - - Click to run Regular Expression Editor (KRegExpEditor) - - - - - patternColor - - - false - - - - - - - layout10 - - - - unnamed - - - - soundPlayBtn - - - false - - - - 0 - 0 - 0 - 0 - - - - - - - - - soundURL - - - false - - - - 7 - 0 - 0 - 0 - - - - audio/x-wav audio/x-mp3 application/ogg audio/x-adpcm - - - - - - - patternLabel - - - false - - - &Pattern: - - - patternInput - - - - - autoTextLabel - - - false - - - &Auto text: - - - autoTextInput - - - - - autoTextInput - - - false - - - - - + layout13 @@ -375,45 +150,304 @@ + + + patternButton + + + false + + + + 0 + 0 + 0 + 0 + + + + ... + + + + + + Click to run Regular Expression Editor (KRegExpEditor) + + + + + patternLabel + + + false + + + &Pattern: + + + patternInput + + + + + patternInput + + + false + + + + 7 + 0 + 1 + 0 + + + + + + colorLabel + + + false + + + Color: + + + + + patternColor + + + false + + + + + + + + soundLabel + + + false + + + &Sound: + + + soundURL + + + + + soundURL + + + false + + + + 7 + 0 + 0 + 0 + + + + audio/x-wav audio/x-mp3 application/ogg audio/x-adpcm + + + + + soundPlayBtn + + + false + + + + 4 + 5 + 0 + 0 + + + + + + + Test sound + + + + + autoTextLabel + + + false + + + &Auto text: + + + autoTextInput + + + + + autoTextInput + + + false + + - + + + kcfg_HighlightSoundsEnabled + + + Ena&ble sound for highlights + + + kcfg_HighlightNickColor + + false + + + + + + + + kcfg_HighlightOwnLinesColor + + + false + + + + kcfg_HighlightNick + + + Alwa&ys highlight own current nick: + + + + + kcfg_HighlightOwnLines + + + Always highlight own &lines: + + + + + spacer11 + + + Horizontal + + + Expanding + + + + 120 + 20 + + + + + + spacer1 + + + Horizontal + + + Expanding + + + + 50 + 20 + + + + + + spacer2 + + + Horizontal + + + Expanding + + + + 50 + 21 + + + + + + kcfg_HighlightNick + toggled(bool) + kcfg_HighlightNickColor + setEnabled(bool) + + + kcfg_HighlightOwnLines + toggled(bool) + kcfg_HighlightOwnLinesColor + setEnabled(bool) + + highlightListView - newButton - removeButton patternInput patternButton patternColor - soundPlayBtn soundURL + soundPlayBtn autoTextInput kcfg_HighlightSoundsEnabled kcfg_HighlightNick + kcfg_HighlightNickColor kcfg_HighlightOwnLines + kcfg_HighlightOwnLinesColor + newButton + removeButton - kcolorbutton.h klistview.h - klineedit.h kpushbutton.h - kcolorcombo.h - kurlrequester.h - klineedit.h kpushbutton.h - klineedit.h kpushbutton.h + klineedit.h + klineedit.h + kcolorbutton.h + kurlrequester.h + klineedit.h kpushbutton.h kcolorbutton.h + kcolorbutton.h diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/highlightviewitem.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/highlightviewitem.cpp --- konversation-1.0.1/konversation/src/highlightviewitem.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/highlightviewitem.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -13,13 +13,14 @@ * * ***************************************************************************/ +#include "highlightviewitem.h" + #include #include -#include "highlightviewitem.h" HighlightViewItem::HighlightViewItem(KListView* parent, Highlight* passed_Highlight) -: QCheckListItem(parent, QString::null,QCheckListItem::CheckBox) +: QCheckListItem(parent, QString(), QCheckListItem::CheckBox) { setText(1,passed_Highlight->getPattern()); itemColor = passed_Highlight->getColor(); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/highlightviewitem.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/highlightviewitem.h --- konversation-1.0.1/konversation/src/highlightviewitem.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/highlightviewitem.h 2008-08-06 16:56:27.000000000 +0100 @@ -16,16 +16,13 @@ #ifndef HIGHLIGHTVIEWITEM_H #define HIGHLIGHTVIEWITEM_H -#include - #include "highlight.h" -/** - *@author Matthias Gierlings - */ +#include + class KURL; -class KListVIew; +class KListView; class HighlightViewItem : public QCheckListItem { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/identity.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/identity.cpp --- konversation-1.0.1/konversation/src/identity.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/identity.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,14 +12,14 @@ email: eisfuchs@tigress.com */ +#include "identity.h" +#include "irccharsets.h" + #include #include #include -#include "irccharsets.h" - -#include "identity.h" int Identity::s_availableId = 0; @@ -27,12 +27,13 @@ { m_id = s_availableId; s_availableId++; - setCodecName(Konversation::IRCCharsets::self()->encodingForLocale()); + + init(); } Identity::Identity(int id) : KShared() { - if(id < 0) + if (id < 0) { m_id = s_availableId; s_availableId++; @@ -41,6 +42,8 @@ { m_id = id; } + + init(); } Identity::Identity(const Identity& original) : KShared() @@ -53,6 +56,25 @@ { } +void Identity::init() +{ + setCodecName(Konversation::IRCCharsets::self()->encodingForLocale()); + + setInsertRememberLineOnAway(false); + + setQuitReason("Konversation terminated!"); + setPartReason("Konversation terminated!"); + setKickReason("User terminated!"); + + setShowAwayMessage(false); + setAwayMessage("/me is away: %s"); + setReturnMessage("/me is back."); + + setAutomaticAway(false); + setAwayInactivity(10); + setAutomaticUnaway(false); +} + void Identity::copy(const Identity& original) { setName(original.getName()); @@ -61,6 +83,7 @@ setNicknameList(original.getNicknameList()); setBot(original.getBot()); setPassword(original.getPassword()); + setQuitReason(original.getQuitReason()); setPartReason(original.getPartReason()); setKickReason(original.getKickReason()); setInsertRememberLineOnAway(original.getInsertRememberLineOnAway()); @@ -68,6 +91,9 @@ setAwayMessage(original.getAwayMessage()); setAwayNick(original.getAwayNick()); setReturnMessage(original.getReturnMessage()); + setAutomaticAway(original.getAutomaticAway()); + setAwayInactivity(original.getAwayInactivity()); + setAutomaticUnaway(original.getAutomaticUnaway()); setShellCommand(original.getShellCommand()); setCodecName(original.getCodecName()); } @@ -96,6 +122,8 @@ void Identity::setPassword(const QString& newPassword) { password=newPassword; } QString Identity::getPassword() const { return password; } +void Identity::setQuitReason(const QString& reason) { quitReason=reason; } +QString Identity::getQuitReason() const { return quitReason; } void Identity::setPartReason(const QString& reason) { partReason=reason; } QString Identity::getPartReason() const { return partReason; } void Identity::setKickReason(const QString& reason) { kickReason=reason; } @@ -111,6 +139,13 @@ void Identity::setReturnMessage(const QString& message) { returnMessage=message; } QString Identity::getReturnMessage() const { return returnMessage; } +void Identity::setAutomaticAway(bool automaticAway) { m_automaticAway = automaticAway; } +bool Identity::getAutomaticAway() const { return m_automaticAway; } +void Identity::setAwayInactivity(int awayInactivity) { m_awayInactivity = awayInactivity; } +int Identity::getAwayInactivity() const { return m_awayInactivity; } +void Identity::setAutomaticUnaway(bool automaticUnaway) { m_automaticUnaway = automaticUnaway; } +bool Identity::getAutomaticUnaway() const { return m_automaticUnaway; } + void Identity::setNicknameList(const QStringList& newList) { nicknameList.clear(); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/identitydialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/identitydialog.cpp --- konversation-1.0.1/konversation/src/identitydialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/identitydialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -10,12 +10,16 @@ email: psn@linux.se */ #include "identitydialog.h" +#include "konversationapplication.h" +#include "awaymanager.h" +#include "irccharsets.h" #include #include #include #include #include +#include #include #include #include @@ -31,8 +35,6 @@ #include #include -#include "konversationapplication.h" -#include "irccharsets.h" namespace Konversation { @@ -48,9 +50,9 @@ m_identityCBox->setEditable(false); identityLabel->setBuddy(m_identityCBox); - QValueList tmpList = Preferences::identityList(); + IdentityList tmpList = Preferences::identityList(); - for(QValueList::iterator it = tmpList.begin(); it != tmpList.end(); ++it) + for(IdentityList::ConstIterator it = tmpList.begin(); it != tmpList.end(); ++it) { m_identityCBox->insertItem((*it)->getName()); m_identityList.append(new Identity(*(*it))); @@ -92,9 +94,11 @@ m_nicknameLBox = new QListBox(nicknameGBox); QWhatsThis::add(m_nicknameLBox, i18n("This is your list of nicknames. A nickname is the name that other users will know you by. You may use any name you desire. The first character must be a letter.\n\nSince nicknames must be unique across an entire IRC network, your desired name may be rejected by the server because someone else is already using that nickname. Enter alternate nicknames for yourself. If your first choice is rejected by the server, Konversation will try the alternate nicknames.")); - QPushButton* addNicknameBtn = new QPushButton(i18n("Add..."), nicknameGBox); - QPushButton* changeNicknameBtn = new QPushButton(i18n("Edit..."), nicknameGBox); - QPushButton* removeNicknameBtn = new QPushButton(i18n("Delete"), nicknameGBox); + m_addNicknameBtn = new QPushButton(i18n("Add..."), nicknameGBox); + m_changeNicknameBtn = new QPushButton(i18n("Edit..."), nicknameGBox); + m_changeNicknameBtn->setEnabled(false); + m_removeNicknameBtn = new QPushButton(i18n("Delete"), nicknameGBox); + m_removeNicknameBtn->setEnabled(false); m_upNicknameBtn = new QToolButton(nicknameGBox); m_upNicknameBtn->setIconSet(SmallIconSet("up")); m_upNicknameBtn->setAutoRepeat(true); @@ -104,19 +108,19 @@ m_downNicknameBtn->setAutoRepeat(true); m_downNicknameBtn->setEnabled(false); - connect(addNicknameBtn, SIGNAL(clicked()), this, SLOT(addNickname())); - connect(changeNicknameBtn, SIGNAL(clicked()), this, SLOT(editNickname())); - connect(removeNicknameBtn, SIGNAL(clicked()), this, SLOT(deleteNickname())); - connect(m_nicknameLBox, SIGNAL(selectionChanged()), this, SLOT(updateArrows())); + connect(m_addNicknameBtn, SIGNAL(clicked()), this, SLOT(addNickname())); + connect(m_changeNicknameBtn, SIGNAL(clicked()), this, SLOT(editNickname())); + connect(m_removeNicknameBtn, SIGNAL(clicked()), this, SLOT(deleteNickname())); + connect(m_nicknameLBox, SIGNAL(selectionChanged()), this, SLOT(updateButtons())); connect(m_upNicknameBtn, SIGNAL(clicked()), this, SLOT(moveNicknameUp())); connect(m_downNicknameBtn, SIGNAL(clicked()), this, SLOT(moveNicknameDown())); nicknameLayout->setColStretch(0, 10); nicknameLayout->setRowStretch(4, 10); nicknameLayout->addMultiCellWidget(m_nicknameLBox, 0, 4, 0, 0); - nicknameLayout->addMultiCellWidget(addNicknameBtn, 0, 0, 1, 4); - nicknameLayout->addMultiCellWidget(changeNicknameBtn, 1, 1, 1, 4); - nicknameLayout->addMultiCellWidget(removeNicknameBtn, 2, 2, 1, 4); + nicknameLayout->addMultiCellWidget(m_addNicknameBtn, 0, 0, 1, 4); + nicknameLayout->addMultiCellWidget(m_changeNicknameBtn, 1, 1, 1, 4); + nicknameLayout->addMultiCellWidget(m_removeNicknameBtn, 2, 2, 1, 4); nicknameLayout->addWidget(m_upNicknameBtn, 3, 2); nicknameLayout->addWidget(m_downNicknameBtn, 3, 3); @@ -151,7 +155,7 @@ tabWidget->addTab(awayWidget, i18n("Tab name", "Away")); QGridLayout* awayLayout = new QGridLayout(awayWidget, 1, 2, marginHint(), spacingHint()); - m_insertRememberLineOnAwayChBox = new QCheckBox(i18n("Insert remember &line when going away"), awayWidget); + m_insertRememberLineOnAwayChBox = new QCheckBox(i18n("Mark the last position in chat windows when going away"), awayWidget); QWhatsThis::add(m_insertRememberLineOnAwayChBox, i18n("If you check this box, whenever you perform an /away command, a horizontal line will appear in the channel, marking the point where you went away. Other IRC users do not see this horizontal line.")); QLabel* awayNickLabel = new QLabel(i18n("Away nickname:"), awayWidget); @@ -159,15 +163,44 @@ QWhatsThis::add(m_awayNickEdit, i18n("Enter a nickname that indicates you are away. Whenever you perform an /away msg command in any channel joined with this Identity, Konversation will automatically change your nickname to the Away nickname. Other users will be able to tell you are away from your computer. Whenever you perform an /away command in any channel in which you are away, Konversation will automatically change your nickname back to the original. If you do not wish to automatically change your nickname when going away, leave blank.")); awayNickLabel->setBuddy(m_awayNickEdit); - QGroupBox* m_awayMessageGBox = new QGroupBox(i18n("Messages"), awayWidget); - //m_awayMessageGBox->setCheckable(true); + m_automaticAwayGBox = new QGroupBox(i18n("Automatic Away"), awayWidget); + m_automaticAwayGBox->setCheckable(true); + m_automaticAwayGBox->setColumnLayout(0, Qt::Horizontal); + m_automaticAwayGBox->setMargin(marginHint()); + QGridLayout* automaticAwayLayout = new QGridLayout(m_automaticAwayGBox->layout(), 1, 2, spacingHint()); + + QWhatsThis::add(m_automaticAwayGBox, i18n("If you check this box, Konversation will automatically set all connections using this Identity away when the screensaver starts or after a period of user inactivity configured below.")); + + QLabel* autoAwayLabel1 = new QLabel(i18n("Set away after"), m_automaticAwayGBox); + m_awayInactivitySpin = new QSpinBox(1, 999, 1, m_automaticAwayGBox); + m_awayInactivitySpin->setSuffix(i18n(" minutes")); + QLabel* autoAwayLabel2 = new QLabel(i18n("of user inactivity"), m_automaticAwayGBox); + autoAwayLabel1->setBuddy(m_awayInactivitySpin); + autoAwayLabel2->setBuddy(m_awayInactivitySpin); + m_automaticUnawayChBox = new QCheckBox(i18n("Automatically return on activity"), m_automaticAwayGBox); + QWhatsThis::add(m_automaticUnawayChBox, i18n("If you check this box, Konversation will automatically cancel away for all connections using this Identity when the screensaver stops or new user activity is detected.")); + + connect(m_automaticAwayGBox, SIGNAL(toggled(bool)), autoAwayLabel1, SLOT(setEnabled(bool))); + connect(m_automaticAwayGBox, SIGNAL(toggled(bool)), autoAwayLabel2, SLOT(setEnabled(bool))); + connect(m_automaticAwayGBox, SIGNAL(toggled(bool)), m_awayInactivitySpin, SLOT(setEnabled(bool))); + connect(m_automaticAwayGBox, SIGNAL(toggled(bool)), m_automaticUnawayChBox, SLOT(setEnabled(bool))); + + row = 0; + automaticAwayLayout->addWidget(autoAwayLabel1, row, 0); + automaticAwayLayout->addWidget(m_awayInactivitySpin, row, 1); + automaticAwayLayout->addWidget(autoAwayLabel2, row, 2); + QSpacerItem* spacer = new QSpacerItem(0, 0, QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); + automaticAwayLayout->addItem(spacer, row, 3); + row++; + automaticAwayLayout->addMultiCellWidget(m_automaticUnawayChBox, row, row, 0, 3); + + m_awayMessageGBox = new QGroupBox(i18n("Away Messages"), awayWidget); + m_awayMessageGBox->setCheckable(true); m_awayMessageGBox->setColumnLayout(0, Qt::Horizontal); m_awayMessageGBox->setMargin(marginHint()); QGridLayout* messagesLayout = new QGridLayout(m_awayMessageGBox->layout(), 1, 2, spacingHint()); - m_showAwayMessage = new QCheckBox(i18n("Show a&way messages"), m_awayMessageGBox); - QWhatsThis::add(m_showAwayMessage, i18n("If you check this box, Konversation will automatically send the Away message to all channels joined with this Identity. %s is replaced with msg. Whenever you perform an /away command, the Return message will be displayed in all channels joined with this Identity.")); - m_showAwayMessage->setChecked(true); + QWhatsThis::add(m_awayMessageGBox, i18n("If you check this box, Konversation will automatically send the Away message to all channels joined with this Identity. %s is replaced with msg. Whenever you perform an /away command, the Return message will be displayed in all channels joined with this Identity.")); QLabel* awayLabel = new QLabel(i18n("Away &message:"), m_awayMessageGBox); m_awayEdit = new KLineEdit(m_awayMessageGBox); @@ -177,14 +210,12 @@ m_unAwayEdit = new KLineEdit(m_awayMessageGBox); unAwayLabel->setBuddy(m_unAwayEdit); - connect(m_showAwayMessage, SIGNAL(toggled(bool)), awayLabel, SLOT(setEnabled(bool))); - connect(m_showAwayMessage, SIGNAL(toggled(bool)), m_awayEdit, SLOT(setEnabled(bool))); - connect(m_showAwayMessage, SIGNAL(toggled(bool)), unAwayLabel, SLOT(setEnabled(bool))); - connect(m_showAwayMessage, SIGNAL(toggled(bool)), m_unAwayEdit, SLOT(setEnabled(bool))); + connect(m_awayMessageGBox, SIGNAL(toggled(bool)), awayLabel, SLOT(setEnabled(bool))); + connect(m_awayMessageGBox, SIGNAL(toggled(bool)), m_awayEdit, SLOT(setEnabled(bool))); + connect(m_awayMessageGBox, SIGNAL(toggled(bool)), unAwayLabel, SLOT(setEnabled(bool))); + connect(m_awayMessageGBox, SIGNAL(toggled(bool)), m_unAwayEdit, SLOT(setEnabled(bool))); row = 0; - messagesLayout->addMultiCellWidget(m_showAwayMessage, row, row, 0, 1); - row++; messagesLayout->addWidget(awayLabel, row, 0); messagesLayout->addWidget(m_awayEdit, row, 1); row++; @@ -197,6 +228,8 @@ awayLayout->addWidget(awayNickLabel, row, 0); awayLayout->addWidget(m_awayNickEdit, row, 1); row++; + awayLayout->addMultiCellWidget(m_automaticAwayGBox, row, row, 0, 1); + row++; awayLayout->addMultiCellWidget(m_awayMessageGBox, row, row, 0, 1); row++; awayLayout->setRowStretch(row, 10); @@ -223,6 +256,11 @@ // add encodings to combo box m_codecCBox->insertStringList(Konversation::IRCCharsets::self()->availableEncodingDescriptiveNames()); + QLabel* quitLabel = new QLabel(i18n("&Quit reason:"), advancedWidget); + m_quitEdit = new KLineEdit(advancedWidget); + QWhatsThis::add(m_quitEdit, i18n("Whenever you leave a server, this message is shown to others.")); + quitLabel->setBuddy(m_quitEdit); + QLabel* partLabel = new QLabel(i18n("&Part reason:"), advancedWidget); m_partEdit = new KLineEdit(advancedWidget); QWhatsThis::add(m_partEdit, i18n("Whenever you leave a channel, this message is sent to the channel.")); @@ -243,6 +281,9 @@ advancedLayout->addWidget(loginLabel,row,0); advancedLayout->addWidget(m_loginEdit, row, 1); row++; + advancedLayout->addWidget(quitLabel, row, 0); + advancedLayout->addWidget(m_quitEdit, row, 1); + row++; advancedLayout->addWidget(partLabel, row, 0); advancedLayout->addWidget(m_partEdit, row, 1); row++; @@ -270,6 +311,9 @@ setButtonOK(KGuiItem(i18n("&OK"), "button_ok", i18n("Change identity information"))); setButtonCancel(KGuiItem(i18n("&Cancel"), "button_cancel", i18n("Discards all changes made"))); + + AwayManager* awayManager = static_cast(kapp)->getAwayManager(); + connect(this, SIGNAL(identitiesChanged()), awayManager, SLOT(identitiesChanged())); } IdentityDialog::~IdentityDialog() @@ -285,6 +329,13 @@ return; } + if (isShown() && m_currentIdentity && m_realNameEdit->text().isEmpty()) + { + KMessageBox::error(this, i18n("Please enter a real name.")); + m_identityCBox->setCurrentText(m_currentIdentity->getName()); + return; + } + refreshCurrentIdentity(); m_currentIdentity = m_identityList[index]; @@ -297,13 +348,17 @@ m_insertRememberLineOnAwayChBox->setChecked(m_currentIdentity->getInsertRememberLineOnAway()); m_awayNickEdit->setText(m_currentIdentity->getAwayNick()); - m_showAwayMessage->setChecked(m_currentIdentity->getShowAwayMessage()); + m_awayMessageGBox->setChecked(m_currentIdentity->getShowAwayMessage()); m_awayEdit->setText(m_currentIdentity->getAwayMessage()); m_unAwayEdit->setText(m_currentIdentity->getReturnMessage()); + m_automaticAwayGBox->setChecked(m_currentIdentity->getAutomaticAway()); + m_awayInactivitySpin->setValue(m_currentIdentity->getAwayInactivity()); + m_automaticUnawayChBox->setChecked(m_currentIdentity->getAutomaticUnaway()); m_sCommandEdit->setText(m_currentIdentity->getShellCommand()); m_codecCBox->setCurrentItem(Konversation::IRCCharsets::self()->shortNameToIndex(m_currentIdentity->getCodecName())); m_loginEdit->setText(m_currentIdentity->getIdent()); + m_quitEdit->setText(m_currentIdentity->getQuitReason()); m_partEdit->setText(m_currentIdentity->getPartReason()); m_kickEdit->setText(m_currentIdentity->getKickReason()); @@ -322,12 +377,12 @@ void IdentityDialog::addNickname() { bool ok = false; - QString txt = KInputDialog::getText(i18n("Add Nickname"), i18n("Nickname:"), QString::null, &ok, this); + QString txt = KInputDialog::getText(i18n("Add Nickname"), i18n("Nickname:"), QString(), &ok, this); if(ok && !txt.isEmpty()) { m_nicknameLBox->insertItem(txt); - updateArrows(); + updateButtons(); } } @@ -345,16 +400,19 @@ void IdentityDialog::deleteNickname() { m_nicknameLBox->removeItem(m_nicknameLBox->currentItem()); - updateArrows(); + updateButtons(); } - void IdentityDialog::updateArrows() + void IdentityDialog::updateButtons() { - m_upNicknameBtn->setEnabled( m_nicknameLBox->count()>1 && m_nicknameLBox->currentItem()>0 ); + m_changeNicknameBtn->setEnabled(m_nicknameLBox->selectedItem()); + m_removeNicknameBtn->setEnabled(m_nicknameLBox->selectedItem()); - // FIXME: find another way than casting to overcome signedness warning - m_downNicknameBtn->setEnabled( m_nicknameLBox->count()>1 && - m_nicknameLBox->currentItem()< static_cast(m_nicknameLBox->count()-1) ); + m_upNicknameBtn->setEnabled(m_nicknameLBox->selectedItem() && m_nicknameLBox->count()>1 + && m_nicknameLBox->currentItem()>0); + + m_downNicknameBtn->setEnabled(m_nicknameLBox->selectedItem() && m_nicknameLBox->count()>1 + && m_nicknameLBox->currentItem()numRows()-1 ); } @@ -370,7 +428,7 @@ m_nicknameLBox->setCurrentItem(current - 1); } - updateArrows(); + updateButtons(); } void IdentityDialog::moveNicknameDown() @@ -385,7 +443,7 @@ m_nicknameLBox->setCurrentItem(current + 1); } - updateArrows(); + updateButtons(); } void IdentityDialog::refreshCurrentIdentity() @@ -409,13 +467,17 @@ m_currentIdentity->setInsertRememberLineOnAway(m_insertRememberLineOnAwayChBox->isChecked()); m_currentIdentity->setAwayNick(m_awayNickEdit->text()); - m_currentIdentity->setShowAwayMessage(m_showAwayMessage->isChecked()); + m_currentIdentity->setShowAwayMessage(m_awayMessageGBox->isChecked()); m_currentIdentity->setAwayMessage(m_awayEdit->text()); m_currentIdentity->setReturnMessage(m_unAwayEdit->text()); + m_currentIdentity->setAutomaticAway(m_automaticAwayGBox->isChecked()); + m_currentIdentity->setAwayInactivity(m_awayInactivitySpin->value()); + m_currentIdentity->setAutomaticUnaway(m_automaticUnawayChBox->isChecked()); m_currentIdentity->setShellCommand(m_sCommandEdit->text()); m_currentIdentity->setCodecName(Konversation::IRCCharsets::self()->availableEncodingShortNames()[m_codecCBox->currentItem()]); m_currentIdentity->setIdent(m_loginEdit->text()); + m_currentIdentity->setQuitReason(m_quitEdit->text()); m_currentIdentity->setPartReason(m_partEdit->text()); m_currentIdentity->setKickReason(m_kickEdit->text()); } @@ -429,16 +491,24 @@ return; } + if(m_realNameEdit->text().isEmpty()) + { + KMessageBox::error(this, i18n("Please enter a real name.")); + m_identityCBox->setCurrentText(m_currentIdentity->getName()); + return; + } + refreshCurrentIdentity(); Preferences::setIdentityList(m_identityList); static_cast(kapp)->saveOptions(true); + emit identitiesChanged(); accept(); } void IdentityDialog::newIdentity() { bool ok = false; - QString txt = KInputDialog::getText(i18n("Add Identity"), i18n("Identity name:"), QString::null, &ok, this); + QString txt = KInputDialog::getText(i18n("Add Identity"), i18n("Identity name:"), QString(), &ok, this); if(ok && !txt.isEmpty()) { @@ -456,7 +526,7 @@ KMessageBox::error(this, i18n("You need to give the identity a name.")); newIdentity(); } - updateArrows(); + updateButtons(); } void IdentityDialog::renameIdentity() @@ -519,7 +589,7 @@ m_identityList.remove(m_currentIdentity); m_currentIdentity = 0; updateIdentity(m_identityCBox->currentItem()); - updateArrows(); + updateButtons(); } } @@ -562,6 +632,11 @@ return m_currentIdentity; } + + IdentityPtr IdentityDialog::currentIdentity() const + { + return m_currentIdentity; + } } #include "identitydialog.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/identitydialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/identitydialog.h --- konversation-1.0.1/konversation/src/identitydialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/identitydialog.h 2008-08-06 16:56:27.000000000 +0100 @@ -12,13 +12,15 @@ #ifndef KONVERSATIONIDENTITYDIALOG_H #define KONVERSATIONIDENTITYDIALOG_H +#include "identity.h" + #include -#include "identity.h" class KComboBox; class KLineEdit; class QCheckBox; +class QSpinBox; class QListBox; class QGroupBox; class QToolButton; @@ -29,11 +31,17 @@ class IdentityDialog : public KDialogBase { Q_OBJECT - public: - IdentityDialog(QWidget *parent = 0, const char *name = 0); + public: + explicit IdentityDialog(QWidget *parent = 0, const char *name = 0); ~IdentityDialog(); void setCurrentIdentity(int index); IdentityPtr setCurrentIdentity(IdentityPtr identity); + IdentityPtr currentIdentity() const; + + + signals: + void identitiesChanged(); + protected slots: void updateIdentity(int index); @@ -41,7 +49,7 @@ void addNickname(); void editNickname(); void deleteNickname(); - void updateArrows(); + void updateButtons(); void moveNicknameUp(); void moveNicknameDown(); @@ -54,6 +62,7 @@ void deleteIdentity(); void copyIdentity(); + private: KComboBox* m_identityCBox; KLineEdit* m_realNameEdit; @@ -62,6 +71,7 @@ KComboBox* m_codecCBox; KLineEdit* m_botEdit; KLineEdit* m_passwordEdit; + KLineEdit* m_quitEdit; KLineEdit* m_partEdit; KLineEdit* m_kickEdit; KLineEdit* m_awayEdit; @@ -70,13 +80,18 @@ QCheckBox* m_insertRememberLineOnAwayChBox; QListBox* m_nicknameLBox; QGroupBox* m_awayMessageGBox; - QCheckBox* m_showAwayMessage; + QGroupBox* m_automaticAwayGBox; + QSpinBox* m_awayInactivitySpin; + QCheckBox* m_automaticUnawayChBox; QToolButton* m_editBtn; QToolButton* m_delBtn; QToolButton* m_upNicknameBtn; QToolButton* m_downNicknameBtn; + QPushButton* m_addNicknameBtn; + QPushButton* m_changeNicknameBtn; + QPushButton* m_removeNicknameBtn; - QValueList m_identityList; + IdentityList m_identityList; IdentityPtr m_currentIdentity; }; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/identity.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/identity.h --- konversation-1.0.1/konversation/src/identity.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/identity.h 2008-08-06 16:56:27.000000000 +0100 @@ -18,11 +18,8 @@ #include #include -class QTextCodec; -/* - *@author Dario Abatianni - */ +class QTextCodec; class Identity : public KShared { @@ -57,6 +54,8 @@ void setNicknameList(const QStringList& newList); QStringList getNicknameList() const; + void setQuitReason(const QString& reason); + QString getQuitReason() const; void setPartReason(const QString& reason); QString getPartReason() const; void setKickReason(const QString& reason); @@ -72,6 +71,13 @@ void setReturnMessage(const QString& message); QString getReturnMessage() const; + void setAutomaticAway(bool automaticAway); + bool getAutomaticAway() const; + void setAwayInactivity(int awayInactivity); + int getAwayInactivity() const; + void setAutomaticUnaway(bool automaticUnaway); + bool getAutomaticUnaway() const; + void setShellCommand(const QString &command); QString getShellCommand() const; @@ -96,12 +102,18 @@ QStringList nicknameList; QString partReason; + QString quitReason; QString kickReason; bool insertRememberLineOnAway; bool showAwayMessages; QString awayMessage; QString returnMessage; + + bool m_automaticAway; + int m_awayInactivity; + bool m_automaticUnaway; + QString m_codecName; QTextCodec* m_codec; @@ -112,7 +124,10 @@ private: int m_id; static int s_availableId; + void init(); }; typedef KSharedPtr IdentityPtr; +typedef QValueList IdentityList; + #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ignore.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ignore.cpp --- konversation-1.0.1/konversation/src/ignore.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ignore.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -13,6 +13,7 @@ #include "ignore.h" + Ignore::Ignore(const QString &newName,int newFlags) { setFlags(newFlags); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ignore.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ignore.h --- konversation-1.0.1/konversation/src/ignore.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ignore.h 2008-08-06 16:56:27.000000000 +0100 @@ -16,9 +16,6 @@ #include -/* - @author Dario Abatianni -*/ class Ignore { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ignorelistviewitem.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ignorelistviewitem.cpp --- konversation-1.0.1/konversation/src/ignorelistviewitem.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ignorelistviewitem.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -11,11 +11,12 @@ email: eisfuchs@tigress.com */ +#include "ignorelistviewitem.h" +#include "ignore.h" + #include #include -#include "ignorelistviewitem.h" -#include "ignore.h" IgnoreListViewItem::IgnoreListViewItem(QListView* parent,const QString& name,int newFlags): KListViewItem(parent,name) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ignorelistviewitem.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ignorelistviewitem.h --- konversation-1.0.1/konversation/src/ignorelistviewitem.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ignorelistviewitem.h 2008-08-06 16:56:27.000000000 +0100 @@ -14,14 +14,11 @@ #ifndef IGNORELISTVIEWITEM_H #define IGNORELISTVIEWITEM_H -/* - @author Dario Abatianni -*/ - #include #include + class IgnoreListViewItem : public KListViewItem { public: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ignore_preferences.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ignore_preferences.cpp --- konversation-1.0.1/konversation/src/ignore_preferences.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ignore_preferences.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -10,20 +10,23 @@ Copyright (C) 2006 John Tapsell */ +#include "ignore_preferences.h" +#include "ignorelistviewitem.h" +#include "ignore.h" +#include "preferences.h" + #include #include #include #include #include -#include "ignore_preferences.h" -#include "ignorelistviewitem.h" -#include "ignore.h" + #include #include #include #include #include -#include "preferences.h" + Ignore_Config::Ignore_Config( QWidget* parent, const char* name, WFlags fl ) : Ignore_ConfigUI( parent, name, fl ) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ignore_preferences.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ignore_preferences.h --- konversation-1.0.1/konversation/src/ignore_preferences.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ignore_preferences.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,6 +15,7 @@ #include "ignore_preferencesui.h" #include "konvisettingspage.h" + #include @@ -23,35 +24,35 @@ { Q_OBJECT -public: - Ignore_Config( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~Ignore_Config(); - QString flagNames; - - virtual void restorePageToDefaults(); - virtual void saveSettings(); - virtual void loadSettings(); - - virtual bool hasChanged(); - -private: - QStringList m_oldIgnoreList; - - QStringList currentIgnoreList(); // in hasChanged() format - QPtrList getIgnoreList(); // in prefs format - void updateEnabledness(); - -public slots: - virtual void languageChange(); - -protected slots: - void newIgnore(); - void removeIgnore(); - void flagCheckboxChanged(); - void select(QListViewItem* item); - void removeAllIgnore(); -signals: - void modified(); + public: + explicit Ignore_Config( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ~Ignore_Config(); + QString flagNames; + + virtual void restorePageToDefaults(); + virtual void saveSettings(); + virtual void loadSettings(); + + virtual bool hasChanged(); + + private: + QStringList m_oldIgnoreList; + + QStringList currentIgnoreList(); // in hasChanged() format + QPtrList getIgnoreList(); // in prefs format + void updateEnabledness(); + + public slots: + virtual void languageChange(); + + protected slots: + void newIgnore(); + void removeIgnore(); + void flagCheckboxChanged(); + void select(QListViewItem* item); + void removeAllIgnore(); + signals: + void modified(); }; #endif // IGNORE_CONFIG_H diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ignore_preferencesui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ignore_preferencesui.ui --- konversation-1.0.1/konversation/src/ignore_preferencesui.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ignore_preferencesui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -196,6 +196,18 @@ + + ignoreListView + txtPattern + chkChannel + chkQuery + chkNotice + chkCTCP + chkDCC + newButton + removeButton + removeAllButton + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/images.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/images.cpp --- konversation-1.0.1/konversation/src/images.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/images.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,14 +6,14 @@ */ /* - provides images - begin: Fri Feb 22 2002 - copyright: (C) 2002 by Dario Abatianni - email: eisfuchs@tigress.com - copyright: (C) 2005 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2002 Dario Abatianni + Copyright (C) 2005-2006 Eike Hein */ +#include "images.h" +#include "common.h" +#include "konversationapplication.h" + #include #include #include @@ -22,9 +22,6 @@ #include #include -#include "images.h" -#include "common.h" -#include "konversationapplication.h" using namespace Konversation; @@ -56,16 +53,19 @@ m_serverColor = "steelblue"; m_systemColor = Preferences::tabNotificationsSystemColor(); m_msgsColor = Preferences::tabNotificationsMsgsColor(); + m_privateColor = Preferences::tabNotificationsPrivateColor(); m_eventsColor = Preferences::tabNotificationsEventsColor(); m_nickColor = Preferences::tabNotificationsNickColor(); m_highlightsColor = Preferences::tabNotificationsHighlightsColor(); // m_serverLedOn = getLed(m_serverColor,true); - m_serverLedOff= getLed(m_serverColor,false); + m_serverLedOff = getLed(m_serverColor,false); m_systemLedOn = getLed(m_systemColor,true); - m_systemLedOff= getLed(m_systemColor,false); - m_msgsLedOn= getLed(m_msgsColor,true); - m_msgsLedOff= getLed(m_msgsColor,false); + m_systemLedOff = getLed(m_systemColor,false); + m_msgsLedOn = getLed(m_msgsColor,true); + m_msgsLedOff = getLed(m_msgsColor,false); + m_privateLedOn = getLed(m_privateColor,true); + m_privateLedOff = getLed(m_privateColor,false); m_eventsLedOn = getLed(m_eventsColor,true); m_nickLedOn = getLed(m_nickColor,true); m_highlightsLedOn = getLed(m_highlightsColor,true); @@ -274,6 +274,24 @@ } } +QIconSet Images::getPrivateLed(bool state) +{ + if (Preferences::tabNotificationsPrivateColor()!=m_privateColor) + { + if (state) + return getLed(Preferences::tabNotificationsPrivateColor(),true); + else + return getLed(Preferences::tabNotificationsPrivateColor(),false); + } + else + { + if (state) + return m_privateLedOn; + else + return m_privateLedOff; + } +} + QIconSet Images::getEventsLed() { if (Preferences::tabNotificationsEventsColor()!=m_eventsColor) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/images.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/images.h --- konversation-1.0.1/konversation/src/images.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/images.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,12 +6,8 @@ */ /* - provides images - begin: Fri Feb 22 2002 - copyright: (C) 2002 by Dario Abatianni - email: eisfuchs@tigress.com - copyright: (C) 2005 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2002 Dario Abatianni + Copyright (C) 2005-2006 Eike Hein */ #ifndef IMAGES_H @@ -21,9 +17,6 @@ #include #include -/* - @author Dario Abatianni -*/ /** * Do not create an instance of this class yourself. @@ -57,6 +50,7 @@ QIconSet getServerLed(bool state); QIconSet getSystemLed(bool state); QIconSet getMsgsLed(bool state); + QIconSet getPrivateLed(bool state); QIconSet getEventsLed(); QIconSet getNickLed(); QIconSet getHighlightsLed(); @@ -84,6 +78,8 @@ QIconSet m_systemLedOff; QIconSet m_msgsLedOn; QIconSet m_msgsLedOff; + QIconSet m_privateLedOn; + QIconSet m_privateLedOff; QIconSet m_eventsLedOn; QIconSet m_nickLedOn; QIconSet m_highlightsLedOn; @@ -91,6 +87,7 @@ QColor m_serverColor; QColor m_systemColor; QColor m_msgsColor; + QColor m_privateColor; QColor m_eventsColor; QColor m_nickColor; QColor m_highlightsColor; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/inputfilter.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/inputfilter.cpp --- konversation-1.0.1/konversation/src/inputfilter.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/inputfilter.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -8,21 +8,9 @@ /* Copyright (C) 2002 Dario Abatianni Copyright (C) 2004 Peter Simonsson - Copyright (C) 2006 Eike Hein + Copyright (C) 2006-2008 Eike Hein */ -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - #include "inputfilter.h" #include "server.h" #include "replycodes.h" @@ -35,6 +23,16 @@ #include "common.h" #include "notificationhandler.h" +#include +#include +#include +#include + +#include +#include +#include +#include +#include #include InputFilter::InputFilter() @@ -150,9 +148,14 @@ { Channel* channel = server->getChannelByName( parameterList[0] ); + if(!channel) { + kdError() << "Didn't find the channel " << parameterList[0] << endl; + return; + } + channel->appendAction(sourceNick,ctcpArgument); - if(channel && sourceNick != server->getNickname()) + if(sourceNick != server->getNickname()) { if(ctcpArgument.lower().find(QRegExp("(^|[^\\d\\w])" + QRegExp::escape(server->loweredNickname()) @@ -180,11 +183,11 @@ query = server->addQuery(nickinfo, false /* we didn't initiate this*/ ); // send action to query - query->appendAction(sourceNick,ctcpArgument, true /*use notifications if enabled - e.g. OSD */); + query->appendAction(sourceNick,ctcpArgument); if(sourceNick != server->getNickname() && query) { - konv_app->notificationHandler()->nick(query, sourceNick, ctcpArgument); + konv_app->notificationHandler()->queryMessage(query, sourceNick, ctcpArgument); } } } @@ -240,7 +243,7 @@ else { // Do not internationalize the below version string - reply = QString("Konversation %1 (C) 2002-2006 by the Konversation team") + reply = QString("Konversation %1 (C) 2002-2008 by the Konversation team") .arg(QString(KONVI_VERSION)); } server->ctcpReply(sourceNick,"VERSION "+reply); @@ -269,26 +272,81 @@ } dccArgumentList += QStringList::split(' ', dccArguments); - // Incoming file? if(dccType=="send") { - konv_app->notificationHandler()->dccIncoming(server->getStatusView(), sourceNick); - emit addDccGet(sourceNick,dccArgumentList); + if(dccArgumentList.count()==4) + { + // incoming file + konv_app->notificationHandler()->dccIncoming(server->getStatusView(), sourceNick); + emit addDccGet(sourceNick,dccArgumentList); + } + else if(dccArgumentList.count()==5) + { + if(dccArgumentList[2]=="0") + { + // incoming file (Reverse DCC) + konv_app->notificationHandler()->dccIncoming(server->getStatusView(), sourceNick); + emit addDccGet(sourceNick,dccArgumentList); + } + else + { + // the receiver accepted the offer for Reverse DCC + emit startReverseDccSendTransfer(sourceNick,dccArgumentList); + } + } + else + { + server->appendMessageToFrontmost(i18n("DCC"), + i18n("Received invalid DCC SEND request from %1.") + .arg(sourceNick) + ); + } } - // Incoming file that shall be resumed? else if(dccType=="accept") { - emit resumeDccGetTransfer(sourceNick,dccArgumentList); + // resume request was accepted + if(dccArgumentList.count()==3) + { + emit resumeDccGetTransfer(sourceNick,dccArgumentList); + } + else + { + server->appendMessageToFrontmost(i18n("DCC"), + i18n("Received invalid DCC ACCEPT request from %1.") + .arg(sourceNick) + ); + } } // Remote client wants our sent file resumed else if(dccType=="resume") { - emit resumeDccSendTransfer(sourceNick,dccArgumentList); + if(dccArgumentList.count()==3) + { + emit resumeDccSendTransfer(sourceNick,dccArgumentList); + } + else + { + server->appendMessageToFrontmost(i18n("DCC"), + i18n("Received invalid DCC RESUME request from %1.") + .arg(sourceNick) + ); + } } else if(dccType=="chat") { - // will be connected via Server to KonversationMainWindow::addDccChat() - emit addDccChat(server->getNickname(),sourceNick,server->getNumericalIp(),dccArgumentList,false); + + if(dccArgumentList.count()==3) + { + // will be connected via Server to KonversationMainWindow::addDccChat() + emit addDccChat(server->getNickname(),sourceNick,dccArgumentList,false); + } + else + { + server->appendMessageToFrontmost(i18n("DCC"), + i18n("Received invalid DCC CHAT request from %1.") + .arg(sourceNick) + ); + } } else { @@ -325,12 +383,12 @@ server->appendServerMessageToChannel( parameterList[0], "CTCP", - i18n("Received unknown CTCP-%1 request from %2 to Channel %3") + i18n("Received unknown CTCP-%1 request from %2 to Channel %3.") .arg(ctcp).arg(sourceNick).arg(parameterList[0]) ); else server->appendMessageToFrontmost(i18n("CTCP"), - i18n("Received unknown CTCP-%1 request from %2") + i18n("Received unknown CTCP-%1 request from %2.") .arg(ctcp).arg(sourceNick) ); } @@ -339,50 +397,7 @@ // No CTCP, so it's an ordinary channel or query message else { - trailing=static_cast(kapp)->doAutoreplace(trailing,false); - if (isChan) - { - if(!isIgnore(prefix,Ignore::Channel)) - { - Channel* channel = server->getChannelByName(parameterList[0]); - if(channel) - { - channel->append(sourceNick, trailing); - - if(sourceNick != server->getNickname()) - { - if(trailing.lower().find(QRegExp("(^|[^\\d\\w])" + - QRegExp::escape(server->loweredNickname()) + "([^\\d\\w]|$)")) !=-1 ) - { - konv_app->notificationHandler()->nick(channel, sourceNick, trailing); - } - else - { - konv_app->notificationHandler()->message(channel, sourceNick, trailing); - } - } - } - } - } - else - { - if(!isIgnore(prefix,Ignore::Query)) - { - NickInfoPtr nickinfo = server->obtainNickInfo(sourceNick); - nickinfo->setHostmask(sourceHostmask); - - // Create a new query (server will check for dupes) - query = server->addQuery(nickinfo, false /*we didn't initiate this*/ ); - - // send action to query - query->appendQuery(sourceNick, trailing, true /*use notifications if enabled - e.g. OSD */ ); - - if(sourceNick != server->getNickname() && query) - { - konv_app->notificationHandler()->nick(query, sourceNick, trailing); - } - } - } + parsePrivMsg (prefix, parameterList, trailing); } } else if(command=="notice") @@ -435,7 +450,7 @@ else { server->appendMessageToFrontmost(i18n("CTCP"), - i18n("Received CTCP-%1 reply from %2: %3") + i18n("Received CTCP-%1 reply from %2: %3.") .arg(replyReason).arg(sourceNick).arg(reply) ); } @@ -498,12 +513,12 @@ server->getChannelByName(channelName)->clearModeList(); // Request modes for the channel - server->queue("MODE "+channelName); + server->queue("MODE "+channelName, Server::LowPriority); // Initiate channel ban list server->getChannelByName(channelName)->clearBanList(); setAutomaticRequest("BANLIST",channelName,true); - server->queue("MODE "+channelName+" +b"); + server->queue("MODE "+channelName+" +b", Server::LowPriority); } else { @@ -572,7 +587,10 @@ } else if(command=="mode") // mode #channel -/+ mmm params { - parseModes(sourceNick,parameterList); + QStringList params=parameterList; + if (!trailing.isEmpty()) + params << trailing; + parseModes(sourceNick, params); Channel* channel = server->getChannelByName(parameterList[0]); if(sourceNick != server->getNickname()) { @@ -581,11 +599,18 @@ } else if(command=="invite") { + QString channel; + + if (parameterList.count() > 1) + channel = parameterList[1]; + else + channel = trailing; + server->appendMessageToFrontmost(i18n("Invite"), - i18n("%1 invited you to channel %2") - .arg(sourceNick).arg(trailing) + i18n("%1 invited you to channel %2.") + .arg(sourceNick).arg(channel) ); - emit invitation(sourceNick,trailing); + emit invitation(sourceNick,channel); } else { @@ -618,7 +643,8 @@ } // queue the reply to send it as soon as possible - server->queueAt(0,"PONG"+text); + server->queue("PONG"+text, Server::HighPriority); + } else if(command=="error :closing link:") { @@ -635,12 +661,23 @@ } else if(command=="mode") { - parseModes(prefix,parameterList); + QStringList params=parameterList; + if (!trailing.isEmpty()) + params << trailing; + parseModes(prefix, params); } else if(command=="notice") { server->appendStatusMessage(i18n("Notice"),i18n("-%1- %2").arg(prefix).arg(trailing)); } + else if(command=="kick") + { + server->nickWasKickedFromChannel(parameterList[0],parameterList[1],prefix,trailing); + } + else if(command == "privmsg") + { + parsePrivMsg(prefix, parameterList, trailing); + } // All yet unknown messages go into the frontmost window unaltered else { @@ -666,9 +703,6 @@ if(parameterList[0]!=server->getNickname()) server->renameNick(server->getNickname(), parameterList[0]); - // Remember server's insternal name - server->setIrcName(prefix); - // Send the welcome signal, so the server class knows we are connected properly emit welcome(host); m_connecting = true; @@ -719,7 +753,7 @@ pos = value.find(')',1); if(pos==-1) { - server->setPrefixes (QString::null, value); + server->setPrefixes(QString(), value); // XXX if ) isn't in the string, NOTHING should be there. anyone got a server if (value.length() || property.length()) server->appendStatusMessage("","XXX Server sent bad PREFIX in RPL_ISUPPORT, please report."); @@ -745,16 +779,22 @@ } // endfor break; } + case RPL_UMODEIS: + { + QString message=QString("%1 %2").arg(i18n("Your personal modes are:")).arg(parameterList.join(" ").section(' ',1) + ' '+trailing); + server->appendMessageToFrontmost("Info", message); + break; + } case RPL_CHANNELMODEIS: { const QString modeString=parameterList[2]; // This is the string the user will see - QString modesAre(QString::null); + QString modesAre; QString message = i18n("Channel modes: ") + modeString; for(unsigned int index=0;indexupdateChannelModeWidgets(parameterList[1],mode,parameter); } - } // endfor - if(!modesAre.isEmpty()) - if (Preferences::useLiteralModes()) + } // endfor + if(!modesAre.isEmpty() && Preferences::useLiteralModes()) { server->appendCommandMessageToChannel(parameterList[1],i18n("Mode"),message); } @@ -811,6 +850,12 @@ } break; } + case RPL_CHANNELURLIS: + {// :niven.freenode.net 328 argonel #channel :http://www.buggeroff.com/ + server->appendCommandMessageToChannel(parameterList[1], i18n("URL"), + i18n("Channel URL: %1").arg(trailing)); + break; + } case RPL_CHANNELCREATED: { QDateTime when; @@ -819,12 +864,21 @@ i18n("This channel was created on %1.") .arg(when.toString(Qt::LocalDate)) ); + + if(Preferences::autoWhoContinuousEnabled()) + { + emit endOfWho(parameterList[1]); + } + break; } case RPL_WHOISACCOUNT: { - server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is logged in as %2.").arg(parameterList[1]).arg(parameterList[2])); - + // Display message only if this was not an automatic request. + if(getAutomaticRequest("WHOIS",parameterList[1])==0) + { + server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is logged in as %2.").arg(parameterList[1]).arg(parameterList[2])); + } break; } case RPL_NAMREPLY: @@ -908,10 +962,8 @@ { server->appendCommandMessageToChannel(parameterList[1],i18n("Topic"), i18n("The topic was set by %1 on %2.") - .arg(parameterList[2]).arg(when.toString(Qt::LocalDate)) - ); - - emit topicAuthor(parameterList[1],parameterList[2]); + .arg(parameterList[2]).arg(when.toString(Qt::LocalDate)), + false); } else { @@ -922,13 +974,17 @@ ); setAutomaticRequest("TOPIC",parameterList[1],false); } + emit topicAuthor(parameterList[1], parameterList[2], when); break; } case RPL_WHOISACTUALLY: { - server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is actually using the host %2.").arg(parameterList[1]).arg(parameterList[2])); - + // Display message only if this was not an automatic request. + if(getAutomaticRequest("WHOIS",parameterList[1])==0) + { + server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is actually using the host %2.").arg(parameterList[1]).arg(parameterList[2])); + } break; } case ERR_NOSUCHNICK: @@ -939,7 +995,7 @@ { server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such nick/channel.").arg(parameterList[1])); } - else + else if(getAutomaticRequest("WHOIS",parameterList[1])==0) //Display message only if this was not an automatic request. { server->appendMessageToFrontmost(i18n("Error"),i18n("No such nick: %1.").arg(parameterList[1])); setAutomaticRequest("DNS", parameterList[1], false); @@ -949,15 +1005,18 @@ } case ERR_NOSUCHCHANNEL: { - server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such channel.").arg(parameterList[1])); - + // Display message only if this was not an automatic request. + if(getAutomaticRequest("WHOIS",parameterList[1])==0) + { + server->appendMessageToFrontmost(i18n("Error"),i18n("%1: No such channel.").arg(parameterList[1])); + } break; } // Nick already on the server, so try another one case ERR_NICKNAMEINUSE: { // if we are already connected, don't try tro find another nick ourselves - if(server->connected()) + if(server->isConnected()) { // Show message server->appendMessageToFrontmost(i18n("Nick"),i18n("Nickname already in use, try a different one.")); } @@ -986,7 +1045,7 @@ } case ERR_ERRONEUSNICKNAME: { - if(server->connected()) + if(server->isConnected()) { // We are already connected. Just print the error message server->appendMessageToFrontmost(i18n("Nick"), trailing); } @@ -1163,6 +1222,7 @@ } // From a WHOIS. //[19:11] :zahn.freenode.net 320 PhantomsDad psn :is an identified user + case RPL_WHOISIDENTIFY: case RPL_IDENTIFIED: { NickInfo* nickInfo = server->getNickInfo(parameterList[1]); @@ -1196,7 +1256,7 @@ nickInfo->setAway(bAway); if(!bAway) { - nickInfo->setAwayMessage(QString::null); + nickInfo->setAwayMessage(QString()); } } // Display message only if this was not an automatic request. @@ -1209,7 +1269,7 @@ .arg(parameterList[2]) .arg(parameterList[3]) .arg(trailing.section(" ", 1)) - .arg(bAway?i18n(" (Away)"):QString::null) + .arg(bAway?i18n(" (Away)"):QString()) , false); // Don't parse as url } } @@ -1219,9 +1279,11 @@ { if(!whoRequestList.isEmpty()) { // for safety - if(parameterList[1].lower()==whoRequestList.front()) + QStringList::iterator it = whoRequestList.find(parameterList[1].lower()); + + if(it != whoRequestList.end()) { - if(getAutomaticRequest("WHO",whoRequestList.front())==0) + if(getAutomaticRequest("WHO", *it) == 0) { server->appendMessageToFrontmost(i18n("Who"), i18n("End of /WHO list for %1") @@ -1229,9 +1291,10 @@ } else { - setAutomaticRequest("WHO",whoRequestList.front(),false); + setAutomaticRequest("WHO", *it, false); } - whoRequestList.pop_front(); + + whoRequestList.remove(it); } else { @@ -1248,6 +1311,7 @@ << parameterList[1] << endl; } + emit endOfWho(parameterList[1]); break; } @@ -1315,7 +1379,7 @@ if(voiceChannels.count()) { server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 has voice on channels: %2") + i18n("%1 has voice on channels: %2") .arg(parameterList[1]).arg(voiceChannels.join(" ")) ); } @@ -1360,7 +1424,7 @@ // Clear the away state on assumption that if nick is away, this message will be followed // by a 301 RPL_AWAY message. Not necessary a invalid assumption, but what can we do? nickInfo->setAway(false); - nickInfo->setAwayMessage(QString::null); + nickInfo->setAwayMessage(QString()); } // Display message only if this was not an automatic request. if(getAutomaticRequest("WHOIS",parameterList[1])==0) @@ -1372,18 +1436,6 @@ } break; } - case RPL_WHOISIDENTIFY: - { - // Display message only if this was not an automatic request. - if(getAutomaticRequest("WHOIS",parameterList[1])==0) - { - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 has identified for this nick.") - .arg(parameterList[1]) - ); - } - break; - } case RPL_WHOISHELPER: { // Display message only if this was not an automatic request. @@ -1401,10 +1453,10 @@ // Display message only if this was not an automatic request. if(getAutomaticRequest("WHOIS",parameterList[1])==0) { - server->appendMessageToFrontmost(i18n("Whois"), - i18n("%1 is a network admin.") - .arg(parameterList[1]) - ); + if (trailing.lower().simplifyWhiteSpace().startsWith("is an irc operator")) + server->appendMessageToFrontmost(i18n("Whois"),i18n("%1 is an IRC Operator.").arg(parameterList[1])); + else + server->appendMessageToFrontmost(i18n("Whois"),QString("%1 %2").arg(parameterList[1]).arg(trailing)); } break; } @@ -1535,9 +1587,9 @@ server->appendMessageToFrontmost(i18n("Userhost"), i18n("%1 = nick, %2 = shows if nick is op, %3 = hostmask, %4 = shows away", "%1%2 is %3%4.") .arg(nick) - .arg((ircOp) ? i18n(" (IRC Operator)") : QString::null) + .arg((ircOp) ? i18n(" (IRC Operator)") : QString()) .arg(mask) - .arg((away) ? i18n(" (away)") : QString::null)); + .arg((away) ? i18n(" (away)") : QString())); } // was this an automatic request? @@ -1550,7 +1602,7 @@ } case RPL_LISTSTART: //FIXME This reply is obsolete!!! { - if(getAutomaticRequest("LIST",QString::null)==0) + if(getAutomaticRequest("LIST",QString())==0) { server->appendMessageToFrontmost(i18n("List"),i18n("List of channels:")); } @@ -1558,7 +1610,7 @@ } case RPL_LIST: { - if(getAutomaticRequest("LIST",QString::null)==0) + if(getAutomaticRequest("LIST",QString())==0) { QString message; message=i18n("%1 (%n user): %2", "%1 (%n users): %2", parameterList[2].toInt()); @@ -1574,13 +1626,13 @@ case RPL_LISTEND: { // was this an automatic request? - if(getAutomaticRequest("LIST",QString::null)==0) + if(getAutomaticRequest("LIST",QString())==0) { server->appendMessageToFrontmost(i18n("List"),i18n("End of channel list.")); } else { - setAutomaticRequest("LIST",QString::null,false); + setAutomaticRequest("LIST",QString(),false); } break; } @@ -1588,35 +1640,22 @@ { NickInfo* nickInfo = server->getNickInfo(parameterList[0]); if (nickInfo) nickInfo->setAway(true); - server->appendMessageToFrontmost(i18n("Away"),i18n("You are now marked as being away.")); - if (!server->isAway()) emit away(); + + server->setAway(true); + break; } case RPL_UNAWAY: { NickInfo* nickInfo = server->getNickInfo(parameterList[0]); - if(nickInfo) + + if (nickInfo) { nickInfo->setAway(false); - nickInfo->setAwayMessage(QString::null); + nickInfo->setAwayMessage(QString()); } - Identity identity = *(server->getIdentity()); - - if(server->isAway()) - { - if(identity.getShowAwayMessage()) - { - QString message = identity.getReturnMessage(); - server->sendToAllChannels(message.replace(QRegExp("%t", false), server->awayTime())); - } - server->appendMessageToFrontmost(i18n("Away"),i18n("You are no longer marked as being away.")); - emit unAway(); - } - else - { - server->appendMessageToFrontmost(i18n("Away"),i18n("You are not marked as being away.")); - } + server->setAway(false); break; } @@ -1725,6 +1764,26 @@ { const QString modestring=parameterList[1]; + if (!isAChannel(parameterList[0])) + { + QString message; + if (parameterList[0] == server->getNickname()) + { + if (sourceNick == server->getNickname()) + { + //XXX someone might care about the potentially unnecessary plural here + message = i18n("You have set personal modes: ") + modestring; + } + else + { //XXX someone might care about the potentially unnecessary plural here + message = QString("%1 %2 %3").arg(sourceNick).arg(i18n("has changed your personal modes:")).arg(modestring); + } + } + if (!message.isEmpty()) + server->appendStatusMessage(i18n("Mode"), message); + return; + } + bool plus=false; int parameterIndex=0; // List of modes that need a parameter (note exception with -k and -l) @@ -1835,6 +1894,91 @@ bool InputFilter::getLagMeasuring() { return lagMeasuring; } +void InputFilter::parsePrivMsg(const QString& prefix, + const QStringList& parameterList, + const QString& trailing) +{ + int pos = prefix.find("!"); + QString source; + QString sourceHostmask; + QString message(trailing); + + if(pos > 0) + { + source = prefix.left(pos); + sourceHostmask = prefix.mid(pos + 1); + } + else + { + source = prefix; + } + + KonversationApplication* konv_app = static_cast(kapp); + message = konv_app->doAutoreplace(message, false); + + if(isAChannel(parameterList[0])) + { + if(!isIgnore(prefix, Ignore::Channel)) + { + Channel* channel = server->getChannelByName(parameterList[0]); + if(channel) + { + channel->append(source, message); + + if(source != server->getNickname()) + { + QRegExp regexp("(^|[^\\d\\w])" + + QRegExp::escape(server->loweredNickname()) + + "([^\\d\\w]|$)"); + regexp.setCaseSensitive(false); + if(message.find(regexp) !=-1 ) + { + konv_app->notificationHandler()->nick(channel, + source, message); + } + else + { + konv_app->notificationHandler()->message(channel, + source, message); + } + } + } + } + } + else + { + if(!isIgnore(prefix,Ignore::Query)) + { + NickInfoPtr nickinfo = server->obtainNickInfo(source); + nickinfo->setHostmask(sourceHostmask); + + // Create a new query (server will check for dupes) + query = server->addQuery(nickinfo, false /*we didn't initiate this*/ ); + + // send action to query + query->appendQuery(source, message); + + if(source != server->getNickname() && query) + { + QRegExp regexp("(^|[^\\d\\w])" + + QRegExp::escape(server->loweredNickname()) + + "([^\\d\\w]|$)"); + regexp.setCaseSensitive(false); + if(message.find(regexp) !=-1 ) + { + konv_app->notificationHandler()->nick(query, + source, message); + } + else + { + konv_app->notificationHandler()->queryMessage(query, + source, message); + } + } + } + } +} + #include "inputfilter.moc" // kate: space-indent on; tab-width 4; indent-width 4; mixed-indent off; replace-tabs on; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/inputfilter.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/inputfilter.h --- konversation-1.0.1/konversation/src/inputfilter.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/inputfilter.h 2008-08-06 16:56:27.000000000 +0100 @@ -8,24 +8,22 @@ /* Copyright (C) 2002 Dario Abatianni Copyright (C) 2004 Peter Simonsson - Copyright (C) 2006 Eike Hein + Copyright (C) 2006-2008 Eike Hein */ #ifndef INPUTFILTER_H #define INPUTFILTER_H +#include "ignore.h" + #include #include -#include "ignore.h" - -/* - @author Dario Abatianni -*/ class Server; class QWidget; class Query; +class QDateTime; class InputFilter : public QObject { @@ -52,6 +50,8 @@ signals: void welcome(const QString& ownHost); void notifyResponse(const QString &nicksOnline); + // will be connected to Server::startReverseDccSendTransfer() + void startReverseDccSendTransfer(const QString &sourceNick, const QStringList &dccArgument); // will be connected to Server::addDccGet() void addDccGet(const QString &sourceNick, const QStringList &dccArgument); // will be connected to Server::resumeDccGetTransfer() @@ -61,20 +61,19 @@ // will be connected to Server::userhost() void userhost(const QString& nick,const QString& hostmask,bool away,bool ircOp); // will be connected to Server::setTopicAuthor() - void topicAuthor(const QString& channel,const QString& author); + void topicAuthor(const QString& channel, const QString& author, QDateTime t); void endOfWho(const QString& target); // for scheduling auto /WHO void addChannelListPanel(); void addToChannelList(const QString& channel,int users,const QString& topic); void invitation(const QString& nick,const QString& channel); - void away(); - void unAway(); - void addDccChat(const QString& myNick,const QString& nick,const QString& numericalIp,const QStringList& arguments,bool listen); + void addDccChat(const QString& myNick,const QString& nick,const QStringList& arguments,bool listen); protected: void parseClientCommand(const QString &prefix, const QString &command, const QStringList ¶meterList, const QString &trailing); void parseServerCommand(const QString &prefix, const QString &command, const QStringList ¶meterList, const QString &trailing); void parseModes(const QString &sourceNick, const QStringList ¶meterList); + void parsePrivMsg(const QString& prefix, const QStringList& parameterList, const QString& trailing); bool isAChannel(const QString &check); bool isIgnore(const QString &pattern, Ignore::Type type); @@ -87,7 +86,6 @@ Query* query; - QStringList newNickList; int m_debugCount; /// Used when handling MOTD diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/insertchardialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/insertchardialog.cpp --- konversation-1.0.1/konversation/src/insertchardialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/insertchardialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -15,6 +15,7 @@ #include #include + namespace Konversation { @@ -36,6 +37,11 @@ { } + void InsertCharDialog::setFont(const QFont &font) + { + m_charTable->setFont(font.family()); + } + QChar InsertCharDialog::chr() { return m_charTable->chr(); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/insertchardialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/insertchardialog.h --- konversation-1.0.1/konversation/src/insertchardialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/insertchardialog.h 2008-08-06 16:56:27.000000000 +0100 @@ -14,6 +14,7 @@ #include + class KCharSelect; class QChar; @@ -23,10 +24,12 @@ class InsertCharDialog : public KDialogBase { Q_OBJECT - public: - InsertCharDialog(const QString& font = QString::null, QWidget *parent = 0, const char *name = 0); + + public: + explicit InsertCharDialog(const QString& font = QString(), QWidget *parent = 0, const char *name = 0); ~InsertCharDialog(); + void setFont(const QFont &font); QChar chr(); protected slots: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/irccharsets.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/irccharsets.cpp --- konversation-1.0.1/konversation/src/irccharsets.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/irccharsets.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -8,14 +8,9 @@ (at your option) any later version. */ -#include - -#if QT_VERSION < 0x030300 -#include -#else -#include -#endif +#include "irccharsets.h" +#include #include #include #include @@ -23,7 +18,12 @@ #include #include -#include "irccharsets.h" +#if QT_VERSION < 0x030300 +#include +#else +#include +#endif + namespace Konversation { @@ -138,7 +138,8 @@ // setup m_shortNameAliases // use only [a-z0-9] for keys! - m_shortNameAliases[ "unicode" ] = "utf8"; + m_shortNameAliases["unicode"] = "utf8"; + m_shortNameAliases["latin1"] = "iso-8859-1"; // setup m_shortNames, m_descriptiveNames, m_simplifiedShortNames QRegExp reSimplify( "[^a-zA-Z0-9]" ); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/irccharsets.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/irccharsets.h --- konversation-1.0.1/konversation/src/irccharsets.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/irccharsets.h 2008-08-06 16:56:27.000000000 +0100 @@ -14,6 +14,7 @@ #include #include + namespace Konversation { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/irccolorchooser.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/irccolorchooser.cpp --- konversation-1.0.1/konversation/src/irccolorchooser.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/irccolorchooser.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -13,6 +13,8 @@ */ #include "irccolorchooser.h" +#include "irccolorchooserui.h" +#include "config/preferences.h" #include #include @@ -20,8 +22,6 @@ #include #include -#include "irccolorchooserui.h" -#include "config/preferences.h" IRCColorChooser::IRCColorChooser(QWidget* parent, const char* name) : KDialogBase(parent, name, true, i18n("IRC Color Chooser"), Ok|Cancel, Ok) @@ -73,7 +73,7 @@ { QPixmap pix(width(), combo->fontMetrics().height() + 4); - for (int i =0; i < 11; i++) + for (int i =0; i < 15; i++) { pix.fill(Preferences::ircColorCode(i)); combo->insertItem(pix, i); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/irccolorchooser.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/irccolorchooser.h --- konversation-1.0.1/konversation/src/irccolorchooser.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/irccolorchooser.h 2008-08-06 16:56:27.000000000 +0100 @@ -17,6 +17,7 @@ #include + class IRCColorChooserUI; class KComboBox; class Preferences; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ircinput.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ircinput.cpp --- konversation-1.0.1/konversation/src/ircinput.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ircinput.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,13 +12,13 @@ email: eisfuchs@tigress.com */ -#include -#include -#include -#include +#include "ircinput.h" +#include "konversationapplication.h" +#include "multilineedit.h" +#include "chatwindow.h" +#include "ircview.h" #include - #include #include #include @@ -27,15 +27,15 @@ #include #include -#include "ircinput.h" -#include "konversationapplication.h" -#include "multilineedit.h" -#include "chatwindow.h" -#include "ircview.h" +#include +#include +#include +#include #define MAXHISTORY 100 #define RICHTEXT 0 + IRCInput::IRCInput(QWidget* parent) : KTextEdit(parent) { m_lastHeight=document()->height(); @@ -52,7 +52,7 @@ // connect history signal connect(this,SIGNAL (history(bool)) ,this,SLOT (getHistory(bool)) ); // add one empty line to the history (will be overwritten with newest entry) - historyList.prepend(QString::null); + historyList.prepend(QString()); // reset history line counter lineNum=0; // reset completion mode @@ -75,7 +75,7 @@ setTextFormat(PlainText); #endif - QWhatsThis::add(this, i18n("The input line is where you type messages to be sent the channel, query, or server. A message sent to a channel is seen by everyone on the channel, whereas a message in a query is sent only to the person in the query with you.

You can also send special commands:
/me actionshows up as an action in the channel or query. For example: /me sings a song will show up in the channel as 'Nick sings a song'.
/whois nicknameshows information about this person, including what channels they are in.

For more commands, see the Konversation Handbook.

A message can be a maximum of 512 letters long, and cannot contain multiple lines.")); + QWhatsThis::add(this, i18n("The input line is where you type messages to be sent the channel, query, or server. A message sent to a channel is seen by everyone on the channel, whereas a message in a query is sent only to the person in the query with you.

To automatically complete the nickname you began typing, press Tab. If you have not begun typing, the last successfully completed nickname will be used.

You can also send special commands:
/me actionshows up as an action in the channel or query. For example: /me sings a song will show up in the channel as 'Nick sings a song'.
/whois nicknameshows information about this person, including what channels they are in.

For more commands, see the Konversation Handbook.

A message cannot contain multiple lines.")); m_disableSpellCheckTimer = new QTimer(this); connect(m_disableSpellCheckTimer, SIGNAL(timeout()), this, SLOT(disableSpellChecking())); @@ -290,7 +290,7 @@ insert("%G"); // support ^U (delete text in input box) else if(e->ascii() == 21) - clear(); + setText(""); } KTextEdit::keyPressEvent(e); @@ -304,7 +304,7 @@ // Replace empty first entry with line historyList[0]=line; // Add new empty entry to history - historyList.prepend(QString::null); + historyList.prepend(QString()); // Remove oldest line in history, if the list grows beyond MAXHISTORY if(historyList.count()>MAXHISTORY) historyList.remove(historyList.last()); } @@ -331,7 +331,7 @@ if(lineNum==0) { if(text().length()) addHistory(text()); - clear(); + setText(""); } // If we aren't at the top of the list, decrement the line counter else @@ -408,6 +408,12 @@ while(pasteText.contains(reBottomSpace)) pasteText.remove(reBottomSpace); + // Escape % when var expansion is enabled + if (!Preferences::disableExpansion()) + { + pasteText.replace ('%', "%%"); + } + // does the text contain at least one newline character? if(pasteText.find('\n')!=-1) { @@ -447,9 +453,9 @@ // signal pasted text emit textPasted(pasteText); // remember old line, in case the user does not paste eventually - addHistory(text()); + addHistory(pasteText); // delete input text - clear(); + setText(""); } } // otherwise let the KLineEdit handle the pasting @@ -474,7 +480,8 @@ i18n("Large Paste Warning"), i18n("Paste"), i18n("&Edit..."), - "LargePaste"); + "LargePaste", + KMessageBox::Dangerous); } if (doPaste==KMessageBox::No) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ircinput.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ircinput.h --- konversation-1.0.1/konversation/src/ircinput.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ircinput.h 2008-08-06 16:56:27.000000000 +0100 @@ -19,9 +19,6 @@ #include -/* - @author Dario Abatianni -*/ class KCompletionBox; class QMouseEvent; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ircqueue.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ircqueue.cpp --- konversation-1.0.1/konversation/src/ircqueue.cpp 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/ircqueue.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,209 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) version 2. +*/ + +/* + Copyright (C) 2008 Eli J. MacKenzie +*/ + +#include +#include +#include + +#include "ircqueue.h" +#include "server.h" + +//#include "/home/ejm/argnl.h" + +IRCQueue::EmptyingRate staticrates[Server::Howmanyqueuesdoweneedanywayquestionmark]; /*= + { + IRCQueue::EmptyingRate(6,60000) + ,IRCQueue::EmptyingRate(20,60000) + ,IRCQueue::EmptyingRate(1,1000)//,IRCQueue::EmptyingRate::Bytes) + }; +*/ + +int IRCQueue::EmptyingRate::nextInterval(int, int elapsed) +{ + if (!isValid()) + return 0; + //KX << _S(m_interval) << endl; + if (m_type == Lines) + { + int i = m_interval/m_rate; + //KX << _S(i) << endl; + if (iisConnected()); + } +} + +IRCQueue::~IRCQueue() +{ + kdDebug() << "~IRCQueue" << endl; +} + +QString IRCQueue::pop() +{ + if (m_pending.isEmpty()) + return QString(""); + + IRCMessage msg=m_pending.first(); + m_pending.pop_front(); + m_lastWait=msg.age(); + m_lastSent=QTime::currentTime(); + return msg.text(); +} + +int IRCQueue::nextSize() +{ + if (m_pending.isEmpty()) + return 0; + return m_pending.first().text().length(); +} + +int IRCQueue::currentWait() +{ + if (m_pending.isEmpty()) + return 0; + return m_pending.first().age(); +} + +int IRCQueue::elapsed() +{ + if (m_startedAt.isNull()) + return 0; + else + return m_startedAt.elapsed(); //FIXME if its been more than a day since this queue was used, this breaks +} + +int IRCQueue::linesSent() const +{ + return m_linesSent; +} + +int IRCQueue::bytesSent() const +{ + return m_bytesSent; +} + +///Feedback indicating size of data sent to update statistics. Not necessarily data from this queue!!! +void IRCQueue::sent(int, int e, IRCQueue *wq) +{ + //KX << k_funcinfo << _S(m_mine) << endl; + m_globalLinesSent++; + m_globalBytesSent+=e; // we don't care about the unencoded bytes, we want what went to the server + if (wq == this) { + m_linesSent++; + m_bytesSent+=e; + } +} + +void IRCQueue::enqueue(QString line) +{ + m_pending.append(IRCMessage(line)); + if (!m_timer->isActive()) + adjustTimer(); +} + +//starts timer if stopped, adjusts interval if necessary +void IRCQueue::adjustTimer() +{ + int msec; + msec=getRate().nextInterval(nextSize(), elapsed()); + //if (m_myIndex == 0) + // KX << _S(msec) << endl; + m_timer->start(msec,true); + m_startedAt.start(); + return; +} + +bool IRCQueue::doSend() +{ + bool p=!m_pending.isEmpty(); + if (p) + { + // int plw = m_lastWait; + QString s=pop(); + //if (m_myIndex == 0) + // KX << _S(plw) << _S(m_lastWait) << endl; + m_server->toServer(s, this); + m_startedAt.start(); + } + return p;//if we sent something, fire the timer again +} + +///it would probably be better to delete and recreate the queue. +void IRCQueue::reset() +{ + // KX << k_funcinfo << endl; + m_timer->stop(); + m_lastWait=0; + if (m_server) + m_blocked=!(m_server->isConnected()); //FIXME (maybe) "we can't do this anymore because blocked can't correspond to whether the server is online, instead must correspond to whether the socket has become writable (readyWrite)" + + m_startedAt=m_globalLastSent=m_lastSent=QTime(); + m_pending.clear(); + m_linesSent=m_bytesSent=m_globalBytesSent=m_globalLinesSent=0; +} + +//called when the timer fires. +void IRCQueue::sendNow() +{ + if (doSend()) + adjustTimer(); + //else //its a single-shot timer so if we don't adjust it, it won't run :) +} + +///lets us know we should block output +void IRCQueue::serverOnline(bool on) +{ + if (m_blocked!=on) + return; + m_blocked=!on; + if (m_blocked && m_timer->isActive()) + reset(); + else if (!m_blocked && !m_timer->isActive() && nextSize()) + { + adjustTimer(); + } +} + +#include "ircqueue.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ircqueue.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ircqueue.h --- konversation-1.0.1/konversation/src/ircqueue.h 1970-01-01 01:00:00.000000000 +0100 +++ konversation-1.1/konversation/src/ircqueue.h 2008-08-06 16:56:27.000000000 +0100 @@ -0,0 +1,137 @@ +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) version 2. +*/ + +/* + Copyright (C) 2008 Eli J. MacKenzie +*/ + + +#ifndef IRCQUEUE_H +#define IRCQUEUE_H + +class Server; + +//channel.cpp, outputfilter.cpp, query.cpp, server.cpp, statuspanel.cpp + +/** + * A message from or to an IRC server. + * + * Contains all we know about the message, which currently consists of the text, the time it was created, + * and its original encoding. (Since currently these objects are only used internally, we know the message + * is Unicode.) + */ +struct IRCMessage +{ + IRCMessage() : t(QTime::currentTime()) //, codec(QTextCodec::codecForName("utf8")) + {} ///< this constructor required for QValueList, do not use + + /** + Make a new IRCMessage with timestamp of QTime::currentTime(). + + Note the constructor takes a QString, not a const QString& or a QString *. If you want to modify the + contained text, put it back with setText. + */ + IRCMessage(QString i) : s(i), t(QTime::currentTime()) //, codec(QTextCodec::codecForName("utf8")) + {} + + QString text() { return s; } + int age() { return t.elapsed(); } + QTime time() { return t; } + void setText(QString text) { s=text; } +private: + QString s; + QTime t; + + //FIXME wire this up + //QTextCodec* codec; + //operator const char * () const { return codec->fromUnicode(text()); } + +}; + +/** +* Provides a self-sending queue of IRCMessages. +* +* Messages enqueued in this server can only be erased via reset() or sent to the attached server. +* The server and the emptying rates cannot be changed, if you want to do that construct a new queue. + +*/ +class IRCQueue: public QObject +{ + Q_OBJECT + +public: + struct EmptyingRate + { + enum RateType { + Lines, ///< Lines per interval. + Bytes ///< Bytes per interval. Not implemented. FIXME + }; + EmptyingRate(int rate=6, int msec_interval=50000, RateType type=Lines): + m_rate(rate), m_interval(msec_interval), m_type(type) + { + } + + int nextInterval(int byte_size, int msec_since_last); + + int m_rate; + int m_interval; + RateType m_type; + bool isValid() { return m_rate > 0; } + }; + + IRCQueue(Server *server, EmptyingRate& rate, int myindex=0); + ~IRCQueue(); + + void enqueue(QString line); + void reset(); + EmptyingRate& getRate();// { return &m_rate; } + + bool isValid() { return m_rate.isValid(); } + bool isEmpty() { return m_pending.isEmpty(); } + + //WTF? why are there two of these. + //These are decoupled for a reason, what is it? + int currentWait(); ///< Time in ms that the front has been waiting + int elapsed(); ///< How long has the queue been running since it was last started? + + int nextSize(); ///< Current size of front + int pendingMessages() { return m_pending.count(); } + int linesSent() const; ///< count of lines sent by this queue + int bytesSent() const; ///< count of bytes sent by this queue + + ///Time in milliseconds that the previous message waited + int lastWait() { return m_lastWait; } + +public slots: + void sent(int bytes, int encodedBytes, IRCQueue *); ///< feedback statistics + void sendNow(); ///< dumps a line to the socket + void serverOnline(bool on); ///< server tells us that the socket is ready + +protected: + QString pop(); ///< pops front, sets statistics + void adjustTimer(); ///< sets the next timer interval + bool doSend(); ///< pops front and tells the server to send it. returns true if we sent something + EmptyingRate& m_rate; + +private: + QValueList m_pending; + QTimer *m_timer; + bool m_blocked; + bool m_online; + Server *m_server; + + QTime m_startedAt; + QTime m_lastSent, m_globalLastSent; + int m_linesSent, m_globalLinesSent; + int m_bytesSent, m_globalBytesSent; + int m_lastWait; + int m_myIndex; +}; + +extern IRCQueue::EmptyingRate staticrates[]; + +#endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ircviewbox.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ircviewbox.cpp --- konversation-1.0.1/konversation/src/ircviewbox.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ircviewbox.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -9,14 +9,15 @@ Copyright (C) 2005 Renchi Raju */ +#include "ircviewbox.h" +#include "ircview.h" +#include "searchbar.h" + #include #include #include #include -#include "ircview.h" -#include "searchbar.h" -#include "ircviewbox.h" static QPixmap getIcon(const QString& name) { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ircviewbox.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ircviewbox.h --- konversation-1.0.1/konversation/src/ircviewbox.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ircviewbox.h 2008-08-06 16:56:27.000000000 +0100 @@ -14,6 +14,7 @@ #include + class IRCView; class SearchBar; class Server; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ircview.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ircview.cpp --- konversation-1.0.1/konversation/src/ircview.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ircview.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -8,14 +8,26 @@ */ /* - the text widget used for all text based panels - begin: Sun Jan 20 2002 - copyright: (C) 2002 by Dario Abatianni - email: eisfuchs@tigress.com + Copyright (C) 2002 Dario Abatianni + Copyright (C) 2005-2007 Peter Simonsson + Copyright (C) 2006-2008 Eike Hein */ -#include +#include "ircview.h" +#include "channel.h" +#include "dccchat.h" +#include "konversationapplication.h" +#include "konversationmainwindow.h" +#include "viewcontainer.h" +#include "connectionmanager.h" +#include "highlight.h" +#include "server.h" +#include "konversationsound.h" +#include "common.h" +#include "emoticon.h" +#include "notificationhandler.h" +#include #include #include #include @@ -50,19 +62,11 @@ #include #include #include +#include +#include +#include +#include -#include "channel.h" -#include "dccchat.h" -#include "konversationapplication.h" -#include "konversationmainwindow.h" -#include "viewcontainer.h" -#include "ircview.h" -#include "highlight.h" -#include "server.h" -#include "konversationsound.h" -#include "common.h" -#include "emoticon.h" -#include "notificationhandler.h" IRCView::IRCView(QWidget* parent, Server* newServer) : KTextBrowser(parent) { @@ -75,7 +79,14 @@ m_chatWin = 0; m_findParagraph=0; m_findIndex=0; - m_lastInsertionWasLine = false; + m_nickPopup = 0; + m_channelPopup = 0; + + m_rememberLineParagraph = -1; + m_rememberLineDirtyBit = false; + + m_disableEnsureCursorVisible = false; + m_wasPainted = false; setAutoFormatting(QTextEdit::AutoNone); setUndoRedoEnabled(0); @@ -94,20 +105,23 @@ m_popup = new QPopupMenu(this,"ircview_context_menu"); toggleMenuBarSeparator = m_popup->insertSeparator(); m_popup->setItemVisible(toggleMenuBarSeparator, false); + copyUrlMenuSeparator = m_popup->insertSeparator(); + m_popup->setItemVisible(copyUrlMenuSeparator, false); m_popup->insertItem(SmallIconSet("editcopy"),i18n("&Copy"),Copy); m_popup->insertItem(i18n("Select All"),SelectAll); - m_popup->insertSeparator(); m_popup->insertItem(SmallIcon("find"),i18n("Find Text..."),Search); setServer(newServer); - setViewBackground(Preferences::color(Preferences::TextViewBackground),QString::null); + setViewBackground(Preferences::color(Preferences::TextViewBackground),QString()); if (Preferences::customTextFont()) setFont(Preferences::textFont()); else setFont(KGlobalSettings::generalFont()); + if (Preferences::useParagraphSpacing()) enableParagraphSpacing(); + connect(this, SIGNAL(highlighted(const QString&)), this, SLOT(highlightedSlot(const QString&))); } @@ -116,31 +130,24 @@ delete m_popup; } -void IRCView::updateStyleSheet() +void IRCView::enableParagraphSpacing() { - // set style sheet for

to define paragraph spacing + // Set style sheet for

to define paragraph spacing. QStyleSheet* sheet = styleSheet(); - if(!sheet) - return; - - int paragraphSpacing; + if (!sheet) return; - if(Preferences::useParagraphSpacing()) - paragraphSpacing=Preferences::paragraphSpacing(); - else - paragraphSpacing = 0; + QStyleSheetItem* style = sheet->item("p"); - QStyleSheetItem* style=sheet->item("p"); - - if(!sheet) + if (!style) { kdDebug() << "IRCView::updateStyleSheet(): style == 0!" << endl; + return; } style->setDisplayMode(QStyleSheetItem::DisplayBlock); - style->setMargin(QStyleSheetItem::MarginVertical,paragraphSpacing); + style->setMargin(QStyleSheetItem::MarginVertical, Preferences::paragraphSpacing()); style->setSelfNesting(false); } @@ -190,13 +197,24 @@ void IRCView::clear() { m_buffer = QString(); - KTextBrowser::clear(); + KTextBrowser::setText(""); + wipeLineParagraphs(); } void IRCView::highlightedSlot(const QString& _link) { + QString link = _link; + // HACK Replace % with \x03 in the url to keep Qt from doing stupid things + link = link.replace ('\x03', "%"); //Hack to handle the fact that we get a decoded url - QString link = KURL::fromPathOrURL(_link).url(); + link = KURL::fromPathOrURL(link).url(); + + // HACK:Use space as a placeholder for \ as Qt tries to be clever and does a replace to / in urls in QTextEdit + if(link.startsWith("#")) + { + link = link.replace(' ', "\\"); + } + //we just saw this a second ago. no need to reemit. if (link == m_lastStatusText && !link.isEmpty()) return; @@ -229,12 +247,17 @@ { m_popup->removeItem(CopyUrl); m_popup->removeItem(Bookmark); + m_popup->removeItem(SaveAs); + m_popup->setItemVisible(copyUrlMenuSeparator, false); m_copyUrlMenu = false; + } else if (!link.isEmpty() && !m_copyUrlMenu) { - m_popup->insertItem(i18n("Copy URL to Clipboard"),CopyUrl,1); - m_popup->insertItem(i18n("Add to Bookmarks"),Bookmark,2); + m_popup->setItemVisible(copyUrlMenuSeparator, true); + m_popup->insertItem(SmallIcon("editcopy"), i18n("Copy URL to Clipboard"), CopyUrl, 1); + m_popup->insertItem(SmallIcon("bookmark"), i18n("Add to Bookmarks"), Bookmark, 2); + m_popup->insertItem(SmallIcon("filesaveas"), i18n("Save Link As..."), SaveAs, 3); m_copyUrlMenu = true; m_urlToCopy = link; } @@ -269,8 +292,12 @@ { if (!url.isEmpty() && !url.startsWith("#")) { - // Always use KDE default mailer. - if (!Preferences::useCustomBrowser() || url.startsWith("mailto:")) + if (url.startsWith("irc://")) + { + KonversationApplication* konvApp = static_cast(kapp); + konvApp->getConnectionManager()->connectTo(Konversation::SilentlyReuseConnection, url); + } + else if (!Preferences::useCustomBrowser() || url.startsWith("mailto:")) { if(newTab && !url.startsWith("mailto:")) { @@ -282,7 +309,8 @@ { DCOPRef ref(foundApp, foundObj); ref.call("newTab", url); - } + } else + new KRun(KURL::fromPathOrURL(url)); } else new KRun(KURL::fromPathOrURL(url)); } @@ -336,6 +364,13 @@ QString filteredLine(line); KonversationApplication* konvApp = static_cast(kapp); + //Since we can't turn off whitespace simplification withouteliminating text wrapping, + // if the line starts with a space turn it into a non-breaking space. + // (which magically turns back into a space on copy) + + if (filteredLine[0]==' ') + filteredLine[0]='\xA0'; + // TODO: Use QStyleSheet::escape() here // Replace all < with < filteredLine.replace("<","\x0blt;"); @@ -377,33 +412,6 @@ } #endif - // Replace all 0x03 without color number (reset color) with \0x031,0 or \0x030,1, depending on which one fits - // with the users chosen colours, based on the relative brightness. TODO defaultColor needs explanation - - bool inverted = false; // TODO this flag should be stored somewhere - { - QColor fg(Preferences::color(Preferences::ChannelMessage)); - QColor bg(Preferences::color(Preferences::TextViewBackground)); - - int h = 0, s = 0,fv = 0,bv = 0; - fg.getHsv(&h,&s,&fv); - bg.getHsv(&h,&s,&bv); - - if (bv <= fv) - { - inverted = false; - } - } - - if(inverted) - { - filteredLine.replace(QRegExp("\003([^0-9]|$)"),"\0030,1\\1"); - } - else - { - filteredLine.replace(QRegExp("\003([^0-9]|$)"),"\0031,0\\1"); - } - if(filteredLine.find("\x07") != -1) { if(Preferences::beep()) @@ -414,7 +422,7 @@ // replace \003 and \017 codes with rich text color codes // captures 1 2 23 4 4 3 1 - QRegExp colorRegExp("(\003([0-9]|0[0-9]|1[0-5])(,([0-9]|0[0-9]|1[0-5])|)|\017)"); + QRegExp colorRegExp("(\003([0-9]|0[0-9]|1[0-5]|)(,([0-9]|0[0-9]|1[0-5])|,|)|\017)"); int pos; bool allowColors = Preferences::allowColorCodes(); @@ -436,8 +444,15 @@ colorString += ""; else { - int foregroundColor = colorRegExp.cap(2).toInt(); - colorString += ""; + if(!colorRegExp.cap(2).isEmpty()) + { + int foregroundColor = colorRegExp.cap(2).toInt(); + colorString += ""; + } + else + { + colorString += ""; + } } firstColor = false; @@ -462,6 +477,12 @@ { filteredLine = Konversation::tagURLs(filteredLine, whoSent); } + else + { + // Change & to & to prevent html entities to do strange things to the text + filteredLine.replace('&', "&"); + filteredLine.replace("\x0b", "&"); + } filteredLine = Konversation::EmotIcon::filter(filteredLine, fontMetrics()); @@ -474,7 +495,7 @@ } else if (m_chatWin->getType() == ChatWindow::DccChat) { - ownNick = static_cast(m_chatWin)->getMyNick(); + ownNick = static_cast(m_chatWin)->getOwnNick(); } if(doHighlight && (whoSent != ownNick) && !self) @@ -516,11 +537,11 @@ } else { - QString needle=highlight->getPattern().lower(); + QString needle=highlight->getPattern(); // highlight patterns in text - patternFound = ((filteredLine.lower().find(needle) != -1) || + patternFound = ((filteredLine.find(needle, 0, false) != -1) || // highlight patterns in nickname - (whoSent.lower().find(needle) != -1)); + (whoSent.find(needle, 0, false) != -1)); } if(!patternFound) @@ -541,7 +562,7 @@ m_highlightColor = highlightColor; m_tabNotification = Konversation::tnfHighlight; - if(Preferences::highlightSoundsEnabled()) + if(Preferences::highlightSoundsEnabled() && m_chatWin->notificationsEnabled()) { konvApp->sound()->play(highlight->getSoundURL()); } @@ -554,7 +575,7 @@ { m_autoTextToSend.replace(QString("%%1").arg(capture),captures[capture]); } - m_autoTextToSend.replace(QRegExp("%[0-9]"),QString::null); + m_autoTextToSend.replace(QRegExp("%[0-9]"),QString()); } } @@ -571,21 +592,25 @@ "\">" + filteredLine + ""; } - // Replace multiple Spaces with " " - while((pos = filteredLine.find(" ")) != -1) - { - filteredLine.replace(pos + (pos == 0 ? 0 : 1), 1, " "); - } - + // Replace pairs of spaces with " " to preserve some semblance of text wrapping + filteredLine.replace(" "," \xA0"); return filteredLine; } -QString IRCView::createNickLine(const QString& nick, bool encapsulateNick) +QString IRCView::createNickLine(const QString& nick, bool encapsulateNick, bool privMsg) { QString nickLine = "%2"; if(Preferences::useClickableNicks()) - nickLine = "%2"; + { + // HACK:Use space as a placeholder for \ as Qt tries to be clever and does a replace to / in urls in QTextEdit + nickLine = "%2"; + } + + if(privMsg) + { + nickLine.prepend ("-> "); + } if(encapsulateNick) nickLine = "<" + nickLine + ">"; @@ -611,7 +636,7 @@ // have a server. else if (Preferences::useColoredNicks() && m_chatWin->getType() == ChatWindow::DccChat) { - QString ownNick = static_cast(m_chatWin)->getMyNick(); + QString ownNick = static_cast(m_chatWin)->getOwnNick(); QString nickColor; if (nick != ownNick) @@ -671,24 +696,141 @@ emit textToLog(QString("<%1>\t%2").arg(nick).arg(message)); - m_lastInsertionWasLine = false; - doAppend(line); } -void IRCView::appendLine() +void IRCView::insertRememberLine() { - QColor channelColor=Preferences::color(Preferences::ChannelMessage); - m_tabNotification = Konversation::tnfNone; + m_rememberLineDirtyBit = true; + + if (!Preferences::automaticRememberLineOnlyOnTextChange()) + appendRememberLine(); +} + +void IRCView::cancelRememberLine() +{ + m_rememberLineDirtyBit = false; +} + +void IRCView::appendRememberLine() +{ + m_rememberLineDirtyBit = false; + + if (m_rememberLineParagraph == paragraphs() - 1) + return; + + if (m_rememberLineParagraph > -1) + { + removeParagraph(m_rememberLineParagraph); + + QValueList newList; + QValueList::ConstIterator it; + + for (it = m_markerLineParagraphs.begin(); it != m_markerLineParagraphs.end(); ++it) + { + if ((*it) < m_rememberLineParagraph) + newList << (*it); + else if ((*it) > m_rememberLineParagraph) + newList << (*it) - 1; + } + + m_markerLineParagraphs = newList; + } + + repaintChanged(); + + appendLine(Preferences::color(Preferences::CommandMessage).name()); + + m_rememberLineParagraph = paragraphs() - 1; +} + +void IRCView::insertMarkerLine() +{ + qHeapSort(m_markerLineParagraphs); + + if (m_markerLineParagraphs.last() == paragraphs() - 1) + return; + + bool rememberLineDirtyBit = m_rememberLineDirtyBit; + m_rememberLineDirtyBit = false; + + appendLine(Preferences::color(Preferences::ActionMessage).name()); + + m_rememberLineDirtyBit = rememberLineDirtyBit; + + m_markerLineParagraphs.append(paragraphs() - 1); +} + +void IRCView::appendLine(const QString& color) +{ + QColor channelColor = Preferences::color(Preferences::ChannelMessage); - QString line = "


\n"; - if (!m_lastInsertionWasLine) + QString line = "



\n"; + + doAppend(line, true); +} + +void IRCView::clearLines() +{ + if (m_rememberLineParagraph > -1) + m_markerLineParagraphs.append(m_rememberLineParagraph); + + if (m_markerLineParagraphs.count() > 0) + { + qHeapSort(m_markerLineParagraphs); + + QValueList::ConstIterator it; + int removeCounter = 0; + + for (it = m_markerLineParagraphs.begin(); it != m_markerLineParagraphs.end(); ++it) + { + removeParagraph((*it) - removeCounter); + removeCounter++; + } + + wipeLineParagraphs(); + + repaintChanged(); + } +} + +bool IRCView::hasLines() +{ + if (m_rememberLineParagraph > -1 || m_markerLineParagraphs.count() > 0) + return true; + + return false; +} + +void IRCView::updateLineParagraphs(int numRemoved) +{ + if (m_rememberLineParagraph - numRemoved < 0) + m_rememberLineParagraph = -1; + else + m_rememberLineParagraph -= numRemoved; + + if (!m_markerLineParagraphs.isEmpty()) { - doAppend(line); - m_lastInsertionWasLine = true; + QValueList newMarkerLineParagraphs; + + QValueList::const_iterator it; + + for (it = m_markerLineParagraphs.begin(); it != m_markerLineParagraphs.end(); ++it) + { + if ((*it) - numRemoved >= 0) + newMarkerLineParagraphs << ((*it) - numRemoved); + } + + m_markerLineParagraphs = newMarkerLineParagraphs; } } +void IRCView::wipeLineParagraphs() +{ + m_markerLineParagraphs.clear(); + m_rememberLineParagraph = -1; +} + void IRCView::appendRaw(const QString& message, bool suppressTimestamps, bool self) { QColor channelColor=Preferences::color(Preferences::ChannelMessage); @@ -704,12 +846,10 @@ line = QString("

" + timeStamp() + " " + message + "

\n"); } - m_lastInsertionWasLine = false; - - doAppend(line, true, self); + doAppend(line, self); } -void IRCView::appendQuery(const QString& nick,const QString& message) +void IRCView::appendQuery(const QString& nick, const QString& message, bool inChannel) { QString queryColor=Preferences::color(Preferences::QueryMessage).name(); @@ -719,9 +859,9 @@ } QString line; - m_tabNotification = Konversation::tnfNormal; + m_tabNotification = Konversation::tnfPrivate; - QString nickLine = createNickLine(nick); + QString nickLine = createNickLine(nick, true, inChannel); if(basicDirection(message) == QChar::DirR) { @@ -738,26 +878,35 @@ emit textToLog(QString("<%1>\t%2").arg(nick).arg(message)); - m_lastInsertionWasLine = false; - doAppend(line); } +void IRCView::appendChannelAction(const QString& nick,const QString& message) +{ + m_tabNotification = Konversation::tnfNormal; + + appendAction(nick, message); +} + + +void IRCView::appendQueryAction(const QString& nick,const QString& message) +{ + m_tabNotification = Konversation::tnfPrivate; + + appendAction(nick, message); +} + void IRCView::appendAction(const QString& nick,const QString& message) { QString actionColor=Preferences::color(Preferences::ActionMessage).name(); - if(actionColor == "#000000") - { - actionColor = "#000001"; // HACK Working around QTextBrowser's auto link coloring - } + // HACK Working around QTextBrowser's auto link coloring + if (actionColor == "#000000") actionColor = "#000001"; QString line; - m_tabNotification = Konversation::tnfNormal; - QString nickLine = createNickLine(nick, false); - if(basicDirection(message) == QChar::DirR) + if (basicDirection(message) == QChar::DirR) { line = RLE; line += LRE; @@ -772,8 +921,6 @@ emit textToLog(QString("\t * %1 %2").arg(nick).arg(message)); - m_lastInsertionWasLine = false; - doAppend(line); } @@ -810,13 +957,14 @@ emit textToLog(QString("%1\t%2").arg(type).arg(message)); - m_lastInsertionWasLine = false; - doAppend(line); } void IRCView::appendCommandMessage(const QString& type,const QString& message, bool important, bool parseURL, bool self) { + if (Preferences::hideUnimportantEvents() && !important) + return; + QString commandColor = Preferences::color(Preferences::CommandMessage).name(); QString line; QString prefix="***"; @@ -849,9 +997,7 @@ emit textToLog(QString("%1\t%2").arg(type).arg(message)); - m_lastInsertionWasLine = false; - - doAppend(line, important, self); + doAppend(line, self); } void IRCView::appendBacklogMessage(const QString& firstColumn,const QString& rawMessage) @@ -887,8 +1033,6 @@ line = line.arg(time, nick, filter(message, backlogColor, NULL, false, false)); - m_lastInsertionWasLine = false; - doAppend(line); } @@ -916,62 +1060,90 @@ setContentsPos( contentsX(), contentsHeight() - visibleHeight() ); } -void IRCView::doAppend(const QString& newLine, bool important, bool self) +void IRCView::ensureCursorVisible() +{ + if (!m_disableEnsureCursorVisible) + QTextEdit::ensureCursorVisible(); +} + +void IRCView::doAppend(const QString& newLine, bool self) { + if (m_rememberLineDirtyBit) appendRememberLine(); + // Add line to buffer QString line(newLine); - if(important || !Preferences::hideUnimportantEvents()) - { - if(!self) - { - emit updateTabNotification(m_tabNotification); - } + if (!self && m_chatWin) m_chatWin->activateTabNotification(m_tabNotification); + + // scroll view only if the scroll bar is already at the bottom + bool doScroll = ( KTextBrowser::verticalScrollBar()->value() == KTextBrowser::verticalScrollBar()->maxValue()); + + line.remove('\n'); // TODO why have newlines? we get

, so the \n are unnecessary... + + bool up = KTextBrowser::viewport()->isUpdatesEnabled(); - // scroll view only if the scroll bar is already at the bottom - bool doScroll = ( KTextBrowser::verticalScrollBar()->value() == KTextBrowser::verticalScrollBar()->maxValue()); + KTextBrowser::viewport()->setUpdatesEnabled(false); + int paraFrom, indexFrom, paraTo, indexTo; + bool textselected = hasSelectedText(); - line.remove('\n'); // TODO why have newlines? we get

, so the \n are unnecessary... + // Remember the selection so we don't loose it when adding the new line + if(textselected) + getSelection(¶From, &indexFrom, ¶To, &indexTo); - bool up = KTextBrowser::viewport()->isUpdatesEnabled(); + document()->lastParagraph()->format(); - KTextBrowser::viewport()->setUpdatesEnabled(false); - KTextBrowser::append(line); + KTextBrowser::append(line); - document()->lastParagraph()->format(); - resizeContents(contentsWidth(), document()->height()); + document()->lastParagraph()->format(); + + // get maximum number of lines we want to have in the scollback buffer + int sbm = Preferences::scrollbackMax(); + + // Explanation: the scrolling mechanism cannot handle the buffer changing when the scrollbar is not + // at an end, so the scrollbar wets its pants and forgets who it is for ten minutes + // Also make sure not to delete any lines if maximum lines of scrollback is set to 0 (unlimited) + if (sbm && doScroll) + { + int numRemoved = paragraphs() - sbm; - //Explanation: the scrolling mechanism cannot handle the buffer changing when the scrollbar is not - // at an end, so the scrollbar wets its pants and forgets who it is for ten minutes - // TODO: make this eat multiple lines at once when the preference is changed so it doesn't take so long - if (doScroll) + if (numRemoved > 0) { - int sbm = Preferences::scrollbackMax(); - if (sbm) + for (int index = numRemoved; index > 0; --index) { - //loop for two reasons: 1) preference changed 2) lines added while scrolled up - for(sbm = paragraphs() - sbm; sbm > 0; --sbm) - removeParagraph(0); - resizeContents(contentsWidth(), document()->height()); + removeParagraph(0); } - } - KTextBrowser::viewport()->setUpdatesEnabled(up); + updateLineParagraphs(numRemoved); - if(doScroll) - { - setContentsPos( contentsX(), contentsHeight() - visibleHeight() ); - repaintContents(false); + if (textselected) + { + paraFrom -= numRemoved; + paraTo -= numRemoved; + } } } + resizeContents(contentsWidth(), document()->height()); + KTextBrowser::viewport()->setUpdatesEnabled(up); + + // Restore selection + if(textselected && paraFrom >= 0 && paraTo >= 0) { + // HACK: do not change scrollback position: setSelection() calls + // ensureCursorVisible() + m_disableEnsureCursorVisible = true; + setSelection(paraFrom, indexFrom, paraTo, indexTo); + m_disableEnsureCursorVisible = false; + } + + if (doScroll) updateScrollBarPos(); + //FIXME: Disable auto-text for DCC Chats since we don't have a server // to parse wildcards. if (!m_autoTextToSend.isEmpty() && m_server) { // replace placeholders in autoText QString sendText = m_server->parseWildcards(m_autoTextToSend,m_server->getNickname(), - QString::null, QString::null, QString::null, QString::null); + QString(), QString(), QString(), QString()); // avoid recursion due to signalling m_autoTextToSend = QString(); // send signal only now @@ -994,13 +1166,30 @@ void IRCView::showEvent(QShowEvent* event) { Q_UNUSED(event); // did the user scroll the view to the end of the text before hiding? - if(m_resetScrollbar) + if (m_resetScrollbar) { + // NOTE: when the view has not been painted yet, contentsHeight() might + // not return accurate information and hence this code won't reset + // scrollback properly in such a case. See paintEvent() hack below. moveCursor(MoveEnd,false); ensureVisible(0,contentsHeight()); } } +void IRCView::paintEvent(QPaintEvent* event) +{ + // HACK: if the widget is being painted for the first time, call + // showEvent() which will reset scrollback position as needed. It seems + // that at the time this event is triggered, QTextEdit provides more + // accurate information than when showEvent() is triggered. + if (!m_wasPainted) + { + m_wasPainted = true; + showEvent(0); + } + KTextBrowser::paintEvent(event); +} + void IRCView::contentsMouseReleaseEvent(QMouseEvent *ev) { if (ev->button() == Qt::MidButton) @@ -1021,7 +1210,11 @@ { if (m_mousePressed) { - openLink(m_highlightedURL); + if (ev->state() == (Qt::LeftButton|Qt::ShiftButton)) + saveLinkAs(m_highlightedURL); + else + openLink(m_highlightedURL); + m_mousePressed = false; return; } @@ -1057,6 +1250,7 @@ if (m_server && m_urlToDrag.startsWith("##")) { + //FIXME consistent IRC URL serialization ux = QString("irc://%1:%2/%3").arg(m_server->getServerName()).arg(m_server->getPort()).arg(m_urlToDrag.mid(2)); } else if (m_urlToDrag.startsWith("#")) @@ -1075,11 +1269,20 @@ void IRCView::contentsContextMenuEvent(QContextMenuEvent* ev) { bool block = contextMenu(ev); + + // HACK Replace % with \x03 in the url to keep Qt from doing stupid things + m_highlightedURL = anchorAt(viewportToContents(mapFromGlobal(QCursor::pos()))); + m_highlightedURL = m_highlightedURL.replace('\x03', "%"); // Hack to counter the fact that we're given an decoded url - m_highlightedURL = KURL::fromPathOrURL(anchorAt(viewportToContents(mapFromGlobal(QCursor::pos())))).url(); + m_highlightedURL = KURL::fromPathOrURL(m_highlightedURL).url(); - if (m_highlightedURL.isEmpty()) - viewport()->setCursor(Qt::ArrowCursor); + if (m_highlightedURL.isEmpty()) viewport()->setCursor(Qt::ArrowCursor); + + if(m_highlightedURL.startsWith("#")) + { + // HACK:Use space as a placeholder for \ as Qt tries to be clever and does a replace to / in urls in QTextEdit + m_highlightedURL = m_highlightedURL.replace(' ', "\\"); + } if (!block) KTextBrowser::contentsContextMenuEvent(ev); @@ -1091,7 +1294,9 @@ { updateNickMenuEntries(m_nickPopup, getContextNick()); - m_nickPopup->exec(ce->globalPos()); + if(m_nickPopup->exec(ce->globalPos()) == -1) + clearContextNick(); + m_isOnNick = false; } else if (m_server && m_isOnChannel && m_channelPopup->isEnabled()) @@ -1121,7 +1326,10 @@ } if (m_chatWin->getType() == ChatWindow::Query) + { updateNickMenuEntries(m_popup, m_chatWin->getName()); + clearContextNick(); + } int r = m_popup->exec(ce->globalPos()); @@ -1153,11 +1361,14 @@ case Bookmark: { KBookmarkManager* bm = KBookmarkManager::userBookmarksManager(); - KBookmarkGroup bg = bm->addBookmarkDialog(m_urlToCopy, QString::null); + KBookmarkGroup bg = bm->addBookmarkDialog(m_urlToCopy, QString()); bm->save(); bm->emitChanged(bg); break; } + case SaveAs: + saveLinkAs(m_urlToCopy); + break; default: emit extendedPopup(r); } @@ -1243,13 +1454,13 @@ popup->setItemVisible(Konversation::UnignoreNick, false); } - if (!m_server) + if (!m_server || !m_server->getServerGroup()) popup->setItemEnabled(Konversation::AddNotify, false); else if (!m_server->isConnected()) popup->setItemEnabled(Konversation::AddNotify, false); - else if (!Preferences::hasNotifyList(m_server->serverGroupSettings()->id())) + else if (!Preferences::hasNotifyList(m_server->getServerGroup()->id())) popup->setItemEnabled(Konversation::AddNotify, false); - else if (Preferences::isNotify(m_server->serverGroupSettings()->id(), nickname)) + else if (Preferences::isNotify(m_server->getServerGroup()->id(), nickname)) popup->setItemEnabled(Konversation::AddNotify, false); else popup->setItemEnabled(Konversation::AddNotify, true); @@ -1269,13 +1480,9 @@ m_nickPopup->insertItem(i18n("Unignore"), Konversation::UnignoreNick); m_nickPopup->setItemVisible(Konversation::IgnoreNick, false); m_nickPopup->setItemVisible(Konversation::UnignoreNick, false); - m_nickPopup->insertSeparator(); if (kapp->authorize("allow_downloading")) - { m_nickPopup->insertItem(SmallIcon("2rightarrow"),i18n("Send &File..."),Konversation::DccSend); - m_nickPopup->insertSeparator(); - } m_nickPopup->insertItem(i18n("Add to Watched Nicks"), Konversation::AddNotify); @@ -1504,7 +1711,9 @@ { QDate date = QDate::currentDate(); timeString = QString("[%1 %2] ").arg(date.toString(Qt::ISODate), time.toString(timeFormat)); + timeColor + "\">[%1 %2] ") + .arg(KGlobal::locale()->formatDate(date, true /*short format*/), + time.toString(timeFormat)); } return timeString; @@ -1527,9 +1736,18 @@ void IRCView::keyPressEvent(QKeyEvent* e) { - if((e->key() == Qt::Key_V) && (e->state() == Qt::ControlButton)) + KKey key(e); + + if (KStdAccel::copy().contains(key)) + { + copy(); + e->accept(); + return; + } + else if (KStdAccel::paste().contains(key)) { emit textPasted(false); + e->accept(); return; } @@ -1538,9 +1756,13 @@ void IRCView::resizeEvent(QResizeEvent* e) { + bool doScroll = ( KTextBrowser::verticalScrollBar()->value() == KTextBrowser::verticalScrollBar()->maxValue()); KTextBrowser::resizeEvent(e); - QTimer::singleShot(0, this, SLOT(updateScrollBarPos())); + if(doScroll) + { + QTimer::singleShot(0, this, SLOT(updateScrollBarPos())); + } } void IRCView::updateScrollBarPos() @@ -1549,6 +1771,20 @@ repaintContents(false); } +void IRCView::saveLinkAs(const QString& url) +{ + KURL source(url); + KFileDialog dialog(":SaveLinkAs", QString (), this, "savelinkdia", true); + dialog.setCaption(i18n("Save Link As")); + dialog.setSelection(source.fileName()); + + if(dialog.exec() == QDialog::Rejected) + return; + + KURL destination = dialog.selectedURL(); + KIO::copyAs(source, destination); +} + #include "ircview.moc" // kate: space-indent on; tab-width 4; indent-width 4; mixed-indent off; replace-tabs on; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ircview.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ircview.h --- konversation-1.0.1/konversation/src/ircview.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ircview.h 2008-08-06 16:56:27.000000000 +0100 @@ -9,18 +9,18 @@ */ /* - the text widget used for all text based panels - begin: Sun Jan 20 2002 - copyright: (C) 2002 by Dario Abatianni - email: eisfuchs@tigress.com + Copyright (C) 2002 Dario Abatianni + Copyright (C) 2005-2006 Peter Simonsson + Copyright (C) 2006-2008 Eike Hein */ +#include "common.h" + #include #include #include -#include "common.h" class QPixmap; class QStrList; @@ -38,7 +38,7 @@ { Q_OBJECT - public: + public: IRCView(QWidget* parent,Server* newServer); ~IRCView(); @@ -49,7 +49,7 @@ // Returns the current nick under context menu. const QString& getContextNick() const; - void updateStyleSheet(); + void enableParagraphSpacing(); QPopupMenu* getPopup() const; @@ -58,7 +58,8 @@ Copy,CopyUrl,SelectAll, Search, SendFile, - Bookmark + Bookmark, + SaveAs }; void setChatWin(ChatWindow* chatWin); @@ -72,9 +73,11 @@ void setNickAndChannelContextMenusEnabled(bool enable); - signals: + bool hasLines(); + + + signals: // Notify container of new text and highlight state - void updateTabNotification(Konversation::TabNotifyType type); void gotFocus(); // So we can set focus to input line void textToLog(const QString& text); void sendFile(); @@ -89,11 +92,16 @@ void clearStatusBarTempText(); public slots: + void insertRememberLine(); + void cancelRememberLine(); + void insertMarkerLine(); + void clearLines(); + void append(const QString& nick, const QString& message); - void appendLine(); void appendRaw(const QString& message, bool suppressTimestamps=false, bool self = false); - void appendQuery(const QString& nick, const QString& message); - void appendAction(const QString& nick, const QString& message); + void appendQuery(const QString& nick, const QString& message, bool inChannel = false); + void appendQueryAction(const QString& nick, const QString& message); + void appendChannelAction(const QString& nick, const QString& message); void appendServerMessage(const QString& type, const QString& message, bool parseURL = true); void appendCommandMessage(const QString& command, const QString& message, bool important, bool parseURL=true, bool self=false); @@ -113,14 +121,19 @@ // Updates the scrollbar position void updateScrollBarPos(); + // Override ensureCursorVisible() to have an ability to disable this call + virtual void ensureCursorVisible(); + protected slots: void highlightedSlot(const QString& link); + void saveLinkAs(const QString& url); protected: void openLink(const QString &url, bool newTab=false); QString filter(const QString& line, const QString& defaultColor, const QString& who=NULL, - bool doHighlight=true, bool parseURL=true, bool self=false); - void doAppend(const QString& line, bool important=true, bool self=false); + bool doHighlight=true, bool parseURL=true, bool self=false); + void appendAction(const QString& nick, const QString& message); + void doAppend(const QString& line, bool self=false); void replaceDecoration(QString& line,char decoration,char replacement); virtual void contentsDragMoveEvent(QDragMoveEvent* e); virtual void contentsDropEvent(QDropEvent* e); @@ -134,6 +147,7 @@ void hideEvent(QHideEvent* event); void showEvent(QShowEvent* event); + void paintEvent(QPaintEvent* event); bool contextMenu(QContextMenuEvent* ce); @@ -148,13 +162,22 @@ QString timeStamp(); /// Returns a formated nick string - QString createNickLine(const QString& nick, bool encapsulateNick = true); + QString createNickLine(const QString& nick, bool encapsulateNick = true, bool privMsg = false); // used by search function int m_findParagraph; int m_findIndex; - bool m_lastInsertionWasLine; + void appendLine(const QString& color); + void appendRememberLine(); + + void updateLineParagraphs(int numRemoved); + void wipeLineParagraphs(); + + int m_rememberLineParagraph; + bool m_rememberLineDirtyBit; + + QValueList m_markerLineParagraphs; // This is set to what we last sent status text to the statusbar. Empty if we have sent clearStatusBarTempText() string QString m_lastStatusText; @@ -170,6 +193,7 @@ Server* m_server; QPopupMenu* m_popup; int toggleMenuBarSeparator; + int copyUrlMenuSeparator; KPopupMenu* m_nickPopup; KPopupMenu* m_channelPopup; KPopupMenu* m_modes; @@ -205,7 +229,14 @@ int m_channelPopupId; QFontDatabase m_fontDataBase; + + // Provide ability to disable parent ensureCursorVisible() call + bool m_disableEnsureCursorVisible; + // If this widget was painted at least once. Needed for scrollbar + // reset HACK as a precaution. + bool m_wasPainted; ChatWindow* m_chatWin; + friend class IRCStyleSheet; }; #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/joinchanneldialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/joinchanneldialog.cpp --- konversation-1.0.1/konversation/src/joinchanneldialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/joinchanneldialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -10,6 +10,10 @@ */ #include "joinchanneldialog.h" +#include "joinchannelui.h" +#include "server.h" +#include "channel.h" +#include "servergroupsettings.h" #include @@ -17,49 +21,48 @@ #include #include -#include "joinchannelui.h" -#include "server.h" -#include "channel.h" -#include "servergroupsettings.h" namespace Konversation { JoinChannelDialog::JoinChannelDialog(Server* server, QWidget *parent, const char *name) - : KDialogBase(parent, name, true, i18n("Join Channel on %1").arg(server->getServerGroup()), Ok|Cancel, Ok) + : KDialogBase(parent, name, true, i18n("Join Channel on %1").arg(server->getDisplayName()), Ok|Cancel, Ok) { m_server = server; m_widget = new JoinChannelUI(this); setMainWidget(m_widget); - m_widget->serverLbl->setText(server->getServerGroup()); + m_widget->serverLbl->setText(server->getDisplayName()); - ChannelList history = server->serverGroupSettings()->channelHistory(); - ChannelList::iterator endIt = history.end(); - QPtrList channels = server->getChannelList(); - QPtrListIterator chanIt(channels); - Channel* chan = 0; - bool joined = false; - - for(ChannelList::iterator it = history.begin(); it != endIt; ++it) + if (m_server->getServerGroup()) { - chan = chanIt.toFirst(); - joined = false; + ChannelList history = server->getServerGroup()->channelHistory(); + ChannelList::iterator endIt = history.end(); + const QPtrList &channels = server->getChannelList(); + QPtrListIterator chanIt(channels); + Channel* chan = 0; + bool joined = false; - while(chan) + for(ChannelList::iterator it = history.begin(); it != endIt; ++it) { - if(chan->getName() == (*it).name()) + chan = chanIt.toFirst(); + joined = false; + + while(chan) { - joined = true; - } + if(chan->getName() == (*it).name()) + { + joined = true; + } - ++chanIt; - chan = chanIt.current(); - } + ++chanIt; + chan = chanIt.current(); + } - if(!joined) - { - m_widget->channelCombo->addToHistory((*it).name()); + if(!joined) + { + m_widget->channelCombo->addToHistory((*it).name()); + } } } @@ -90,7 +93,8 @@ void JoinChannelDialog::slotOk() { // If the channel already exist in the history only the password will be updated. - m_server->serverGroupSettings()->appendChannelHistory(ChannelSettings(channel(), password())); + if (m_server->getServerGroup()) + m_server->getServerGroup()->appendChannelHistory(ChannelSettings(channel(), password())); accept(); } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/joinchanneldialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/joinchanneldialog.h --- konversation-1.0.1/konversation/src/joinchanneldialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/joinchanneldialog.h 2008-08-06 16:56:27.000000000 +0100 @@ -14,6 +14,7 @@ #include + class Server; namespace Konversation diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konsolepanel.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konsolepanel.cpp --- konversation-1.0.1/konversation/src/konsolepanel.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konsolepanel.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -9,15 +9,16 @@ Copyright (C) 2003 Mickael Marchand */ +#include "konsolepanel.h" +#include "common.h" +#include "viewcontainer.h" + #include #include #include -#include "konsolepanel.h" -#include "common.h" -#include "viewcontainer.h" -KonsolePanel::KonsolePanel(QWidget *p) : ChatWindow( p ) +KonsolePanel::KonsolePanel(QWidget *p) : ChatWindow( p ), k_part (0) { setName(i18n("Konsole")); setType(ChatWindow::Konsole); @@ -46,8 +47,17 @@ } } +QWidget* KonsolePanel::getWidget() +{ + if (k_part) + return k_part->widget(); + else + return 0; +} + void KonsolePanel::childAdjustFocus() { + if (k_part) k_part->widget()->setFocus(); } void KonsolePanel::partDestroyed() diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konsolepanel.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konsolepanel.h --- konversation-1.0.1/konversation/src/konsolepanel.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konsolepanel.h 2008-08-06 16:56:27.000000000 +0100 @@ -13,8 +13,10 @@ #define KONSOLE_PANEL_H #include "chatwindow.h" + #include + class KonsolePanel : public ChatWindow { Q_OBJECT @@ -25,6 +27,8 @@ virtual void setName(const QString& newName) { ChatWindow::setName(newName); } + QWidget* getWidget(); + signals: void closeView(ChatWindow* view); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konvdcop.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konvdcop.cpp --- konversation-1.0.1/konversation/src/konvdcop.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konvdcop.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,23 +12,24 @@ email: zipzippy@sonic.net */ +#include "konvdcop.h" +#include "konversationapplication.h" +#include "connectionmanager.h" +#include "awaymanager.h" +#include "channel.h" +#include "identity.h" +#include "server.h" + #include #include #include - -#include #include -#include "konversationapplication.h" -#include "channel.h" -#include "konvdcop.h" -#include "identity.h" -#include "server.h" -KonvDCOP::KonvDCOP() -: DCOPObject("irc"), -QObject(0,"irc") +KonvDCOP::KonvDCOP() : DCOPObject("irc"), QObject(0, "irc") { + connectDCOPSignal("kdesktop", "KScreensaverIface", "KDE_start_screensaver()", "setScreenSaverStarted()", false); + connectDCOPSignal("kdesktop", "KScreensaverIface", "KDE_stop_screensaver()", "setScreenSaverStopped()", false); } void KonvDCOP::raw(const QString& server,const QString& command) @@ -40,36 +41,50 @@ QStringList KonvDCOP::listServers() { - QStringList serverlist; - QPtrListservers = static_cast(kapp)->getServerList(); - Server *server; - for ( server = servers.first(); server; server = servers.next() ) - serverlist.append(server->getServerName()); - return serverlist; + KonversationApplication* konvApp = static_cast(kapp); + + QStringList hosts; + QPtrList serverList = konvApp->getConnectionManager()->getServerList(); + Server* server; + + for (server = serverList.first(); server; server = serverList.next()) + if (server) hosts << server->getServerName(); + + return hosts; } QStringList KonvDCOP::listConnectedServers() { - QStringList serverlist; - QPtrListservers = static_cast(kapp)->getServerList(); - Server *server; - for ( server = servers.first(); server; server = servers.next() ) - if(server->connected()) - serverlist.append(server->getServerName()); - return serverlist; + KonversationApplication* konvApp = static_cast(kapp); + + QStringList connectedHosts; + QPtrList serverList = konvApp->getConnectionManager()->getServerList(); + Server* server; + + for (server = serverList.first(); server; server = serverList.next()) + if (server && server->isConnected()) connectedHosts << server->getServerName(); + + return connectedHosts; } -void KonvDCOP::setAway(const QString &awaymessage) +void KonvDCOP::setAway(const QString& awaymessage) { - if(awaymessage.isEmpty()) - emit dcopMultiServerRaw("away " + i18n("Gone away for now.")); - else - emit dcopMultiServerRaw("away " + awaymessage); + static_cast(kapp)->getAwayManager()->requestAllAway(awaymessage); } void KonvDCOP::setBack() { - emit dcopMultiServerRaw("back"); + static_cast(kapp)->getAwayManager()->requestAllUnaway(); +} + +void KonvDCOP::setScreenSaverStarted() +{ + static_cast(kapp)->getAwayManager()->setManagedIdentitiesAway(); +} + +void KonvDCOP::setScreenSaverStopped() +{ + static_cast(kapp)->getAwayManager()->setManagedIdentitiesUnaway(); } void KonvDCOP::sayToAll(const QString &message) @@ -82,15 +97,23 @@ emit dcopMultiServerRaw("me " + message); } -void KonvDCOP::say(const QString& server,const QString& target,const QString& command) +void KonvDCOP::say(const QString& _server,const QString& _target,const QString& _command) { + //Sadly, copy on write doesn't exist with QString::replace + QString server(_server), target(_target), command(_command); + // TODO: this just masks a greater problem - Server::addQuery will return a query for '' --argonel // TODO: other DCOP calls need argument checking too --argonel if (server.isEmpty() || target.isEmpty() || command.isEmpty()) kdDebug() << "KonvDCOP::say() requires 3 arguments." << endl; else { - kdDebug() << "KonvDCOP::say()" << endl; + command.replace('\n',"\\n"); + command.replace('\r',"\\r"); + target.remove('\n'); + target.remove('\r'); + server.remove('\n'); + server.remove('\r'); // Act as if the user typed it emit dcopSay(server,target,command); } @@ -114,32 +137,38 @@ emit dcopInfo(QString("Error: %1").arg(string)); } -void KonvDCOP::insertRememberLine() +void KonvDCOP::insertMarkerLine() { - emit dcopInsertRememberLine(); + emit dcopInsertMarkerLine(); } -void KonvDCOP::connectToServer(const QString& url, int port, const QString& channel, const QString& password) +void KonvDCOP::connectToServer(const QString& address, int port, const QString& channel, const QString& password) { - emit dcopConnectToServer(url, port, channel, password); + emit connectTo(Konversation::SilentlyReuseConnection, address, QString::number(port), password, "", channel); } -QString KonvDCOP::getNickname (const QString &serverName) +QString KonvDCOP::getNickname(const QString& serverName) { - Server* server = static_cast(kapp)->getServerByName(serverName); - if ( !server ) + Server* server = KonversationApplication::instance()->getConnectionManager()->getServerByName(serverName); + + if (!server) { error( i18n( "getNickname: Server %1 is not found." ).arg( serverName ) ); return QString(); } + return server->getNickname(); } -QString KonvDCOP::getAnyNickname () +QString KonvDCOP::getAnyNickname() { - const QPtrListserverlist = static_cast(kapp)->getServerList(); - Server *server = serverlist.getFirst(); - return server->getNickname(); + KonversationApplication* konvApp = static_cast(kapp); + + Server* server = konvApp->getConnectionManager()->getAnyServer(); + + if (server) return server->getNickname(); + + return QString(); } QString KonvDCOP::getChannelEncoding(const QString& server, const QString& channel) @@ -157,8 +186,8 @@ QStringList KonvIdentDCOP::listIdentities() { QStringList identities; - QValueList ids = Preferences::identityList(); - for(QValueList::iterator it = ids.begin(); it != ids.end(); ++it) + IdentityList ids = Preferences::identityList(); + for(IdentityList::ConstIterator it = ids.begin(); it != ids.end(); ++it) { identities.append((*it)->getName()); } @@ -167,9 +196,9 @@ void KonvIdentDCOP::setrealName(const QString &id_name, const QString& name) { - QValueList ids = Preferences::identityList(); + IdentityList ids = Preferences::identityList(); - for(QValueList::iterator it = ids.begin(); it != ids.end(); ++it) + for(IdentityList::iterator it = ids.begin(); it != ids.end(); ++it) { if ((*it)->getName() == id_name) { @@ -182,9 +211,9 @@ QString KonvIdentDCOP::getrealName(const QString &id_name) { - QValueList ids = Preferences::identityList(); + IdentityList ids = Preferences::identityList(); - for(QValueList::iterator it = ids.begin(); it != ids.end(); ++it) + for(IdentityList::ConstIterator it = ids.begin(); it != ids.end(); ++it) { if ((*it)->getName() == id_name) { @@ -253,6 +282,19 @@ return Preferences::identityByName(identity)->getNicknameList(); } +void KonvIdentDCOP::setQuitReason(const QString &identity, const QString& reason) +{ + const Identity *i = Preferences::identityByName(identity); + const_cast(i)->setQuitReason(reason); + static_cast(kapp)->saveOptions(true); +} + +QString KonvIdentDCOP::getQuitReason(const QString &identity) +{ + return Preferences::identityByName(identity)->getQuitReason(); +} + + void KonvIdentDCOP::setPartReason(const QString &identity, const QString& reason) { const Identity *i = Preferences::identityByName(identity); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konvdcop.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konvdcop.h --- konversation-1.0.1/konversation/src/konvdcop.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konvdcop.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,31 +15,39 @@ #ifndef KONV_DCOP_H #define KONV_DCOP_H +#include "konviface.h" +#include "common.h" + #include #include -#include -#include "konviface.h" class KonvDCOP : public QObject, virtual public KonvIface { Q_OBJECT - public: + public: KonvDCOP(); QString getNickname (const QString &server); QString getAnyNickname (); QString getChannelEncoding(const QString& server, const QString& channel); - signals: + signals: void dcopSay(const QString& server,const QString& target,const QString& command); void dcopInfo(const QString& string); - void dcopInsertRememberLine(); - void dcopConnectToServer(const QString& url, int port, const QString& channel, const QString& password); + void dcopInsertMarkerLine(); void dcopRaw(const QString& server, const QString& command); void dcopMultiServerRaw(const QString& command); + void connectTo(Konversation::ConnectionFlag flag, + const QString& hostName, + const QString& port = "", + const QString& password = "", + const QString& nick = "", + const QString& channel = "", + bool useSSL = false); + public slots: void setAway(const QString &awaymessage); void setBack(); @@ -50,10 +58,13 @@ void info(const QString& string); void debug(const QString& string); void error(const QString& string); - void insertRememberLine(); - void connectToServer(const QString& url, int port, const QString& channel, const QString& password); + void insertMarkerLine(); + void connectToServer(const QString& adress, int port, const QString& channel, const QString& password); QStringList listServers(); QStringList listConnectedServers(); + + void setScreenSaverStarted(); + void setScreenSaverStopped(); }; class KonvIdentDCOP : public QObject, virtual public KonvIdentityIface @@ -79,6 +90,8 @@ void setNicknameList(const QString &identity, const QStringList& newList); QStringList getNicknameList(const QString &identity); + void setQuitReason(const QString &identity, const QString& reason); + QString getQuitReason(const QString &identity); void setPartReason(const QString &identity, const QString& reason); QString getPartReason(const QString &identity); void setKickReason(const QString &identity, const QString& reason); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konversationapplication.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konversationapplication.cpp --- konversation-1.0.1/konversation/src/konversationapplication.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konversationapplication.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -10,24 +10,14 @@ Copyright (C) 2005 Ismail Donmez Copyright (C) 2005 Peter Simonsson Copyright (C) 2005 John Tapsell - Copyright (C) 2005 Eike Hein + Copyright (C) 2005-2008 Eike Hein */ -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - #include "konversationapplication.h" #include "konversationmainwindow.h" +#include "connectionmanager.h" +#include "awaymanager.h" +#include "dcctransfermanager.h" #include "viewcontainer.h" #include "highlight.h" #include "server.h" @@ -36,22 +26,40 @@ #include "servergroupsettings.h" #include "serversettings.h" #include "channel.h" -#include "nicklistview.h" #include "images.h" #include "notificationhandler.h" #include "commit.h" #include "version.h" +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + + KonversationApplication::KonversationApplication() : KUniqueApplication(true, true, true) { mainWindow = 0; + m_connectionManager = 0; + m_awayManager = 0; quickConnectDialog = 0; - m_connectDelayed=false; + osd = 0; } KonversationApplication::~KonversationApplication() { + kdDebug() << k_funcinfo << endl; + Server::_stashRates(); Preferences::writeConfig(); saveOptions(false); @@ -59,25 +67,32 @@ delete dcopObject; //delete prefsDCOP; delete identDCOP; -} - -void KonversationApplication::delayedConnectToServer(const QString& hostname, const QString& port, const QString& channel, -const QString& nick, const QString& password, -const bool& useSSL) -{ - m_hostName=hostname; - m_port=port; - m_channel=channel; - m_nick=nick; - m_password=password; - m_useSSL=useSSL; - m_connectDelayed=true; + delete osd; + osd = 0; } int KonversationApplication::newInstance() { - if(!mainWindow) + KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + QCString url; + if (args->count() > 0) url = args->arg(0); + + if (!mainWindow) { + connect(this, SIGNAL(shutDown()), this, SLOT(prepareShutdown())); + + m_connectionManager = new ConnectionManager(this); + + m_awayManager = new AwayManager(this); + + connect(m_connectionManager, SIGNAL(identityOnline(int)), m_awayManager, SLOT(identityOnline(int))); + connect(m_connectionManager, SIGNAL(identityOffline(int)), m_awayManager, SLOT(identityOffline(int))); + connect(m_connectionManager, SIGNAL(identityOffline(int)), m_awayManager, SLOT(identityOffline(int))); + connect(m_connectionManager, SIGNAL(connectionChangedAwayState(bool)), m_awayManager, SLOT(updateGlobalAwayAction(bool))); + + // an instance of DccTransferManager needs to be created before GUI class instances' creation. + m_dccTransferManager = new DccTransferManager(this); + // make sure all vars are initialized properly quickConnectDialog = 0; @@ -118,35 +133,44 @@ connect(mainWindow, SIGNAL(showQuickConnectDialog()), this, SLOT(openQuickConnectDialog()) ); connect(Preferences::self(), SIGNAL(updateTrayIcon()), mainWindow, SLOT(updateTrayIcon()) ); - connect(this, SIGNAL(prefsChanged()), mainWindow, SIGNAL(prefsChanged()) ); connect(osd, SIGNAL(hidden()), mainWindow, SIGNAL(endNotification())); // take care of user style changes, setting back colors and stuff // apply GUI settings emit appearanceChanged(); - mainWindow->show(); - if (Preferences::showServerList()) mainWindow->openServerList(); + if (Preferences::showTrayIcon() && (Preferences::hiddenToTray() || Preferences::hideToTrayOnStartup())) + mainWindow->hide(); + else + mainWindow->show(); + + bool openServerList = Preferences::showServerList(); // handle autoconnect on startup Konversation::ServerGroupList serverGroups = Preferences::serverGroupList(); - if (!m_connectDelayed) + if (url.isEmpty() && !args->isSet("server")) { for (Konversation::ServerGroupList::iterator it = serverGroups.begin(); it != serverGroups.end(); ++it) { - if ((*it)->autoConnectEnabled()) connectToServer((*it)->id()); + if ((*it)->autoConnectEnabled()) + { + openServerList = false; + m_connectionManager->connectTo(Konversation::CreateNewConnection, (*it)->id()); + } } } - else - quickConnectToServer(m_hostName, m_port, m_channel, m_nick, m_password, m_useSSL); + + if (openServerList) mainWindow->openServerList(); + + connect(this, SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)), this, SLOT(saveOptions())); // prepare dcop interface dcopObject = new KonvDCOP; kapp->dcopClient()->setDefaultObject(dcopObject->objId()); identDCOP = new KonvIdentDCOP; - if(dcopObject) + if (dcopObject) { connect(dcopObject,SIGNAL (dcopMultiServerRaw(const QString&)), this,SLOT (dcopMultiServerRaw(const QString&)) ); @@ -156,334 +180,95 @@ this,SLOT (dcopSay(const QString&,const QString&,const QString&)) ); connect(dcopObject,SIGNAL (dcopInfo(const QString&)), this,SLOT (dcopInfo(const QString&)) ); - connect(dcopObject,SIGNAL (dcopInsertRememberLine()), - mainWindow,SIGNAL(insertRememberLine())); - connect(dcopObject,SIGNAL(dcopConnectToServer(const QString&, int,const QString&, const QString&)), - this,SLOT(dcopConnectToServer(const QString&, int,const QString&, const QString&))); + connect(dcopObject,SIGNAL (dcopInsertMarkerLine()), + mainWindow,SIGNAL(insertMarkerLine())); + connect(dcopObject, SIGNAL(connectTo(Konversation::ConnectionFlag, const QString&, const QString&, const QString&, const QString&, const QString&, bool)), + m_connectionManager, SLOT(connectTo(Konversation::ConnectionFlag, const QString&, const QString&, const QString&, const QString&, const QString&, bool))); } m_notificationHandler = new Konversation::NotificationHandler(this); } + if (!url.isEmpty()) + getConnectionManager()->connectTo(Konversation::SilentlyReuseConnection, url); + else if (args->isSet("server")) + { + getConnectionManager()->connectTo(Konversation::SilentlyReuseConnection, + args->getOption("server"), + args->getOption("port"), + args->getOption("password"), + args->getOption("nick"), + args->getOption("channel"), + args->isSet("ssl")); + } + return KUniqueApplication::newInstance(); } - // static KonversationApplication* KonversationApplication::instance() { - return static_cast( KApplication::kApplication() ); -} - -KonversationMainWindow *KonversationApplication::getMainWindow() -{ - return mainWindow; + return static_cast(KApplication::kApplication()); } -void KonversationApplication::toggleAway() +void KonversationApplication::prepareShutdown() { - bool anyservers = false; - bool alreadyaway = false; - - Server* lookServer=serverList.first(); - - while(lookServer) - { - if(lookServer->isConnected()) - { - anyservers = true; - if(lookServer->isAway()) - { - alreadyaway= true; - break; - } - } - lookServer=serverList.next(); - } - - //alreadyaway is true if _any_ servers are away - if (alreadyaway) - sendMultiServerCommand("back", QString::null); + if (mainWindow->isHidden() && Preferences::showTrayIcon()) + Preferences::setHiddenToTray(true); else - sendMultiServerCommand("away", QString::null); -} + Preferences::setHiddenToTray(false); -void KonversationApplication::dcopMultiServerRaw(const QString &command) -{ - sendMultiServerCommand(command.section(' ', 0,0), command.section(' ', 1)); -} + mainWindow->getViewContainer()->prepareShutdown(); -void KonversationApplication::dcopRaw(const QString& server, const QString &command) -{ - Server* lookServer=serverList.first(); - while(lookServer) - { - if(lookServer->getServerName()==server) - { - lookServer->dcopRaw(command); - // break; // leave while loop - //FIXME: there's a reason for not breaking this loop... [see comment for dcopSay] - } - lookServer=serverList.next(); - } + m_awayManager->blockSignals(true); + delete m_awayManager; + m_connectionManager->quitServers(); + m_connectionManager->blockSignals(true); + delete m_connectionManager; } -void KonversationApplication::dcopSay(const QString& server,const QString& target,const QString& command) +void KonversationApplication::showQueueTuner(bool p) { - Server* lookServer=serverList.first(); - while(lookServer) - { - if(lookServer->getServerName()==server) - { - lookServer->dcopSay(target,command); - // break; // leave while loop - //FIXME: there's a reason for not breaking this loop, here (which would spent only some - // cpu cycles, anyways): I am connected to two bouncers at the same time, which are - // also named the same (same ip, no dns). if a dcopSay gets emerged, it will always - // get the _same_ server name as its parameter (both are named the same). although - // the channel it gets sent to, is on the second server, it will always try to send - // this information to a channel on the first server, which i didn't even join. - // this is def. a quick-fix, we should probably handle server-id's instead of -names. - } - lookServer=serverList.next(); - } + getMainWindow()->getViewContainer()->showQueueTuner(p); } -void KonversationApplication::dcopInfo(const QString& string) +void KonversationApplication::dcopMultiServerRaw(const QString &command) { - mainWindow->getViewContainer()->appendToFrontmost(i18n("DCOP"), string, 0); + sendMultiServerCommand(command.section(' ', 0,0), command.section(' ', 1)); } -bool KonversationApplication::validateIdentity(IdentityPtr identity, bool interactive) +void KonversationApplication::dcopRaw(const QString& connection, const QString &command) { - QString errors; - - if (identity->getIdent().isEmpty()) - errors+=i18n("Please fill in your Ident.
"); - - if (identity->getRealName().isEmpty()) - errors+=i18n("Please fill in your Real name.
"); + Server* server = 0; - if (identity->getNickname(0).isEmpty()) - errors+=i18n("Please provide at least one Nickname.
"); + bool conversion = false; + int connectionId = connection.toInt(&conversion); - if (!errors.isEmpty()) - { - if (interactive) - { - int result = KMessageBox::warningContinueCancel(0, - i18n("Your identity \"%1\" is not set up correctly:
%2") - .arg(identity->getName()).arg(errors), - i18n("Identity Settings"), - i18n("Edit Identity...")); + if (conversion) server = getConnectionManager()->getServerByConnectionId(connectionId); - if (result==KMessageBox::Continue) - { - identity = mainWindow->editIdentity(identity); + if (!server) server = getConnectionManager()->getServerByName(connection); - if (identity && validateIdentity(identity,false)) - return true; - else - return false; - } - else - { - return false; - } - } - - return false; - } - - return true; + if (server) server->dcopRaw(command); } -Server* KonversationApplication::connectToServerGroup(const QString& serverGroup) -{ - int serverGroupId = Preferences::serverGroupIdByName(serverGroup); - return connectToServer(serverGroupId); -} - -Server* KonversationApplication::connectToServer(int serverGroupId, Konversation::ServerSettings quickServer) +void KonversationApplication::dcopSay(const QString& connection, const QString& target, const QString& command) { - // Check if a server window with same name and port is already open - Server* lookServer = serverList.first(); - Server* existingServer = 0; + Server* server = 0; - while (lookServer) - { - if (lookServer->serverGroupSettings()->id() == serverGroupId) - { - existingServer = lookServer; - break; - } + bool conversion = false; + int connectionId = connection.toInt(&conversion); - lookServer = serverList.next(); - } + if (conversion) server = getConnectionManager()->getServerByConnectionId(connectionId); - // There's already a connection to this network. - if (existingServer) - { - // The connection is active, and the server list dialog requested - // to connect to a specific server. - if (existingServer->isConnected() && !quickServer.server().isEmpty()) - { - // This server differs from the server we're presently connected to. - if (quickServer.server() != existingServer->getServerName()) - { - int result = KMessageBox::warningContinueCancel( - mainWindow, - i18n("You are already connected to %1. Do you want to disconnect from '%2' and connect to '%3' instead?") - .arg(existingServer->getServerGroup()) - .arg(existingServer->getServerName()) - .arg(quickServer.server()), - i18n("Already connected to %1").arg(existingServer->getServerGroup()), - i18n("Disconnect"), - "ReconnectDifferentServer"); - - // The user has chosen to connect to this different server - // instead of the current one. - if (result == KMessageBox::Continue) - { - existingServer->disconnect(); - existingServer->serverGroupSettings()->clearQuickServerList(); - existingServer->serverGroupSettings()->setQuickServerList(quickServer); - existingServer->resetCurrentServerIndex(); - existingServer->reconnect(); - return existingServer; - } - // The user wants to keep the current connection alive, so - // return the existing connection. - else - return existingServer; - } - // We've gotten a request to connect to the same server we're - // already connected to, so return the existing connection. - else - return existingServer; - } - // We haven't been told to connect to a specific server and already have - // a connection to this network, so return it. - else if (existingServer->isConnected() && quickServer.server().isEmpty()) - { - return existingServer; - } - // The connection is inactive. - else if (!existingServer->isConnected()) - { - // We've been told to connect to a specific server. Do so. - if (!quickServer.server().isEmpty()) - { - existingServer->serverGroupSettings()->clearQuickServerList(); - existingServer->serverGroupSettings()->setQuickServerList(quickServer); - existingServer->resetCurrentServerIndex(); - existingServer->reconnect(); - return existingServer; - } - // No specific server was part of the request, so reconnect - // the old one. - else - { - existingServer->reconnect(); - return existingServer; - } - } - } - - Konversation::ServerGroupSettingsPtr serverGroup = Preferences::serverGroupById(serverGroupId); - IdentityPtr identity = serverGroup->identity(); - - if (!identity || !validateIdentity(identity)) - return 0; - - emit closeServerList(); - - bool clearQuickServerList = true; - - // Have we been called with a quickServer? If so, append to list & prevent - // simple Server constructor from cleaing its quickServer list like it - // would do normally. - if (!quickServer.server().isEmpty()) - { - serverGroup->setQuickServerList(quickServer); - clearQuickServerList = false; - } - - mainWindow->show(); - - Server* newServer = new Server(mainWindow->getViewContainer(), serverGroupId, clearQuickServerList); - - connect(mainWindow,SIGNAL (startNotifyTimer(int)),newServer,SLOT (startNotifyTimer(int)) ); - connect(mainWindow,SIGNAL (quitServer()),newServer,SLOT (quitServer()) ); - connect(newServer, SIGNAL(connectionChangedState(Server*, Server::State)), - mainWindow, SIGNAL(serverStateChanged(Server*, Server::State))); - - connect(newServer,SIGNAL (nicksNowOnline(Server*,const QStringList&,bool)),mainWindow,SLOT (setOnlineList(Server*,const QStringList&,bool)) ); - - connect(newServer,SIGNAL (deleted(Server*)),this,SLOT (removeServer(Server*)) ); - - connect(newServer, SIGNAL(multiServerCommand(const QString&, const QString&)), - this, SLOT(sendMultiServerCommand(const QString&, const QString&))); - connect(newServer, SIGNAL(awayInsertRememberLine(Server*)), mainWindow, SIGNAL(insertRememberLine(Server*))); - - serverList.append(newServer); - - return newServer; -} + if (!server) server = getConnectionManager()->getServerByName(connection); -void KonversationApplication::quickConnectToServer(const QString& hostName, const QString& port, const QString& channel, const QString& nick, const QString& password, const bool& useSSL) -{ - //used for the quick connect dialog and /server command - - IdentityPtr identity; - Konversation::ServerGroupSettingsPtr serverGroupOfServer; - - // If server is in an existing group, use that group (first group if server is in multiple groups) - if (serverGroupOfServer = Preferences::serverGroupByServer(hostName)) - identity = serverGroupOfServer->identity(); - else - identity = Preferences::identityByName("Default"); - - if (!identity || !validateIdentity(identity)) - return; - - Server* newServer = new Server(mainWindow->getViewContainer(), hostName, port, channel, nick, password, useSSL); - - connect(mainWindow,SIGNAL (startNotifyTimer(int)),newServer,SLOT (startNotifyTimer(int)) ); - connect(mainWindow,SIGNAL (quitServer()),newServer,SLOT (quitServer()) ); - connect(newServer, SIGNAL(connectionChangedState(Server*, Server::State)), - mainWindow, SIGNAL(serverStateChanged(Server*, Server::State))); - - connect(newServer,SIGNAL (nicksNowOnline(Server*,const QStringList&,bool)),mainWindow,SLOT (setOnlineList(Server*,const QStringList&,bool)) ); - - connect(newServer,SIGNAL (deleted(Server*)),this,SLOT (removeServer(Server*)) ); - - connect(newServer, SIGNAL(multiServerCommand(const QString&, const QString&)), - this, SLOT(sendMultiServerCommand(const QString&, const QString&))); - connect(newServer, SIGNAL(awayInsertRememberLine(Server*)), mainWindow, SIGNAL(insertRememberLine(Server*))); - - serverList.append(newServer); + if (server) server->dcopSay(target, command); } -Server* KonversationApplication::getServerByName(const QString& name) -{ - Server* lookServer=serverList.first(); - - while(lookServer) - { - if(lookServer->getServerName()==name) return lookServer; - lookServer=serverList.next(); - } - - return 0; -} - -void KonversationApplication::removeServer(Server* server) +void KonversationApplication::dcopInfo(const QString& string) { - serverList.setAutoDelete(false); // don't delete items when they are removed - if(!serverList.remove(server)) - kdDebug() << "Could not remove " << server->getServerName() << endl; + mainWindow->getViewContainer()->appendToFrontmost(i18n("DCOP"), string, 0); } void KonversationApplication::readOptions() @@ -528,7 +313,11 @@ newIdentity->setShowAwayMessage(config->readBoolEntry("ShowAwayMessage")); newIdentity->setAwayMessage(config->readEntry("AwayMessage")); newIdentity->setReturnMessage(config->readEntry("ReturnMessage")); + newIdentity->setAutomaticAway(config->readBoolEntry("AutomaticAway", false)); + newIdentity->setAwayInactivity(config->readNumEntry("AwayInactivity", 10)); + newIdentity->setAutomaticUnaway(config->readBoolEntry("AutomaticUnaway", false)); + newIdentity->setQuitReason(config->readEntry("QuitReason")); newIdentity->setPartReason(config->readEntry("PartReason")); newIdentity->setKickReason(config->readEntry("KickReason")); @@ -596,7 +385,7 @@ for(it2 = tmp1.begin(); it2 != tmp1.end(); ++it2) { config->setGroup((*it2)); - server.setServer(config->readEntry("Server")); + server.setHost(config->readEntry("Server")); server.setPort(config->readNumEntry("Port")); server.setPassword(config->readEntry("Password")); server.setSSLEnabled(config->readBoolEntry("SSLEnabled")); @@ -696,7 +485,7 @@ unsigned int hiIndex; for(hiIndex=0;hiIndexdeleteEntry("Highlight"); @@ -734,12 +523,22 @@ if(!newList.isEmpty()) Preferences::setAliasList(newList); // Channel Encodings - QMap channelEncodingsEntry=config->entryMap("Channel Encodings"); + QMap channelEncodingEntries=config->entryMap("Channel Encodings"); QRegExp re("^(.+) ([^\\s]+)$"); - QStringList channelEncodingsEntryKeys=channelEncodingsEntry.keys(); - for(unsigned int i=0; i -1) - Preferences::setChannelEncoding(re.cap(1),re.cap(2),channelEncodingsEntry[channelEncodingsEntryKeys[i]]); + QStringList channelEncodingEntryKeys=channelEncodingEntries.keys(); + QStringList::iterator itStr=channelEncodingEntryKeys.begin(); + for(; itStr != channelEncodingEntryKeys.end(); ++itStr) + { + if(re.search(*itStr) > -1) + { + int serverGroupId = Preferences::serverGroupIdByName(re.cap(1)); + if(serverGroupId != -1) + Preferences::setChannelEncoding(serverGroupId,re.cap(2),channelEncodingEntries[*itStr]); + } + } + + // O, what a tangled web + Server::_fetchRates(); } void KonversationApplication::saveOptions(bool updateGUI) @@ -758,10 +557,10 @@ config->deleteGroup(identities[index]); } - QValueList identityList = Preferences::identityList(); + IdentityList identityList = Preferences::identityList(); int index = 0; - for(QValueList::iterator it = identityList.begin(); it != identityList.end(); ++it) + for(IdentityList::ConstIterator it = identityList.begin(); it != identityList.end(); ++it) { IdentityPtr identity = (*it); config->setGroup(QString("Identity %1").arg(index)); @@ -776,6 +575,10 @@ config->writeEntry("ShowAwayMessage",identity->getShowAwayMessage()); config->writeEntry("AwayMessage",identity->getAwayMessage()); config->writeEntry("ReturnMessage",identity->getReturnMessage()); + config->writeEntry("AutomaticAway", identity->getAutomaticAway()); + config->writeEntry("AwayInactivity", identity->getAwayInactivity()); + config->writeEntry("AutomaticUnaway", identity->getAutomaticUnaway()); + config->writeEntry("QuitReason",identity->getQuitReason()); config->writeEntry("PartReason",identity->getPartReason()); config->writeEntry("KickReason",identity->getKickReason()); config->writeEntry("PreShellCommand",identity->getShellCommand()); @@ -784,9 +587,6 @@ index++; } // endfor - // FIXME: check if this group is still needed - config->setGroup("Notify List"); - // Remove the old servergroups from the config QStringList groups = config->groupList().grep(QRegExp("ServerGroup [0-9]+")); if(groups.count()) @@ -838,7 +638,7 @@ for(it = serverGroupList.begin(); it != serverGroupList.end(); ++it) { - serverlist = (*it)->serverList(true); + serverlist = (*it)->serverList(); servers.clear(); for(it2 = serverlist.begin(); it2 != serverlist.end(); ++it2) @@ -846,7 +646,7 @@ groupName = QString("Server %1").arg(index2); servers.append(groupName); config->setGroup(groupName); - config->writeEntry("Server", (*it2).server()); + config->writeEntry("Server", (*it2).host()); config->writeEntry("Port", (*it2).port()); config->writeEntry("Password", (*it2).password()); config->writeEntry("SSLEnabled", (*it2).SSLEnabled()); @@ -895,31 +695,6 @@ } config->deleteGroup("Server List"); -/* - Should be done in HighlightConfigController now ... - remove this part as soon as we are certain it works - - // Write all highlight entries - QPtrList hiList=Preferences::highlightList(); - int i = 0; - for(Highlight* hl = hiList.first(); hl; hl = hiList.next()) - { - config->setGroup(QString("Highlight%1").arg(i)); - config->writeEntry("Pattern", hl->getPattern()); - config->writeEntry("RegExp", hl->getRegExp()); - config->writeEntry("Color", hl->getColor()); - config->writePathEntry("Sound", hl->getSoundURL().prettyURL()); - config->writeEntry("AutoText", hl->getAutoText()); - i++; - } - - // Remove unused entries... - while(config->hasGroup(QString("Highlight%1").arg(i))) - { - config->deleteGroup(QString("Highlight%1").arg(i)); - i++; - } -*/ // Ignore List config->deleteGroup("Ignore List"); @@ -935,16 +710,27 @@ } // Channel Encodings + // remove all entries once + config->deleteGroup("Channel Encodings"); config->setGroup("Channel Encodings"); - QStringList channelEncodingsServerList=Preferences::channelEncodingsServerList(); - channelEncodingsServerList.sort(); - for(unsigned int i=0; iwriteEntry(channelEncodingsServerList[i]+' '+channelEncodingsChannelList[j],Preferences::channelEncoding(channelEncodingsServerList[i],channelEncodingsChannelList[j])); + QValueList encServers=Preferences::channelEncodingsServerGroupIdList(); + //i have no idea these would need to be sorted //encServers.sort(); + QValueList::iterator encServer; + for ( encServer = encServers.begin(); encServer != encServers.end(); ++encServer ) + { + Konversation::ServerGroupSettingsPtr sgsp = Preferences::serverGroupById(*encServer); + if ( sgsp ) // sgsp == 0 when the entry is of QuickConnect or something? + { + QStringList encChannels=Preferences::channelEncodingsChannelList(*encServer); + //ditto //encChannels.sort(); + QStringList::iterator encChannel; + for ( encChannel = encChannels.begin(); encChannel != encChannels.end(); ++encChannel ) + { + QString enc = Preferences::channelEncoding(*encServer, *encChannel); + QString key = sgsp->name() + ' ' + (*encChannel); + config->writeEntry(key, enc); + } + } } config->sync(); @@ -953,23 +739,6 @@ emit appearanceChanged(); } -void KonversationApplication::updateNickIcons() -{ - Server* lookServer=serverList.first(); - - while(lookServer) - { - QPtrList channelList = lookServer->getChannelList(); - Channel* channel=channelList.first(); - while(channel) - { - channel->getNickListView()->refresh(); - channel=channelList.next(); - } - lookServer=serverList.next(); - } -} - // FIXME: use KURL maybe? void KonversationApplication::storeUrl(const QString& who,const QString& newUrl) { @@ -1004,71 +773,21 @@ void KonversationApplication::openQuickConnectDialog() { quickConnectDialog = new QuickConnectDialog(mainWindow); - connect(quickConnectDialog, SIGNAL(connectClicked(const QString&, const QString&, const QString&, const QString&, const QString&, const bool&)),this, SLOT(quickConnectToServer(const QString&, const QString&, const QString&, const QString&, const QString&,const bool&))); + connect(quickConnectDialog, SIGNAL(connectClicked(Konversation::ConnectionFlag, const QString&, const QString&, + const QString&, const QString&, const QString&, bool)), + m_connectionManager, SLOT(connectTo(Konversation::ConnectionFlag, const QString&, const QString&, + const QString&, const QString&, const QString&, bool))); quickConnectDialog->show(); } -bool KonversationApplication::emitDCOPSig(const QString &appId, const QString &objId, const QString &signal, QByteArray &data) -{ - kdDebug() << "emitDCOPSig (" << signal << ")" << endl; - //dcopObject->emitDCOPSignal(signal, data); - QByteArray replyData; - QCString replyType; - if (!KApplication::dcopClient()->call(appId.ascii(), objId.ascii(), signal.ascii() /*must have prototype*/, - data, replyType, replyData)) - { - kdDebug() << "There was some error using DCOP." << endl; - return true; // Keep processing filters - } - else - { - QDataStream reply(replyData, IO_ReadOnly); - if (replyType == "bool") - { - bool result; - reply >> result; - return result; - } - else - { - kdDebug() << "doIt returned an unexpected type of reply!" << endl; - return true; // Keep processing - } - } -} - void KonversationApplication::sendMultiServerCommand(const QString& command, const QString& parameter) { - for(Server* server = serverList.first(); server; server = serverList.next()) - { - server->executeMultiServerCommand(command, parameter); - } -} - -void KonversationApplication::dcopConnectToServer(const QString& url, int port, const QString& channel, -const QString& password) -{ - Server* server = getServerByName(url); + QPtrList serverList = getConnectionManager()->getServerList(); - if(server) - server->sendJoinCommand(channel); - else - quickConnectToServer(url, QString::number(port), channel, password); -} - -Konversation::Sound* KonversationApplication::sound() -{ - return m_sound; -} - -Images* KonversationApplication::images() -{ - return m_images; + for (Server* server = serverList.first(); server; server = serverList.next()) + server->executeMultiServerCommand(command, parameter); } -// Returns list of pointers to Servers. -const QPtrList KonversationApplication::getServerList() { return serverList; } - void KonversationApplication::splitNick_Server(const QString& nick_server, QString &ircnick, QString &serverOrGroup) { //kaddresbook uses the utf separator 0xE120, so treat that as a separator as well @@ -1080,13 +799,14 @@ NickInfoPtr KonversationApplication::getNickInfo(const QString &ircnick, const QString &serverOrGroup) { + QPtrList serverList = getConnectionManager()->getServerList(); NickInfoPtr nickInfo; QString lserverOrGroup = serverOrGroup.lower(); for(Server* lookServer = serverList.first(); lookServer; lookServer = serverList.next()) { if(lserverOrGroup.isEmpty() || lookServer->getServerName().lower()==lserverOrGroup - || lookServer->getServerGroup().lower()==lserverOrGroup) + || lookServer->getDisplayName().lower()==lserverOrGroup) { nickInfo = lookServer->getNickInfo(ircnick); if(nickInfo) return nickInfo; //If we found one @@ -1125,24 +845,30 @@ // create regex from pattern QRegExp needleReg=pattern; // set pattern case insensitive - needleReg.setCaseSensitive(false); - // find matches - if(line.find(needleReg)!=-1) - { - // prepare list of captured ( ) groups - QStringList captures; - // remember captured patterns - captures=needleReg.capturedTexts(); + needleReg.setCaseSensitive(true); + int index = 0; - // replace %0 - %9 in regex groups - for(unsigned int capture=0;capture= 0 && index < (int)line.length()); } else { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konversationapplication.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konversationapplication.h --- konversation-1.0.1/konversation/src/konversationapplication.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konversationapplication.h 2008-08-06 16:56:27.000000000 +0100 @@ -10,27 +10,32 @@ Copyright (C) 2005 Ismail Donmez Copyright (C) 2005 Peter Simonsson Copyright (C) 2005 John Tapsell - Copyright (C) 2005 Eike Hein + Copyright (C) 2005-2008 Eike Hein */ #ifndef KONVERSATIONAPPLICATION_H #define KONVERSATIONAPPLICATION_H -#include - #include "preferences.h" #include "osd.h" #include "konvdcop.h" #include "identity.h" #include "nickinfo.h" +#include + + class QCString; +class ConnectionManager; +class AwayManager; +class DccTransferManager; class KonversationMainWindow; class KonvDCOP; class Server; class QuickConnectDialog; class Images; +class ServerGroupSettings; namespace Konversation { @@ -64,7 +69,15 @@ * Note to any MDI developer - get this to return any of the windows, or some * 'main' one. */ - KonversationMainWindow *getMainWindow(); + KonversationMainWindow* getMainWindow() { return mainWindow; } + + ConnectionManager* getConnectionManager() { return m_connectionManager; } + AwayManager* getAwayManager() { return m_awayManager; } + DccTransferManager* getDccTransferManager() { return m_dccTransferManager; } + + // HACK + void showQueueTuner(bool); + // URL-Catcher void storeUrl(const QString& who,const QString& url); const QStringList& getUrlList(); @@ -74,8 +87,6 @@ static KonversationApplication* instance(); - Server* getServerByName(const QString& name); - /** For dcop and addressbook, a user can be specified as user@irc.server.net * or user\@servergroup or using the unicode separator symbol 0xE120 instead * of the "@". This function takes a string like the above examples, and @@ -96,19 +107,11 @@ */ NickInfoPtr getNickInfo(const QString &ircnick, const QString &serverOrGroup); - bool validateIdentity(IdentityPtr identity, bool interactive=true); - OSDWidget* osd; - Konversation::Sound* sound(); - - Images* images(); - - /* Updates all nick icons according to new theme */ - void updateNickIcons(); + Konversation::Sound* sound() { return m_sound; } - // Returns list of pointers to Servers. - const QPtrList getServerList(); + Images* images() { return m_images; } Konversation::NotificationHandler* notificationHandler() const { return m_notificationHandler; } @@ -117,52 +120,36 @@ int newInstance(); - void delayedConnectToServer(const QString& hostName, - const QString& port = "6667", - const QString& channel="", - const QString& nick = Preferences::nickname(0), - const QString& password="", - const bool& useSSL=false - ); signals: void catchUrl(const QString& who,const QString& url); - void prefsChanged(); - void closeServerList(); + void serverGroupsChanged(const Konversation::ServerGroupSettings* serverGroup); + public slots: - Server* connectToServerGroup(const QString& serverGroup); - Server* connectToServer(int serverGroupId, Konversation::ServerSettings quickServer = Konversation::ServerSettings()); - void quickConnectToServer(const QString& hostName, - const QString& port = "6667", - const QString& channel="", - const QString& nick = Preferences::nickname(0), - const QString& password="", - const bool& useSSL=false - ); void readOptions(); void saveOptions(bool updateGUI=true); void deleteUrl(const QString& who,const QString& url); void clearUrlList(); - /** Send a message to all servers that you are away. */ - void toggleAway(); - bool emitDCOPSig(const QString& appId, const QString& objId, const QString& signal, QByteArray& data); - void dcopConnectToServer(const QString& url, int port, const QString& channel, const QString& password); protected slots: + void prepareShutdown(); + void openQuickConnectDialog(); - void removeServer(Server* server); void dcopMultiServerRaw(const QString &command); - void dcopRaw(const QString& server, const QString &command); - void dcopSay(const QString& server,const QString& target,const QString& command); + void dcopRaw(const QString& connection, const QString &command); + void dcopSay(const QString& connection, const QString& target, const QString& command); void dcopInfo(const QString& string); void sendMultiServerCommand(const QString& command, const QString& parameter); + private: - QPtrList serverList; + ConnectionManager* m_connectionManager; + AwayManager* m_awayManager; + DccTransferManager* m_dccTransferManager; QStringList urlList; KonvDCOP* dcopObject; KonvIdentDCOP* identDCOP; @@ -174,15 +161,6 @@ Konversation::NotificationHandler* m_notificationHandler; QStringList colorList; - - // For command line arguments - QString m_hostName; - QString m_port; - QString m_channel; - QString m_nick; - QString m_password; - bool m_useSSL; - bool m_connectDelayed; }; #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konversation.desktop /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konversation.desktop --- konversation-1.0.1/konversation/src/konversation.desktop 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konversation.desktop 2008-08-06 16:56:27.000000000 +0100 @@ -1,8 +1,8 @@ [Desktop Entry] Type=Application -Exec=konversation -caption "%c" %i %m +Exec=konversation -caption "%c" %i Icon=konversation -DocPath=konversation/index.html +X-DocPath=konversation/index.html GenericName=IRC Client GenericName[ar]=زبون IRC GenericName[bg]=IRC клиент @@ -11,6 +11,7 @@ GenericName[cs]=IRC klient GenericName[cy]=Dibynnydd IRC GenericName[da]=IRC-klient +GenericName[de]=IRC-Programm GenericName[el]=Πελάτης IRC GenericName[es]=Cliente de IRC GenericName[et]=IRC klient @@ -20,12 +21,19 @@ GenericName[it]=Client IRC GenericName[ja]=IRC クライアント GenericName[ka]=IRC საუბარი +GenericName[lt]=IRC klientas +GenericName[ms]=Klien IRC GenericName[nl]=IRC-client GenericName[pa]=IRC ਕਲਾਂਇਟ GenericName[pt]=Cliente de IRC GenericName[pt_BR]=Cliente IRC +GenericName[sr]=IRC клијент +GenericName[sr@Latn]=IRC klijent GenericName[sv]=IRC-klient +GenericName[tr]=IRC İstemcisi +GenericName[uk]=Клієнт IRC GenericName[xx]=xxIRC Clientxx +GenericName[zh_CN]=IRC 客户端 GenericName[zh_TW]=IRC 客戶端程式 Terminal=false Name=Konversation @@ -33,8 +41,7 @@ Name[pa]=ਗੱਲਬਾਤ Name[ta]=உரையாடல் Name[xx]=xxKonversationxx -Categories=Qt;KDE;Network;X-SuSE-IRCClient; +Categories=Qt;KDE;Network;IRCClient; ServiceTypes=DCOP/InstantMessenger;DCOP/Unique X-DCOP-ServiceName=konversation X-DCOP-ServiceType=Unique -Encoding=UTF-8 diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konversationircprotocolhandler /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konversationircprotocolhandler --- konversation-1.0.1/konversation/src/konversationircprotocolhandler 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konversationircprotocolhandler 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2004-2005 by İsmail Dönmez - -# A script for Konversation to call connectToServer for each instance of Konversation. - -url=`echo $1 | sed -e "s,irc://,,"` -server_and_port=`echo $url | sed -e "s,\b/.*,,"` -server=`echo $server_and_port| awk -F":" '{print $1}'` -port=`echo $server_and_port| awk -F":" '{print $2}'` -channel_and_password=`echo $url | awk -F"/" '{print $2}'` -channel=`echo $channel_and_password | awk -F"?" '{print $1}'` -password=`echo $channel_and_password | awk -F"?" '{print $2}'` - -if test -z "$port";then port=6667;fi; - -if test ! ${channel:0:1} == '#' && test ! -z $channel ;then channel="#"$channel;fi - -if [ `pidof konversation` ]; then - dcop konversation default connectToServer $server $port "$channel" "$password" -else - konversation --server $server --port $port --channel "$channel" --password "$password" -fi diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konversationmainwindow.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konversationmainwindow.cpp --- konversation-1.0.1/konversation/src/konversationmainwindow.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konversationmainwindow.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -10,9 +10,25 @@ Copyright (C) 2005 Ismail Donmez Copyright (C) 2005 Peter Simonsson Copyright (C) 2005 John Tapsell - Copyright (C) 2005 Eike Hein + Copyright (C) 2005-2008 Eike Hein */ +#include "konversationmainwindow.h" +#include "konversationapplication.h" +#include "linkaddressbook/addressbook.h" +#include "konvisettingsdialog.h" +#include "viewcontainer.h" +#include "konversationstatusbar.h" +#include "konvibookmarkhandler.h" +#include "trayicon.h" +#include "serverlistdialog.h" +#include "identitydialog.h" +#include "notificationhandler.h" +#include "irccharsets.h" +#include "connectionmanager.h" +#include "awaymanager.h" +#include "dcctransfermanager.h" + #include #include #include @@ -43,19 +59,6 @@ #include #endif -#include "linkaddressbook/addressbook.h" -#include "konversationmainwindow.h" -#include "konvisettingsdialog.h" -#include "viewcontainer.h" -#include "konversationstatusbar.h" -#include "konvibookmarkhandler.h" -#include "konversationapplication.h" -#include "trayicon.h" -#include "serverlistdialog.h" -#include "identitydialog.h" -#include "notificationhandler.h" -#include "irccharsets.h" -#include "konviiphelper.h" KonversationMainWindow::KonversationMainWindow() : KMainWindow(0,"main_window", WStyle_ContextHelp | WType_TopLevel | WDestructiveClose) { @@ -75,11 +78,18 @@ // Set up view container connect(KonversationApplication::instance(), SIGNAL(appearanceChanged()), m_viewContainer, SLOT(updateAppearance())); connect(KonversationApplication::instance(), SIGNAL(iconChanged(int)), m_viewContainer, SLOT(updateViewIcons())); + connect(KonversationApplication::instance(), SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)), + m_viewContainer, SLOT(updateViews(const Konversation::ServerGroupSettings*))); + connect(m_viewContainer, SIGNAL(autoJoinToggled(const Konversation::ServerGroupSettings*)), + KonversationApplication::instance(), SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*))); connect(m_viewContainer, SIGNAL(setWindowCaption(const QString&)), this, SLOT(setCaption(const QString&))); - connect(this, SIGNAL(serverStateChanged(Server*, Server::State)), m_viewContainer, SLOT(serverStateChanged(Server*, Server::State))); - connect(this, SIGNAL(insertRememberLine()), m_viewContainer, SLOT(insertRememberLine())); - connect(this, SIGNAL(insertRememberLine(Server*)), m_viewContainer, SLOT(insertRememberLine(Server*))); - + connect(KonversationApplication::instance()->getConnectionManager(), + SIGNAL(connectionChangedState(Server*, Konversation::ConnectionState)), + m_viewContainer, SLOT(connectionStateChanged(Server*, Konversation::ConnectionState))); + connect(this, SIGNAL(triggerRememberLine()), m_viewContainer, SLOT(insertRememberLine())); + connect(this, SIGNAL(triggerRememberLines(Server*)), m_viewContainer, SLOT(insertRememberLines(Server*))); + connect(this, SIGNAL(cancelRememberLine()), m_viewContainer, SLOT(cancelRememberLine())); + connect(this, SIGNAL(insertMarkerLine()), m_viewContainer, SLOT(insertMarkerLine())); // Set up status bar m_statusBar = new KonversationStatusBar(this); @@ -175,6 +185,9 @@ action->setEnabled(false); action = new KAction(i18n("Close &Tab"),"tab_remove",KShortcut("Ctrl+w"), m_viewContainer, SLOT(closeCurrentView()),actionCollection(),"close_tab"); action->setEnabled(false); + action = new KAction(i18n("Next Active Tab"), 0, KShortcut("Ctrl+Alt+Space"), m_viewContainer, SLOT(showNextActiveView()), + actionCollection(), "next_active_tab"); + action->setEnabled(false); if (Preferences::tabPlacement()==Preferences::Left) { @@ -211,9 +224,15 @@ action2->setToolTip("Move this tab"); } + action = new KAction(i18n("Rejoin Channel"), 0, m_viewContainer, SLOT(rejoinChannel()), actionCollection(), "rejoin_channel"); + action->setEnabled(false); + action = new KToggleAction(i18n("Enable Notifications"), 0, 0, m_viewContainer, SLOT(toggleViewNotifications()), actionCollection(), "tab_notifications"); action->setEnabled(false); + action = new KToggleAction(i18n("Join on Connect"), 0, 0, m_viewContainer, SLOT(toggleAutoJoin()), actionCollection(), "tab_autojoin"); + action->setEnabled(false); + KSelectAction* selectAction = new KSelectAction(i18n("Set Encoding"), "charset", 0, actionCollection(), "tab_encoding"); selectAction->setEditable(false); QStringList encodingDescs = Konversation::IRCCharsets::self()->availableEncodingDescriptiveNames(); @@ -222,10 +241,6 @@ selectAction->setEnabled(false); connect(selectAction, SIGNAL(activated(int)), m_viewContainer, SLOT(changeViewCharset(int))); - selectAction = new KSelectAction(i18n("Switch To"), 0, 0, actionCollection(), "switch_to_tab"); - selectAction->setEditable(false); - connect(selectAction, SIGNAL(activated(int)), m_viewContainer, SLOT(goToView(int))); - QSignalMapper* tabSelectionMapper = new QSignalMapper(this); connect(tabSelectionMapper, SIGNAL(mapped(int)), m_viewContainer, SLOT(goToView(int))); @@ -236,6 +251,9 @@ tabSelectionMapper->setMapping( tabSelectionAction, i-1); } + action = new KAction(i18n("Clear &Marker Lines"), 0, KShortcut("CTRL+SHIFT+R"), m_viewContainer, SLOT(clearViewLines()),actionCollection(),"clear_lines"); + action->setToolTip(i18n("Clear marker lines in the current tab")); + action->setEnabled(false); action = new KAction(i18n("&Clear Window"), 0, KShortcut("Ctrl+L"), m_viewContainer, SLOT(clearView()),actionCollection(),"clear_window"); action->setToolTip(i18n("Clear the contents of the current tab")); action->setEnabled(false); @@ -243,8 +261,8 @@ action->setToolTip(i18n("Clear the contents of all open tabs")); action->setEnabled(false); - KAction* awayAction = new KAction(i18n("Set &Away Globally")/*, "konversationaway"*/, KShortcut("Ctrl+Shift+A"), - static_cast(kapp), SLOT(toggleAway()), actionCollection(),"toggle_away"); + KToggleAction* awayAction = new KToggleAction(i18n("Global Away"), KShortcut("Ctrl+Shift+A"), actionCollection(), "toggle_away"); + connect(awayAction, SIGNAL(toggled(bool)), static_cast(kapp)->getAwayManager(), SLOT(toggleGlobalAway(bool))); awayAction->setEnabled(false); action = new KAction(i18n("&Join Channel..."), "add", KShortcut("Ctrl+J"), m_viewContainer, SLOT(showJoinChannelDialog()), actionCollection(), "join_channel"); @@ -255,11 +273,13 @@ action->setEnabled(false); action = KStdAction::findNext(m_viewContainer, SLOT(findNextText()), actionCollection()); action->setEnabled(false); + action = KStdAction::findPrev(m_viewContainer, SLOT(findPrevText()), actionCollection()); + action->setEnabled(false); action = new KAction(i18n("&IRC Color..."), "colorize", CTRL+Key_K, m_viewContainer, SLOT(insertIRCColor()), actionCollection(), "irc_colors"); action->setToolTip(i18n("Set the color of your current IRC message")); action->setEnabled(false); - action = new KAction(i18n("&Remember Line"), 0, KShortcut("Ctrl+R") , m_viewContainer, SLOT(insertRememberLine()), actionCollection(), "insert_remember_line"); + action = new KAction(i18n("&Marker Line"), 0, KShortcut("Ctrl+R") , m_viewContainer, SLOT(insertMarkerLine()), actionCollection(), "insert_marker_line"); action->setToolTip(i18n("Insert a horizontal line into the current tab that only you can see")); action->setEnabled(false); action = new KAction(i18n("Special &Character..."), "char", KShortcut("Alt+Shift+C"), m_viewContainer, SLOT(insertCharacter()), actionCollection(), "insert_character"); @@ -277,6 +297,7 @@ // set up system tray m_trayIcon = new Konversation::TrayIcon(this); connect(this, SIGNAL(endNotification()), m_trayIcon, SLOT(endNotification())); + connect(KonversationApplication::instance(), SIGNAL(iconChanged(int)), m_trayIcon, SLOT(updateAppearance())); connect(m_trayIcon, SIGNAL(quitSelected()), this, SLOT(quitProgram())); KPopupMenu *trayMenu = m_trayIcon->contextMenu(); #ifdef USE_KNOTIFY @@ -299,7 +320,6 @@ // Bookmarks m_bookmarkHandler = new KonviBookmarkHandler(this); - connect(m_bookmarkHandler,SIGNAL(openURL(const QString&,const QString&)),this,SLOT(openURL(const QString&,const QString&))); // set up KABC with a nice gui error dialog KABC::GuiErrorHandler *m_guiErrorHandler = new KABC::GuiErrorHandler(this); @@ -314,22 +334,38 @@ KonversationMainWindow::~KonversationMainWindow() { - Preferences::writeConfig(); + delete m_viewContainer; } int KonversationMainWindow::confirmQuit() { - KonversationApplication *konvApp=static_cast(kapp); + KonversationApplication* konvApp = static_cast(kapp); + + if (konvApp->getConnectionManager()->connectionCount() == 0) + return KMessageBox::Continue; - QPtrList serverList = konvApp->getServerList(); - if (serverList.isEmpty()) return KMessageBox::Continue; + int result = KMessageBox::Cancel; + + if (!KMessageBox::shouldBeShownContinue("systemtrayquitKonversation") + && konvApp->getDccTransferManager()->hasActiveTransfers()) + { + result = KMessageBox::warningContinueCancel( + this, + i18n("You have active DCC file transfers. Are you sure you want to quit Konversation?"), + i18n("Confirm Quit"), + i18n("Quit"), + "QuitWithActiveDccTransfers"); + } + else + { + result = KMessageBox::warningContinueCancel( + this, + i18n("Are you sure you want to quit Konversation?"), + i18n("Confirm Quit"), + i18n("Quit"), + "systemtrayquitKonversation"); + } - int result=KMessageBox::warningContinueCancel( - this, - i18n("Are you sure you want to quit Konversation?"), - i18n("Confirm Quit"), - i18n("Quit"), - "systemtrayquitKonversation"); return result; } @@ -346,48 +382,45 @@ bool KonversationMainWindow::queryClose() { - KonversationApplication* konv_app = static_cast(kapp); + KonversationApplication* konvApp = static_cast(kapp); - if (konv_app->sessionSaving() || sender() == m_trayIcon) - m_closeApp = true; - - if (Preferences::showTrayIcon() && !m_closeApp) + if (!konvApp->sessionSaving()) { - KMessageBox::information( this, - i18n("

Closing the main window will keep Konversation running in the system tray. " - "Use Quit from the Konversation menu to quit the application.

"), - i18n( "Docking in System Tray" ), "HideOnCloseInfo" ); - hide(); - - return false; - } + if (sender() == m_trayIcon) + m_closeApp = true; - if (!Preferences::showTrayIcon() && confirmQuit() == KMessageBox::Cancel) - return false; + if (Preferences::showTrayIcon() && !m_closeApp) + { + KMessageBox::information( this, + i18n("

Closing the main window will keep Konversation running in the system tray. " + "Use Quit from the Konversation menu to quit the application.

"), + i18n( "Docking in System Tray" ), "HideOnCloseInfo" ); + hide(); - m_viewContainer->silenceViews(); + return false; + } - // send quit to all servers - emit quitServer(); + if (!Preferences::showTrayIcon() && confirmQuit() == KMessageBox::Cancel) + return false; + } return true; } void KonversationMainWindow::hideEvent(QHideEvent *e) { - if (Preferences::autoInsertRememberLineAfterMinimizing()) - emit insertRememberLine(); + emit triggerRememberLine(); m_statusBar->clearMainLabelTempText(); KMainWindow::hideEvent(e); } -void KonversationMainWindow::focusOutEvent(QFocusEvent* e) +void KonversationMainWindow::showEvent(QShowEvent *e) { - m_statusBar->clearMainLabelTempText(); + emit cancelRememberLine(); - KMainWindow::focusOutEvent(e); + KMainWindow::showEvent(e); } void KonversationMainWindow::leaveEvent(QEvent* e) @@ -399,7 +432,18 @@ bool KonversationMainWindow::event(QEvent* e) { - if (e->type() == QEvent::WindowActivate) emit endNotification(); + if (e->type() == QEvent::WindowActivate) + { + emit endNotification(); + emit cancelRememberLine(); + } + else if(e->type() == QEvent::WindowDeactivate) + { + m_statusBar->clearMainLabelTempText(); + + if (kapp->activeModalWidget() == 0) + emit triggerRememberLine(); + } return KMainWindow::event(e); } @@ -496,7 +540,7 @@ actionCollection()->action("toggle_away")->setText(i18n("Toggle Away Globally")); actionCollection()->action("irc_colors")->setText(i18n("Insert &IRC Color...")); actionCollection()->action("insert_character")->setText(i18n("Insert Special &Character...")); - actionCollection()->action("insert_remember_line")->setText(i18n("Insert &Remember Line")); + actionCollection()->action("insert_marker_line")->setText(i18n("Insert &Marker Line")); QString openChannelListString = actionCollection()->action("open_channel_list")->text(); actionCollection()->action("open_channel_list")->setText(i18n("&Channel List")); QString openLogFileString = actionCollection()->action("open_logfile")->text(); @@ -510,7 +554,7 @@ actionCollection()->action("toggle_away")->setText(i18n("Set &Away Globally")); actionCollection()->action("irc_colors")->setText(i18n("&IRC Color...")); actionCollection()->action("insert_character")->setText(i18n("Special &Character...")); - actionCollection()->action("insert_remember_line")->setText(i18n("&Remember Line")); + actionCollection()->action("insert_marker_line")->setText(i18n("&Marker Line")); actionCollection()->action("open_channel_list")->setText(openChannelListString); actionCollection()->action("open_logfile")->setText(openLogFileString); } @@ -520,13 +564,17 @@ if (!m_serverListDialog) { m_serverListDialog = new Konversation::ServerListDialog(this); - KonversationApplication *konvApp = static_cast(KApplication::kApplication()); - connect(m_serverListDialog, SIGNAL(serverGroupsChanged()), konvApp, SLOT(saveOptions())); - connect(m_serverListDialog, SIGNAL(serverGroupsChanged()), this, SIGNAL(prefsChanged())); - connect(m_serverListDialog, SIGNAL(serverGroupsChanged()), m_viewContainer, SLOT(updateViews())); - connect(m_serverListDialog, SIGNAL(connectToServer(int)), konvApp, SLOT(connectToServer(int))); - connect(m_serverListDialog, SIGNAL(connectToServer(int, Konversation::ServerSettings)), konvApp, SLOT(connectToServer(int, Konversation::ServerSettings))); - connect(konvApp, SIGNAL(closeServerList()), m_serverListDialog, SLOT(slotClose())); + KonversationApplication* konvApp = static_cast(kapp); + + connect(m_serverListDialog, SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)), + konvApp, SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*))); + connect(konvApp, SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)), + m_serverListDialog, SLOT(updateServerList())); + connect(m_serverListDialog, SIGNAL(connectTo(Konversation::ConnectionFlag, int)), + konvApp->getConnectionManager(), SLOT(connectTo(Konversation::ConnectionFlag, int))); + connect(m_serverListDialog, SIGNAL(connectTo(Konversation::ConnectionFlag, ConnectionSettings&)), + konvApp->getConnectionManager(), SLOT(connectTo(Konversation::ConnectionFlag, ConnectionSettings&))); + connect(konvApp->getConnectionManager(), SIGNAL(closeServerList()), m_serverListDialog, SLOT(slotClose())); } m_serverListDialog->show(); @@ -540,16 +588,20 @@ // open the preferences dialog and show the watched nicknames page void KonversationMainWindow::openNotify() { - openPrefsDialog(); - if (m_settingsDialog) m_settingsDialog->openWatchedNicknamesPage(); + openPrefsDialog(); + if (m_settingsDialog) m_settingsDialog->openWatchedNicknamesPage(); } void KonversationMainWindow::openIdentitiesDialog() { Konversation::IdentityDialog dlg(this); - if((dlg.exec() == KDialog::Accepted) && m_serverListDialog) - m_serverListDialog->updateServerList(); + if (dlg.exec() == KDialog::Accepted) + { + if (m_serverListDialog) + m_serverListDialog->updateServerList(); + m_viewContainer->updateViewEncoding(m_viewContainer->getFrontView()); + } } IdentityPtr KonversationMainWindow::editIdentity(IdentityPtr identity) @@ -575,14 +627,13 @@ #endif } -void KonversationMainWindow::notifyAction(const QString& serverName,const QString& nick) +void KonversationMainWindow::notifyAction(const QString& serverName, const QString& nick) { - KonversationApplication* konv_app=static_cast(KApplication::kApplication()); - Server* server=konv_app->getServerByName(serverName); - server->notifyAction(nick); + KonversationApplication* konvApp = static_cast(kapp); + Server* server = konvApp->getConnectionManager()->getServerByName(serverName); + if (server) server->notifyAction(nick); } - // TODO: Let an own class handle notify things void KonversationMainWindow::setOnlineList(Server* notifyServer,const QStringList& /*list*/, bool /*changed*/) { @@ -590,37 +641,6 @@ // FIXME if (changed && nicksOnlinePanel) newText(nicksOnlinePanel, QString::null, true); } -void KonversationMainWindow::openURL(const QString& url, const QString& /*title*/) -{ - QString urlN = url; - urlN.remove("irc://"); - - QString host = urlN.section('/',0,0); - KonviIpHelper hostParser(host); - host = hostParser.host(); - - QString port = (hostParser.port().isEmpty() ? QString("6667") : hostParser.port()); - - QString channel = urlN.section('/',1,1); - QString password; - - if (Preferences::isServerGroup(host)) - { - Server* newServer = KonversationApplication::instance()->connectToServerGroup(host); - - if (!newServer->isConnected()) - { - newServer->setAutoJoin(true); - newServer->setAutoJoinChannel(channel); - newServer->setAutoJoinChannelKey(password); - } - else if (!channel.isEmpty()) - newServer->queue("JOIN " + channel + ' ' + password); - } - else - KonversationApplication::instance()->quickConnectToServer(host,port,channel,"",password); -} - QString KonversationMainWindow::currentURL(bool passNetwork) { return m_viewContainer->currentViewURL(passNetwork); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konversationmainwindow.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konversationmainwindow.h --- konversation-1.0.1/konversation/src/konversationmainwindow.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konversationmainwindow.h 2008-08-06 16:56:27.000000000 +0100 @@ -10,23 +10,24 @@ Copyright (C) 2005 Ismail Donmez Copyright (C) 2005 Peter Simonsson Copyright (C) 2005 John Tapsell - Copyright (C) 2005 Eike Hein + Copyright (C) 2005-2008 Eike Hein */ #ifndef _KONVERSATIONMAINWINDOW_H_ #define _KONVERSATIONMAINWINDOW_H_ -#include - -#include -#include - #include "channel.h" #include "preferences.h" #include "ssllabel.h" #include "nickinfo.h" #include "server.h" +#include + +#include +#include + + class KToggleAction; class KScriptManager; @@ -66,15 +67,15 @@ QString currentTitle(); signals: - void prefsChanged(); void startNotifyTimer(int msec); void showQuickConnectDialog(); void nicksNowOnline(Server*); void endNotification(); - void quitServer(); - void serverStateChanged(Server* server, Server::State state); - void insertRememberLine(); - void insertRememberLine(Server* server); + void serverStateChanged(Server* server, Konversation::ConnectionState state); + void triggerRememberLine(); + void triggerRememberLines(Server*); + void cancelRememberLine(); + void insertMarkerLine(); public slots: void updateTrayIcon(); @@ -118,11 +119,10 @@ void notifyAction(const QString& serverName,const QString& nick); void quitProgram(); + void showEvent(QShowEvent* e); void hideEvent(QHideEvent* e); - void focusOutEvent(QFocusEvent* e); void leaveEvent(QEvent* e); - - void openURL(const QString& url, const QString& title); + protected: int confirmQuit(); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konversationsound.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konversationsound.cpp --- konversation-1.0.1/konversation/src/konversationsound.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konversationsound.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,14 +12,15 @@ */ #include "konversationsound.h" -#include "config.h" +#include #include #ifdef USE_KNOTIFY #include #endif + namespace Konversation { Sound::Sound(QObject* parent, const char* name) @@ -32,7 +33,7 @@ void Sound::play(const KURL& url) { #ifdef USE_KNOTIFY - KNotifyClient::userEvent(0,QString::null,1,1,url.path()); + KNotifyClient::userEvent(0,QString(),1,1,url.path()); #endif } } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konversationsound.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konversationsound.h --- konversation-1.0.1/konversation/src/konversationsound.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konversationsound.h 2008-08-06 16:56:27.000000000 +0100 @@ -16,6 +16,7 @@ #include + class KURL; namespace Konversation @@ -27,8 +28,9 @@ class Sound : public QObject { Q_OBJECT - public: - Sound(QObject *parent = 0, const char *name = 0); + + public: + explicit Sound(QObject *parent = 0, const char *name = 0); ~Sound(); public slots: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konversationstatusbar.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konversationstatusbar.cpp --- konversation-1.0.1/konversation/src/konversationstatusbar.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konversationstatusbar.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,10 +6,14 @@ */ /* - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2006 Eike Hein */ +#include "konversationstatusbar.h" +#include "konversationmainwindow.h" +#include "viewcontainer.h" +#include "ssllabel.h" + #include #include #include @@ -19,10 +23,6 @@ #include #include -#include "konversationstatusbar.h" -#include "konversationmainwindow.h" -#include "viewcontainer.h" -#include "ssllabel.h" KonversationStatusBar::KonversationStatusBar(KonversationMainWindow* window) { @@ -126,7 +126,7 @@ void KonversationStatusBar::clearInfoLabel() { - m_infoLabel->setText(QString::null); + m_infoLabel->setText(QString()); } void KonversationStatusBar::setLagLabelShown(bool shown) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konversationstatusbar.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konversationstatusbar.h --- konversation-1.0.1/konversation/src/konversationstatusbar.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konversationstatusbar.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,8 +6,7 @@ */ /* - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2006 Eike Hein */ #ifndef KONVERSATIONSTATUSBAR_H @@ -15,6 +14,7 @@ #include + class QLabel; class KonversationMainWindow; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konversationui.rc /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konversationui.rc --- konversation-1.0.1/konversation/src/konversationui.rc 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konversationui.rc 2008-08-06 16:56:27.000000000 +0100 @@ -1,5 +1,5 @@ - + @@ -11,36 +11,42 @@ - + + + - - &Insert - + &Bookmarks + + &Window + + + + @@ -65,13 +71,11 @@ - + - - diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konversation.upd /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konversation.upd --- konversation-1.0.1/konversation/src/konversation.upd 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konversation.upd 2008-08-06 16:56:27.000000000 +0100 @@ -1,3 +1,15 @@ +Id=1.1-rememberline +File=konversationrc +Group=General Options +Key=ShowRememberLineInAllWindows,MarkerLineInAllViews +RemoveKey=ShowRememberLineInAllWindows + +Id=1.1-markerlines +File=konversationrc +Group=Appearance,General Options +Key=AutoInsertRememberLineAfterMinimizing,AutomaticRememberLine +RemoveKey=AutoInsertRememberLineAfterMinimizing + Id=0.20-customfonts File=konversationrc Group=Appearance diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konvibookmarkhandler.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konvibookmarkhandler.cpp --- konversation-1.0.1/konversation/src/konvibookmarkhandler.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konvibookmarkhandler.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -16,15 +16,16 @@ */ #include "konvibookmarkhandler.h" +#include "konversationapplication.h" +#include "konversationmainwindow.h" +#include "connectionmanager.h" +#include "konvibookmarkmenu.h" #include #include #include -#include "konversationapplication.h" -#include "konversationmainwindow.h" -#include "konvibookmarkmenu.h" KonviBookmarkHandler::KonviBookmarkHandler(KonversationMainWindow* mainWindow) : QObject( mainWindow, "KonviBookmarkHandler" ), @@ -76,9 +77,10 @@ m_bookmarkMenu->slotBookmarksChanged(""); } -void KonviBookmarkHandler::openBookmarkURL(const QString& url, const QString& title) +void KonviBookmarkHandler::openBookmarkURL(const QString& url, const QString& /* title */) { - emit openURL(url,title); + KonversationApplication* konvApp = static_cast(kapp); + konvApp->getConnectionManager()->connectTo(Konversation::SilentlyReuseConnection, url); } QString KonviBookmarkHandler::currentURL() const diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konvibookmarkhandler.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konvibookmarkhandler.h --- konversation-1.0.1/konversation/src/konvibookmarkhandler.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konvibookmarkhandler.h 2008-08-06 16:56:27.000000000 +0100 @@ -20,6 +20,7 @@ #include + class QString; class KPopupMenu; class KonversationMainWindow; @@ -44,8 +45,6 @@ void slotBookmarksChanged(const QString &, const QString & caller); void slotEditBookmarks(); - signals: - void openURL(const QString& url, const QString& title); private: KonversationMainWindow* m_mainWindow; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konvibookmarkmenu.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konvibookmarkmenu.cpp --- konversation-1.0.1/konversation/src/konvibookmarkmenu.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konvibookmarkmenu.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -16,13 +16,13 @@ */ #include "konvibookmarkmenu.h" +#include "konvibookmarkhandler.h" #include #include #include -#include "konvibookmarkhandler.h" KonviBookmarkMenu::KonviBookmarkMenu( KBookmarkManager* mgr, KonviBookmarkHandler * _owner, KPopupMenu * _parentMenu, diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konvibookmarkmenu.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konvibookmarkmenu.h --- konversation-1.0.1/konversation/src/konvibookmarkmenu.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konvibookmarkmenu.h 2008-08-06 16:56:27.000000000 +0100 @@ -19,8 +19,10 @@ */ #include + #include + class QString; class KBookmark; class KAction; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konviconfigdialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konviconfigdialog.cpp --- konversation-1.0.1/konversation/src/konviconfigdialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konviconfigdialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -32,8 +32,8 @@ * See the KConfigDialog reference for detailed documentation. * * begin: Nov 22 2005 - * copyright: (C) 2005 by Eike Hein, KConfigDialog developers - * email: sho@eikehein.com + * copyright: (C) 2005-2006 by Eike Hein, KConfigDialog developers + * email: hein@kde.org */ #include "konviconfigdialog.h" @@ -48,6 +48,7 @@ #include #include + QAsciiDict KonviConfigDialog::openDialogs; // This class is here purly so we don't break binary compatibility down the road. diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konviconfigdialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konviconfigdialog.h --- konversation-1.0.1/konversation/src/konviconfigdialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konviconfigdialog.h 2008-08-06 16:56:27.000000000 +0100 @@ -32,20 +32,23 @@ * See the KConfigDialog reference for detailed documentation. * * begin: Nov 22 2005 - * copyright: (C) 2005 by Eike Hein, KConfigDialog developers - * email: sho@eikehein.com + * copyright: (C) 2005-2006 by Eike Hein, KConfigDialog developers + * email: hein@kde.org */ #ifndef KONVICONFIGDIALOG_H #define KONVICONFIGDIALOG_H +#include + +#include + + class KConfig; class KConfigSkeleton; class KConfigDialogManager; -#include -#include -class KDEUI_EXPORT KonviConfigDialog : public KDialogBase +class KonviConfigDialog : public KDialogBase { Q_OBJECT @@ -70,13 +73,13 @@ void addPage( QWidget *page, const QStringList &items, const QString &pixmapName, - const QString &header=QString::null, + const QString &header=QString(), bool manage=true ); void addPage( QWidget *page, KConfigSkeleton *config, const QStringList &items, const QString &pixmapName, - const QString &header=QString::null ); + const QString &header=QString() ); static KonviConfigDialog* exists( const char* name ); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konviface.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konviface.h --- konversation-1.0.1/konversation/src/konviface.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konviface.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,19 +6,20 @@ */ /* - copyright: (C) 2005 by Dario Abatianni - email: eisfuchs@tigress.com + Copyright (C) 2002 Dario Abatianni + Copyright (C) 2007-2007 Eike Hein */ #ifndef KONV_IFACE_H #define KONV_IFACE_H +#include "ignore.h" + #include #include #include -#include "ignore.h" class KonvIface : virtual public DCOPObject { @@ -35,13 +36,16 @@ virtual void info(const QString& string) = 0; virtual void debug(const QString& string) = 0; virtual void error(const QString& string) = 0; - virtual void insertRememberLine() = 0; - virtual void connectToServer(const QString& url, int port, const QString& channel, const QString& password) = 0; + virtual void insertMarkerLine() = 0; + virtual void connectToServer(const QString& address, int port, const QString& channel, const QString& password) = 0; virtual QString getNickname (const QString &serverid) = 0; virtual QString getAnyNickname () = 0; virtual QStringList listServers() = 0; virtual QStringList listConnectedServers() = 0; virtual QString getChannelEncoding(const QString& server, const QString& channel) = 0; + + virtual void setScreenSaverStarted() = 0; + virtual void setScreenSaverStopped() = 0; }; class KonvIdentityIface : virtual public DCOPObject @@ -65,6 +69,8 @@ virtual void setNicknameList(const QString &identity, const QStringList& newList) = 0; virtual QStringList getNicknameList(const QString &identity) = 0; + virtual void setQuitReason(const QString &identity, const QString& reason) = 0; + virtual QString getQuitReason(const QString &identity) = 0; virtual void setPartReason(const QString &identity, const QString& reason) = 0; virtual QString getPartReason(const QString &identity) = 0; virtual void setKickReason(const QString &identity, const QString& reason) = 0; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konviiphelper.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konviiphelper.cpp --- konversation-1.0.1/konversation/src/konviiphelper.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konviiphelper.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,91 +0,0 @@ -/* - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. -*/ - -/* - Helper class to parse and disassemble IP+port combinations. - WARNING: Does not attempt to validate IP addresses. - begin: Fri Jan 6 2006 - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com -*/ - -#include -#include -#include - -#include "konviiphelper.h" - - -/* - @author Eike Hein -*/ - - -KonviIpHelper::KonviIpHelper(const QString target) -{ - parseTarget(target); -} - -KonviIpHelper::~KonviIpHelper() -{ -} - -void KonviIpHelper::parseTarget(const QString& target) -{ - - // Full-length IPv6 address with port - // Example: RFC 2732 notation: [2001:0DB8:0000:0000:0000:0000:1428:57ab]:6666 - // Example: Non-RFC 2732 notation: 2001:0DB8:0000:0000:0000:0000:1428:57ab:6666 - if (target.contains(':')==8) - { - m_host = target.section(':',0,-2).remove("[").remove("]"); - m_port = target.section(':',-1); - } - // Full-length IPv6 address without port or not-full-length IPv6 address with port - // Example: Without port, RFC 2732 notation: [2001:0DB8:0000:0000:0000:0000:1428:57ab] - // Example: Without port, Non-RFC 2732 notation: 2001:0DB8:0000:0000:0000:0000:1428:57ab - // Example: With port, RFC 2732 notation: [2001:0DB8::1428:57ab]:6666 - else if (target.contains(':')>=4) - { - // Last segment does not end with ], but the next to last does; - // Assume not-full-length IPv6 address with port - // Example: [2001:0DB8::1428:57ab]:6666 - if (target.section(':',0,-2).endsWith("]") && !target.section(':',-1).endsWith("]")) - { - m_host = target.section(':',0,-2).remove("[").remove("]"); - m_port = target.section(':',-1); - } - else - { - QString targetCopy = target; - m_host = targetCopy.remove("[").remove("]"); - } - } - // IPv4 address or ordinary hostname with port - // Example: IPv4 address with port: 123.123.123.123:6666 - // Example: Hostname with port: irc.bla.org:6666 - else if (target.contains(':')==1) - { - m_host = target.section(':',0,-2); - m_port = target.section(':',-1); - } - else - { - m_host = target; - } -} - -QString KonviIpHelper::host() -{ - return m_host; -} -QString KonviIpHelper::port() -{ - return m_port; -} - -#include "konviiphelper.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konviiphelper.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konviiphelper.h --- konversation-1.0.1/konversation/src/konviiphelper.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konviiphelper.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -/* - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. -*/ - -/* - Helper class to parse and disassemble IP+port combinations. - WARNING: Does not attempt to validate IP addresses. - begin: Fri Jan 6 2006 - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com -*/ - -#ifndef KONVIIPHELPER_H -#define KONVIIPHELPER_H - -#include -#include - -/* - @author Eike Hein -*/ - -class KonviIpHelper : QObject -{ - Q_OBJECT - - public: - explicit KonviIpHelper(const QString target); - ~KonviIpHelper(); - - QString host(); - QString port(); - - private: - void parseTarget(const QString& target); - - QString m_host; - QString m_port; -}; - -#endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konvirc6.protocol /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konvirc6.protocol --- konversation-1.0.1/konversation/src/konvirc6.protocol 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konvirc6.protocol 2008-08-06 16:56:27.000000000 +0100 @@ -1,5 +1,5 @@ [Protocol] -exec=konversationircprotocolhandler %u +exec=konversation %u protocol=irc6 input=none output=none diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konvirc.protocol /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konvirc.protocol --- konversation-1.0.1/konversation/src/konvirc.protocol 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konvirc.protocol 2008-08-06 16:56:27.000000000 +0100 @@ -1,5 +1,5 @@ [Protocol] -exec=konversationircprotocolhandler %u +exec=konversation %u protocol=irc input=none output=none diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konvisettingsdialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konvisettingsdialog.cpp --- konversation-1.0.1/konversation/src/konvisettingsdialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konvisettingsdialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -1,55 +1,22 @@ /* - * This file is part of the KDE libraries - * Copyright (C) 2003 Benjamin C Meyer (ben+kdelibs at meyerhome dot net) - * Copyright (C) 2003 Waldo Bastian - * Copyright (C) 2004 Michael Brade - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ /* - * KConfigDialog derivative allowing for a multi-level hierarchical TreeList. - * Differences from KConfigDialog: - * - Use QStringList instead of QString for the item name(s) in addPage and - * addPageInternal, thus calling the respective KDialogBase methods which - * allow specifying a path from which the TreeList hierarchy is constructed. - * - Use 16x16 icons in the TreeList. - * See the KConfigDialog reference for detailed documentation. - * - * begin: Nov 22 2005 - * copyright: (C) 2005 by Eike Hein, KConfigDialog developers - * email: sho@eikehein.com - */ - -#include + Copyright (C) 2006 John Tapsell + Copyright (C) 2006 Eike Hein +*/ #include "konvisettingsdialog.h" #include "konviconfigdialog.h" #include "config/preferences.h" - -#include -#include -#include -#include - #include "chatwindowappearance_preferences.h" #include "connectionbehavior_preferences.h" #include "highlight_preferences.h" #include "warnings_preferences.h" -#include "chatwindowappearance_preferences.h" #include "log_preferences.h" #include "quickbuttons_preferences.h" #include "autoreplace_preferences.h" @@ -67,6 +34,15 @@ #include "watchednicknames_preferences.h" #include "tabnotifications_preferences.h" +#include +#include + +#include +#include +#include +#include + + KonviSettingsDialog::KonviSettingsDialog( QWidget *parent) : KonviConfigDialog( parent, "settings", Preferences::self(), KDialogBase::TreeList) { @@ -94,6 +70,9 @@ //Interface/Chat Window m_confChatWindowAppearanceWdg = new ChatWindowAppearance_Config( 0, "ChatWindowAppearance" ); + m_confChatWindowAppearanceWdg->kcfg_TimestampFormat->insertItem("hh:mm"); + m_confChatWindowAppearanceWdg->kcfg_TimestampFormat->insertItem("hh:mm:ss"); + m_confChatWindowAppearanceWdg->kcfg_TimestampFormat->insertItem("h:m ap"); pagePath.clear(); pagePath << i18n("Interface") << i18n("Chat Window"); addPage ( m_confChatWindowAppearanceWdg, pagePath, "view_text", i18n("Chat Window") ); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konvisettingsdialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konvisettingsdialog.h --- konversation-1.0.1/konversation/src/konvisettingsdialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konvisettingsdialog.h 2008-08-06 16:56:27.000000000 +0100 @@ -1,43 +1,25 @@ /* - * This file is part of the KDE libraries - * Copyright (C) 2003 Benjamin C Meyer (ben+kdelibs at meyerhome dot net) - * Copyright (C) 2003 Waldo Bastian - * Copyright (C) 2004 Michael Brade - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ /* - * This makes a konversation settings dialog. Just create a single instance and call 'show' when you want - * to show it. - * - * begin: Dec 8 2005 - * copyright: (C) 2005 by John Tapsell, Konversation Developers - * email: sho@eikehein.com - */ + Copyright (C) 2006 John Tapsell + Copyright (C) 2006 Eike Hein +*/ #ifndef KONVISETTINGSDIALOG_H #define KONVISETTINGSDIALOG_H +#include "konviconfigdialog.h" +#include "konvisettingspage.h" + #include #include #include -#include "konviconfigdialog.h" -#include "konvisettingspage.h" class Warnings_Config; class ChatWindowAppearance_Config; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/konvisettingspage.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/konvisettingspage.h --- konversation-1.0.1/konversation/src/konvisettingspage.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/konvisettingspage.h 2008-08-06 16:56:27.000000000 +0100 @@ -1,32 +1,13 @@ /* - * This file is part of the KDE libraries - * Copyright (C) 2003 Benjamin C Meyer (ben+kdelibs at meyerhome dot net) - * Copyright (C) 2003 Waldo Bastian - * Copyright (C) 2004 Michael Brade - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +*/ /* - * This is an abstract class that every settings page should inherit from. - * - * begin: Jan 13 2006 - * copyright: (C) 2005 by John Tapsell, Konversation Developers - * email: sho@eikehein.com - */ + Copyright (C) 2006 John Tapsell +*/ #ifndef KONVISETTINGSPAGE_H #define KONVISETTINGSPAGE_H diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/linkaddressbook/addressbook_base.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/linkaddressbook/addressbook_base.cpp --- konversation-1.0.1/konversation/src/linkaddressbook/addressbook_base.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/linkaddressbook/addressbook_base.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -13,17 +13,19 @@ */ #include "addressbook.h" -#include -#include #include "../server.h" #include "../konversationapplication.h" -#include -#include -#include #include "../konversationmainwindow.h" +#include "../channel.h" + +#include + +#include #include #include -#include "../channel.h" +#include +#include +#include namespace Konversation { @@ -42,7 +44,6 @@ KABC::Addressee AddressbookBase::getKABCAddresseeFromNick(const QString &ircnick, const QString &servername, const QString &servergroup) { - KABC::Addressee addr; KABC::AddressBook::Iterator it; for( it = addressBook->begin(); it != addressBook->end(); ++it ) @@ -54,7 +55,6 @@ } KABC::Addressee AddressbookBase::getKABCAddresseeFromNick(const QString &nick_server) { - KABC::Addressee addr; KABC::AddressBook::Iterator it; for( it = addressBook->begin(); it != addressBook->end(); ++it ) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/linkaddressbook/addressbook_base.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/linkaddressbook/addressbook_base.h --- konversation-1.0.1/konversation/src/linkaddressbook/addressbook_base.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/linkaddressbook/addressbook_base.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,17 +15,19 @@ #ifndef ADDRESSBOOKBASE_H #define ADDRESSBOOKBASE_H -#include -#include +#include "../images.h" +#include "../nickinfo.h" +#include "../channelnick.h" #include #include #include -#include "config.h" +#include + + +#include +#include -#include "../images.h" -#include "../nickinfo.h" -#include "../channelnick.h" namespace Konversation { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/linkaddressbook/addressbook.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/linkaddressbook/addressbook.cpp --- konversation-1.0.1/konversation/src/linkaddressbook/addressbook.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/linkaddressbook/addressbook.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -13,19 +13,22 @@ */ #include "addressbook.h" -#include #include "../viewcontainer.h" #include "../konversationmainwindow.h" -#include "qwidget.h" -#include -#include #include "../server.h" #include "../channel.h" #include "../konversationapplication.h" + +#include +#include "qwidget.h" + +#include +#include #include #include #include + namespace Konversation { @@ -38,6 +41,8 @@ } Addressbook::~Addressbook() { + if (m_instance == this) + sd.setObject(m_instance, 0, false); } Addressbook *Addressbook::self() @@ -238,7 +243,7 @@ focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation for instant messaging, but did not specify any contact to send the message to. This is probably a bug in the other application.")); return; } - messageContact(contactId, QString::null); + messageContact(contactId, QString()); } /** @@ -253,7 +258,7 @@ focusAndShowErrorMessage(i18n("Another KDE application tried to use Konversation for instant messaging, but did not specify any contact to send the message to. This is probably a bug in the other application.")); return; } - messageContact(uid, QString::null); + messageContact(uid, QString()); } /** diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/linkaddressbook/addressbook.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/linkaddressbook/addressbook.h --- konversation-1.0.1/konversation/src/linkaddressbook/addressbook.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/linkaddressbook/addressbook.h 2008-08-06 16:56:27.000000000 +0100 @@ -21,7 +21,7 @@ #include #include #include -#include "config.h" +#include #include "kimiface.h" #include "../images.h" @@ -74,7 +74,7 @@ * Send the file to the contact */ void sendFile(const QString &uid, const KURL &sourceURL, - const QString &altFileName = QString::null, uint fileSize = 0); + const QString &altFileName = QString(), uint fileSize = 0); /** * Lets outsiders tell us to emit presenceChanged signal. diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/linkaddressbook/addresseeitem.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/linkaddressbook/addresseeitem.cpp --- konversation-1.0.1/konversation/src/linkaddressbook/addresseeitem.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/linkaddressbook/addresseeitem.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -16,6 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "addresseeitem.h" + #include #include #include @@ -24,7 +26,6 @@ #include #include -#include "addresseeitem.h" AddresseeItem::AddresseeItem( QListView *parent, const KABC::Addressee &addressee) : KListViewItem( parent ), diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/linkaddressbook/kimiface.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/linkaddressbook/kimiface.h --- konversation-1.0.1/konversation/src/linkaddressbook/kimiface.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/linkaddressbook/kimiface.h 2008-08-06 16:56:27.000000000 +0100 @@ -29,7 +29,6 @@ /** * Generic DCOP interface for KDE instant messenger applications * Note one omission of this interface is the lack of control over the range of values used for protocols' names. - * @since 3.3 * @author Will Stephenson */ class KIMIface : virtual public DCOPObject @@ -159,7 +158,7 @@ * @param fileSize file size in bytes */ virtual void sendFile(const QString &uid, const KURL &sourceURL, - const QString &altFileName = QString::null, uint fileSize = 0) = 0; + const QString &altFileName = QString(), uint fileSize = 0) = 0; // MUTATORS // Contact list diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/linkaddressbook/linkaddressbookui.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/linkaddressbook/linkaddressbookui.cpp --- konversation-1.0.1/konversation/src/linkaddressbook/linkaddressbookui.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/linkaddressbook/linkaddressbookui.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -20,31 +20,32 @@ * * ************************************************************************* */ + +#include "linkaddressbookui.h" +#include "addressbook.h" +#include "linkaddressbookui_base.h" +#include "addresseeitem.h" + #include +#include +#include +#include +#include + #include #include #include #include - #include #include - #include #include #include #include #include -#include -#include -#include -#include #include #include -#include "linkaddressbookui.h" -#include "addressbook.h" -#include "linkaddressbookui_base.h" -#include "addresseeitem.h" LinkAddressbookUI::LinkAddressbookUI( QWidget *parent, const char *name, const QString &ircnick, const QString &servername, const QString &servergroup, const QString &suggested_realname ) : KDialogBase(Plain, i18n("Link IRC Nick to Addressbook Contact"), Ok|Cancel|Help, Ok, parent, name) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/linkaddressbook/Makefile.am /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/linkaddressbook/Makefile.am --- konversation-1.0.1/konversation/src/linkaddressbook/Makefile.am 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/linkaddressbook/Makefile.am 2008-08-06 16:56:27.000000000 +0100 @@ -1,6 +1,6 @@ METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/konversation/src -I$(top_builddir)/konversation/src -I$(top_srcdir)/konversation/src/config -I$(top_builddir)/konversation/src/config +INCLUDES = -I$(srcdir)/.. -I.. -I$(srcdir)/../config -I../config AM_CPPFLAGS = $(all_includes) -I$(top_builddir)/konversation/src noinst_LTLIBRARIES = liblinkaddressbookui.la @@ -9,6 +9,5 @@ liblinkaddressbookui_la_SOURCES = linkaddressbookui_base.ui linkaddressbookui.cpp addressbook_base.cpp addressbook.cpp nicklisttooltip.cpp nicksonlinetooltip.cpp kimiface.skel addresseeitem.cpp kimiface_DIR = $(kde_includes) liblinkaddressbookui_la_LDFLAGS = $(all_libraries) -no-undefined -liblinkaddressbookui_la_LIBADD = $(COMPAT_LIBS) $(LIB_KDEUI) $(LIB_KABC) # vim: set noet: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/linkaddressbook/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/linkaddressbook/Makefile.in --- konversation-1.0.1/konversation/src/linkaddressbook/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/linkaddressbook/Makefile.in 2008-08-06 16:57:57.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,15 +16,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -51,9 +47,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -am__DEPENDENCIES_1 = -liblinkaddressbookui_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +liblinkaddressbookui_la_LIBADD = am_liblinkaddressbookui_la_OBJECTS = linkaddressbookui.lo \ addressbook_base.lo addressbook.lo nicklisttooltip.lo \ nicksonlinetooltip.lo addresseeitem.lo @@ -66,7 +60,16 @@ nicksonlinetooltip.lo addresseeitem.lo kimiface_skel.lo linkaddressbookui_base.lo @KDE_USE_FINAL_FALSE@liblinkaddressbookui_la_OBJECTS = $(liblinkaddressbookui_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@liblinkaddressbookui_la_OBJECTS = $(liblinkaddressbookui_la_final_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +#>- liblinkaddressbookui_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +#>- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +#>- $(CXXFLAGS) $(liblinkaddressbookui_la_LDFLAGS) $(LDFLAGS) -o \ +#>- $@ +#>+ 4 +liblinkaddressbookui_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(KDE_CXXFLAGS) $(liblinkaddressbookui_la_LDFLAGS) $(LDFLAGS) -o \ + $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -74,19 +77,21 @@ #>+ 2 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -#>- $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) +#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +#>+ 3 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -#>+ 2 -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ +#>- $(LDFLAGS) -o $@ +#>+ 3 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(liblinkaddressbookui_la_SOURCES) DIST_SOURCES = $(liblinkaddressbookui_la_SOURCES) HEADERS = $(noinst_HEADERS) @@ -96,8 +101,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -137,7 +140,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -212,12 +217,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -231,6 +238,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -250,24 +258,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -279,19 +285,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -318,37 +323,37 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ #>- METASOURCES = AUTO -INCLUDES = -I$(top_srcdir)/konversation/src -I$(top_builddir)/konversation/src -I$(top_srcdir)/konversation/src/config -I$(top_builddir)/konversation/src/config +INCLUDES = -I$(srcdir)/.. -I.. -I$(srcdir)/../config -I../config AM_CPPFLAGS = $(all_includes) -I$(top_builddir)/konversation/src noinst_LTLIBRARIES = liblinkaddressbookui.la noinst_HEADERS = linkaddressbookui.h kimiface.h @@ -356,10 +361,7 @@ #>+ 1 liblinkaddressbookui_la_SOURCES= linkaddressbookui.cpp addressbook_base.cpp addressbook.cpp nicklisttooltip.cpp nicksonlinetooltip.cpp addresseeitem.cpp kimiface_skel.cpp linkaddressbookui_base.cpp kimiface_DIR = $(kde_includes) -#>- liblinkaddressbookui_la_LDFLAGS = $(all_libraries) -no-undefined -#>+ 1 -liblinkaddressbookui_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -liblinkaddressbookui_la_LIBADD = $(COMPAT_LIBS) $(LIB_KDEUI) $(LIB_KABC) +liblinkaddressbookui_la_LDFLAGS = $(all_libraries) -no-undefined #>- all: all-am #>+ 1 all: docs-am all-am @@ -417,11 +419,8 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -#>- liblinkaddressbookui.la: $(liblinkaddressbookui_la_OBJECTS) $(liblinkaddressbookui_la_DEPENDENCIES) -#>+ 2 -@KDE_USE_CLOSURE_TRUE@liblinkaddressbookui.la: liblinkaddressbookui.la.closure $(liblinkaddressbookui_la_OBJECTS) $(liblinkaddressbookui_la_DEPENDENCIES) -@KDE_USE_CLOSURE_FALSE@liblinkaddressbookui.la: $(liblinkaddressbookui_la_OBJECTS) $(liblinkaddressbookui_la_DEPENDENCIES) - $(CXXLINK) $(liblinkaddressbookui_la_LDFLAGS) $(liblinkaddressbookui_la_OBJECTS) $(liblinkaddressbookui_la_LIBADD) $(LIBS) +liblinkaddressbookui.la: $(liblinkaddressbookui_la_OBJECTS) $(liblinkaddressbookui_la_DEPENDENCIES) + $(liblinkaddressbookui_la_LINK) $(liblinkaddressbookui_la_OBJECTS) $(liblinkaddressbookui_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -437,22 +436,22 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nicksonlinetooltip.Plo@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< @@ -463,17 +462,13 @@ clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -485,8 +480,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -496,13 +491,12 @@ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -516,22 +510,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -577,14 +570,14 @@ #>- clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ #>- mostlyclean-am #>+ 2 -clean-am: clean-metasources clean-idl clean-ui clean-closures clean-bcheck clean-final clean-generic clean-libtool clean-noinstLTLIBRARIES \ +clean-am: clean-metasources clean-idl clean-ui clean-bcheck clean-final clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-am @@ -598,12 +591,20 @@ install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -624,19 +625,22 @@ ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-info-am + pdf pdf-am ps ps-am tags uninstall uninstall-am # vim: set noet: @@ -650,15 +654,6 @@ kimiface_skel.cpp: kimiface.kidl $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kimiface.kidl -#>+ 8 -liblinkaddressbookui.la.closure: $(liblinkaddressbookui_la_OBJECTS) $(liblinkaddressbookui_la_DEPENDENCIES) - @echo "int main() {return 0;}" > liblinkaddressbookui_la_closure.cpp - @$(LTCXXCOMPILE) -c liblinkaddressbookui_la_closure.cpp - $(CXXLINK) liblinkaddressbookui_la_closure.lo $(liblinkaddressbookui_la_LDFLAGS) $(liblinkaddressbookui_la_OBJECTS) $(liblinkaddressbookui_la_LIBADD) $(LIBS) - @rm -f liblinkaddressbookui_la_closure.* liblinkaddressbookui.la.closure - @echo "timestamp" > liblinkaddressbookui.la.closure - - #>+ 3 linkaddressbookui.moc: $(srcdir)/linkaddressbookui.h $(MOC) $(srcdir)/linkaddressbookui.h -o linkaddressbookui.moc @@ -697,10 +692,6 @@ -rm -f \ linkaddressbookui_base.cpp linkaddressbookui_base.h linkaddressbookui_base.moc -#>+ 3 -clean-closures: - -rm -f liblinkaddressbookui.la.closure - #>+ 2 docs-am: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/linkaddressbook/nicklisttooltip.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/linkaddressbook/nicklisttooltip.cpp --- konversation-1.0.1/konversation/src/linkaddressbook/nicklisttooltip.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/linkaddressbook/nicklisttooltip.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,16 +12,17 @@ email: john@geola.co.uk */ -#include -#include -#include #include "nicklisttooltip.h" #include "../nick.h" #include "../nicklistview.h" -#include "../nicklistviewitem.h" #include "../nickinfo.h" #include "../common.h" +#include +#include +#include + + class NickListView; namespace Konversation @@ -41,19 +42,18 @@ return; QListViewItem *item = m_listView->itemAt( pos ); + if( !item ) return; - NickListViewItem *ledItem = dynamic_cast( item ); - Nick *nick = NULL; - if(ledItem) - nick = ledItem->getNick(); - QString toolTip; - QRect itemRect = m_listView->itemRect( item ); + Nick *nick = dynamic_cast( item ); if(! nick ) return; + QString toolTip; + QRect itemRect = m_listView->itemRect( item ); + uint leftMargin = m_listView->treeStepSize() * ( item->depth() + ( m_listView->rootIsDecorated() ? 1 : 0 ) ) + m_listView->itemMargin(); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/linkaddressbook/nicklisttooltip.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/linkaddressbook/nicklisttooltip.h --- konversation-1.0.1/konversation/src/linkaddressbook/nicklisttooltip.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/linkaddressbook/nicklisttooltip.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,13 +15,16 @@ #ifndef KONVERSATIONNICKLISTTOOLTIP_H #define KONVERSATIONNICKLISTTOOLTIP_H -#include -#include #include "addressbook.h" + +#include #include #include #include +#include + + class NickListView; namespace Konversation diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/linkaddressbook/nicksonlinetooltip.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/linkaddressbook/nicksonlinetooltip.cpp --- konversation-1.0.1/konversation/src/linkaddressbook/nicksonlinetooltip.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/linkaddressbook/nicksonlinetooltip.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,17 +12,19 @@ email: john@geola.co.uk */ -#include -#include -#include -#include + #include "nicklisttooltip.h" #include "../nick.h" #include "../nicklistview.h" -#include "../nicklistviewitem.h" #include "../nickinfo.h" #include "../nicksonline.h" +#include +#include +#include +#include + + class NickListView; namespace Konversation diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/linkaddressbook/nicksonlinetooltip.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/linkaddressbook/nicksonlinetooltip.h --- konversation-1.0.1/konversation/src/linkaddressbook/nicksonlinetooltip.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/linkaddressbook/nicksonlinetooltip.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,13 +15,16 @@ #ifndef KONVERSATIONNICKSONLINETOOLTIP_H #define KONVERSATIONNICKSONLINETOOLTIP_H -#include -#include #include "addressbook.h" + +#include #include #include #include +#include + + class NicksOnline; namespace Konversation diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/logfilereader.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/logfilereader.cpp --- konversation-1.0.1/konversation/src/logfilereader.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/logfilereader.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,6 +12,11 @@ email: eisfuchs@tigress.com */ +#include "logfilereader.h" +#include "konversationapplication.h" +#include "ircview.h" +#include "ircviewbox.h" + #include #include #include @@ -29,13 +34,8 @@ #include #include #include - #include -#include "logfilereader.h" -#include "konversationapplication.h" -#include "ircview.h" -#include "ircviewbox.h" LogfileReader::LogfileReader(QWidget* parent, const QString& log) : ChatWindow(parent) { @@ -52,6 +52,7 @@ QWhatsThis::add(sizeSpin, i18n("Use this box to set the maximum size of the log file. This setting does not take effect until you restart Konversation. Each log file may have a separate setting.")); sizeSpin->setValue(Preferences::logfileBufferSize()); sizeSpin->setSuffix(i18n(" KB")); + sizeSpin->installEventFilter(this); toolBar->insertButton("reload",0,SIGNAL(clicked()),this,SLOT(updateView()),true,i18n("Reload")); toolBar->insertButton("editdelete",0,SIGNAL(clicked()),this,SLOT(clearLog()),true,i18n("Clear Logfile")); @@ -65,6 +66,8 @@ ircBox->ircView()->setFocusPolicy(QWidget::StrongFocus); setFocusPolicy(QWidget::StrongFocus); setFocusProxy(ircBox->ircView()); + + connect(getTextView(), SIGNAL(gotFocus()), getTextView(), SLOT(setFocus())); } LogfileReader::~LogfileReader() @@ -75,6 +78,25 @@ delete toolBar; } +bool LogfileReader::eventFilter(QObject* /* watched */, QEvent* e) +{ + if (e->type() == QEvent::KeyPress) + { + QKeyEvent* ke = static_cast(e); + + if (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter) + { + updateView(); + + return true; + } + else + return false; + } + + return false; +} + void LogfileReader::updateView() { // get maximum size of logfile to display @@ -127,7 +149,7 @@ "SaveLogfileNote"); QString destination=KFileDialog::getSaveFileName(fileName, - QString::null, + QString(), this, i18n("Choose Destination Folder")); if(!destination.isEmpty()) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/logfilereader.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/logfilereader.h --- konversation-1.0.1/konversation/src/logfilereader.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/logfilereader.h 2008-08-06 16:56:27.000000000 +0100 @@ -19,9 +19,6 @@ #include -/* - @author Dario Abatianni -*/ class KToolBar; class QSpinBox; @@ -37,6 +34,9 @@ virtual bool closeYourself() { closeLog(); return true; } virtual bool searchView(); + virtual bool eventFilter(QObject* watched, QEvent* e); + + protected slots: void updateView(); void clearLog(); @@ -44,6 +44,7 @@ void closeLog(); void copyResult(KIO::Job* job); + protected: int margin(); int spacing(); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/log_preferences.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/log_preferences.ui --- konversation-1.0.1/konversation/src/log_preferences.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/log_preferences.ui 2008-08-06 16:56:27.000000000 +0100 @@ -37,20 +37,20 @@ unnamed - + - kcfg_LogfilePath + kcfg_LowerLog - - - 7 - 5 - 0 - 0 - + + Enable &lower case logfile names - - 26 + + + + kcfg_AddHostnameToLog + + + &Append hostname to logfile names @@ -64,20 +64,20 @@ kcfg_LogfilePath - + - kcfg_LowerLog - - - Enable &lower case logfile names + kcfg_LogfilePath - - - - kcfg_AddHostnameToLog + + + 7 + 5 + 0 + 0 + - - &Append hostname to logfile names + + 26 @@ -101,6 +101,11 @@ + + kcfg_LowerLog + kcfg_AddHostnameToLog + kcfg_LogfilePath + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/main.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/main.cpp --- konversation-1.0.1/konversation/src/main.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/main.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -33,6 +33,7 @@ static const KCmdLineOptions options[] = { + { "+[url]", I18N_NOOP("irc:// URL or server hostname"), 0 }, { "server ", I18N_NOOP("Server to connect"), 0 }, { "port ", I18N_NOOP("Port to use"), "6667"}, { "channel ", I18N_NOOP("Channel to join after connection"), ""}, @@ -49,7 +50,7 @@ KONVI_VERSION, shortDescription, KAboutData::License_GPL, - I18N_NOOP("(C) 2002-2006 by the Konversation team"), + I18N_NOOP("(C) 2002-2008 by the Konversation team"), I18N_NOOP("Konversation is a client for the Internet Relay Chat (IRC) protocol.\n" "Meet friends on the net, make new acquaintances and lose yourself in\n" "talk about your favorite subject."), @@ -88,23 +89,15 @@ aboutData.addCredit("Ivor Hewitt",I18N_NOOP("Bug fixes, OSD work, clearing topics"),"ivor@ivor.org"); aboutData.addCredit("Emil Obermayr",I18N_NOOP("Sysinfo script"),"nobs@tigress.com"); aboutData.addCredit("Stanislav Nikolov",I18N_NOOP("Bug fixes"),"valsinats@gmail.com"); + aboutData.addCredit("Juan Carlos Torres",I18N_NOOP("Auto-join context menu"),"carlosdgtorres@gmail.com"); - KCmdLineArgs::init(argc,argv,&aboutData); + KCmdLineArgs::init(argc, argv, &aboutData); KCmdLineArgs::addCmdLineOptions(options); KApplication::addCmdLineOptions(); - if(!KUniqueApplication::start()) - { - return 0; - } + if (!KUniqueApplication::start()) return 0; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); KonversationApplication app; - if(args->isSet("server")) - app.delayedConnectToServer(args->getOption("server"), args->getOption("port"), - args->getOption("channel"), args->getOption("nick"), - args->getOption("password"), args->isSet("ssl")); - return app.exec(); } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/Makefile.am /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/Makefile.am --- konversation-1.0.1/konversation/src/Makefile.am 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/Makefile.am 2008-08-06 16:56:27.000000000 +0100 @@ -3,42 +3,37 @@ METASOURCES = AUTO bin_PROGRAMS = konversation -bin_SCRIPTS = konversationircprotocolhandler konversation_SOURCES = konviface.skel konviconfigdialog.cpp konversationstatusbar.cpp \ - konvisettingsdialog.cpp konversationmainwindow.cpp valuelistviewitem.cpp urlcatcher.cpp \ - scriptlauncher.cpp rawlog.cpp konvdcop.cpp channellistpanel.cpp \ - konsolepanel.cpp identity.cpp statuspanel.cpp \ - dccrecipientdialog.cpp topiccombobox.cpp nicksonline.cpp dccpanel.cpp dcctransfer.cpp \ - nicklistviewitem.cpp highlight.cpp highlightviewitem.cpp modebutton.cpp \ - ignore_preferencesui.ui ignore_preferences.cpp ignore.cpp nicklistview.cpp ircinput.cpp \ - ignorelistviewitem.cpp images.cpp quickbutton.cpp chatwindow.cpp outputfilter.cpp query.cpp \ - konversationapplication.cpp nick.cpp inputfilter.cpp channel.cpp ircview.cpp server.cpp main.cpp \ - dcc_preferencesui.ui log_preferences.ui tabs_preferencesui.ui tabs_preferences.cpp \ - chatwindowappearance_preferences.ui irccolorchooserui.ui colorsappearance_preferences.ui \ - irccolorchooser.cpp channellistviewitem.cpp osd.cpp trayicon.cpp dccchat.cpp \ - logfilereader.cpp multilineedit.cpp nickinfo.cpp dccresumedialog.cpp \ - konversationsound.cpp quickconnectdialog.cpp serverlistdialog.cpp dcctransfersend.cpp \ - dcctransferrecv.cpp channelnick.cpp dccdetaildialog.cpp insertchardialog.cpp \ - irccharsets.cpp editnotifydialog.cpp common.cpp serverison.cpp sslsocket.cpp \ - servergroupsettings.cpp serversettings.cpp servergroupdialog.cpp ssllabel.cpp serverdialog.cpp \ - channeldialog.cpp identitydialog.cpp topiclabel.cpp channeloptionsui.ui \ - channeloptionsdialog.cpp notificationhandler.cpp joinchannelui.ui joinchanneldialog.cpp \ - emoticon.cpp chatwindowbehaviour_preferences.ui alias_preferencesui.ui \ - osd_preferencesui.ui theme_preferencesui.ui highlight_preferencesui.ui \ - warnings_preferencesui.ui warnings_preferences.cpp quickbuttons_preferencesui.ui \ - watchednicknames_preferencesui.ui generalbehavior_preferences.ui connectionbehavior_preferences.ui \ - fontappearance_preferences.ui nicklistbehavior_preferencesui.ui konvibookmarkhandler.cpp \ - konvibookmarkmenu.cpp ircviewbox.cpp searchbar.cpp osd_preferences.cpp \ - theme_preferences.cpp dcc_preferences.cpp alias_preferences.cpp highlight_preferences.cpp \ - watchednicknames_preferences.cpp quickbuttons_preferences.cpp nicklistbehavior_preferences.cpp \ - konviiphelper.cpp tabnotifications_preferences.ui \ - multilinetextedit.cpp serverlistview.cpp nicksonlineitem.cpp searchbarbase.ui \ - autoreplace_preferencesui.ui autoreplace_preferences.cpp viewcontainer.cpp viewtree.cpp \ - viewtreeitem.cpp servergroupdialogui.ui + konvisettingsdialog.cpp viewcontainer.cpp viewtree.cpp viewtreeitem.cpp konversationmainwindow.cpp \ + valuelistviewitem.cpp urlcatcher.cpp scriptlauncher.cpp rawlog.cpp konvdcop.cpp channellistpanel.cpp \ + konsolepanel.cpp identity.cpp statuspanel.cpp dccrecipientdialog.cpp topiccombobox.cpp nicksonline.cpp \ + dcctransferpanel.cpp dcctransferpanelitem.cpp highlight.cpp highlightviewitem.cpp modebutton.cpp \ + ignore_preferencesui.ui ignore_preferences.cpp ignore.cpp nicklistview.cpp ircinput.cpp \ + channeloptionsui.ui channeloptionsdialog.cpp ignorelistviewitem.cpp images.cpp quickbutton.cpp \ + chatwindow.cpp outputfilter.cpp logfilereader.cpp query.cpp konversationapplication.cpp nick.cpp \ + inputfilter.cpp channel.cpp ircview.cpp server.cpp main.cpp dcc_preferencesui.ui log_preferences.ui \ + tabs_preferencesui.ui tabs_preferences.cpp chatwindowappearance_preferences.ui irccolorchooserui.ui \ + colorsappearance_preferences.ui irccolorchooser.cpp channellistviewitem.cpp osd.cpp trayicon.cpp \ + dccchat.cpp multilineedit.cpp nickinfo.cpp dccresumedialog.cpp konversationsound.cpp quickconnectdialog.cpp \ + serverlistdialog.cpp dcctransfersend.cpp dcctransferrecv.cpp channelnick.cpp insertchardialog.cpp \ + irccharsets.cpp editnotifydialog.cpp common.cpp serverison.cpp sslsocket.cpp servergroupsettings.cpp \ + serversettings.cpp servergroupdialog.cpp ssllabel.cpp serverdialog.cpp channeldialog.cpp identitydialog.cpp \ + topiclabel.cpp notificationhandler.cpp joinchannelui.ui joinchanneldialog.cpp emoticon.cpp \ + chatwindowbehaviour_preferences.ui alias_preferencesui.ui osd_preferencesui.ui theme_preferencesui.ui \ + highlight_preferencesui.ui warnings_preferencesui.ui warnings_preferences.cpp quickbuttons_preferencesui.ui \ + watchednicknames_preferencesui.ui generalbehavior_preferences.ui connectionbehavior_preferences.ui \ + fontappearance_preferences.ui nicklistbehavior_preferencesui.ui konvibookmarkhandler.cpp konvibookmarkmenu.cpp \ + ircviewbox.cpp searchbar.cpp osd_preferences.cpp theme_preferences.cpp dcc_preferences.cpp \ + alias_preferences.cpp highlight_preferences.cpp watchednicknames_preferences.cpp quickbuttons_preferences.cpp \ + nicklistbehavior_preferences.cpp tabnotifications_preferences.ui multilinetextedit.cpp serverlistview.cpp \ + nicksonlineitem.cpp searchbarbase.ui autoreplace_preferencesui.ui autoreplace_preferences.cpp \ + servergroupdialogui.ui dcctransfer.cpp dcctransfermanager.cpp dcctransferdetailedinfopanelui.ui \ + dcctransferdetailedinfopanel.cpp dcccommon.cpp queuetunerbase.ui queuetuner.cpp ircqueue.cpp \ + connectionsettings.cpp connectionmanager.cpp awaymanager.cpp konversation_COMPILE_FIRST = config/preferences_base.h -konversation_LDADD = $(LIB_KIO) $(LIB_KABC) $(LIB_KIMIFACE) linkaddressbook/liblinkaddressbookui.la blowfish/libblowfish.la config/libkonversationconfig.la +konversation_LDADD = $(LIB_KIO) $(LIB_XSS) $(LIB_KABC) $(LIB_KIMIFACE) linkaddressbook/liblinkaddressbookui.la blowfish/libblowfish.la config/libkonversationconfig.la xdg_apps_DATA = konversation.desktop @@ -68,7 +63,7 @@ fi noinst_HEADERS = serverlistdialog.h dcctransfersend.h dcctransferrecv.h \ - dccdetaildialog.h insertchardialog.h editnotifydialog.h serverison.h \ + insertchardialog.h editnotifydialog.h serverison.h \ servergroupsettings.h serversettings.h servergroupdialog.h serverdialog.h channeldialog.h \ identitydialog.h topiclabel.h channeloptionsdialog.h joinchanneldialog.h \ highlight_preferences.h watchednicknames_preferences.h quickbuttons_preferences.h \ diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/Makefile.in --- konversation-1.0.1/konversation/src/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/Makefile.in 2008-08-06 16:57:57.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -18,15 +18,11 @@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -53,121 +49,132 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(kdelnkdir)" \ - "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(updatedir)" \ - "$(DESTDIR)$(xdg_appsdir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(updatedir)" \ + "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(rcdir)" \ + "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_appsdir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_konversation_OBJECTS = konviconfigdialog.$(OBJEXT) \ konversationstatusbar.$(OBJEXT) konvisettingsdialog.$(OBJEXT) \ - konversationmainwindow.$(OBJEXT) valuelistviewitem.$(OBJEXT) \ - urlcatcher.$(OBJEXT) scriptlauncher.$(OBJEXT) rawlog.$(OBJEXT) \ - konvdcop.$(OBJEXT) channellistpanel.$(OBJEXT) \ - konsolepanel.$(OBJEXT) identity.$(OBJEXT) \ - statuspanel.$(OBJEXT) dccrecipientdialog.$(OBJEXT) \ - topiccombobox.$(OBJEXT) nicksonline.$(OBJEXT) \ - dccpanel.$(OBJEXT) dcctransfer.$(OBJEXT) \ - nicklistviewitem.$(OBJEXT) highlight.$(OBJEXT) \ + viewcontainer.$(OBJEXT) viewtree.$(OBJEXT) \ + viewtreeitem.$(OBJEXT) konversationmainwindow.$(OBJEXT) \ + valuelistviewitem.$(OBJEXT) urlcatcher.$(OBJEXT) \ + scriptlauncher.$(OBJEXT) rawlog.$(OBJEXT) konvdcop.$(OBJEXT) \ + channellistpanel.$(OBJEXT) konsolepanel.$(OBJEXT) \ + identity.$(OBJEXT) statuspanel.$(OBJEXT) \ + dccrecipientdialog.$(OBJEXT) topiccombobox.$(OBJEXT) \ + nicksonline.$(OBJEXT) dcctransferpanel.$(OBJEXT) \ + dcctransferpanelitem.$(OBJEXT) highlight.$(OBJEXT) \ highlightviewitem.$(OBJEXT) modebutton.$(OBJEXT) \ ignore_preferences.$(OBJEXT) ignore.$(OBJEXT) \ nicklistview.$(OBJEXT) ircinput.$(OBJEXT) \ - ignorelistviewitem.$(OBJEXT) images.$(OBJEXT) \ - quickbutton.$(OBJEXT) chatwindow.$(OBJEXT) \ - outputfilter.$(OBJEXT) query.$(OBJEXT) \ + channeloptionsdialog.$(OBJEXT) ignorelistviewitem.$(OBJEXT) \ + images.$(OBJEXT) quickbutton.$(OBJEXT) chatwindow.$(OBJEXT) \ + outputfilter.$(OBJEXT) logfilereader.$(OBJEXT) query.$(OBJEXT) \ konversationapplication.$(OBJEXT) nick.$(OBJEXT) \ inputfilter.$(OBJEXT) channel.$(OBJEXT) ircview.$(OBJEXT) \ server.$(OBJEXT) main.$(OBJEXT) tabs_preferences.$(OBJEXT) \ irccolorchooser.$(OBJEXT) channellistviewitem.$(OBJEXT) \ osd.$(OBJEXT) trayicon.$(OBJEXT) dccchat.$(OBJEXT) \ - logfilereader.$(OBJEXT) multilineedit.$(OBJEXT) \ - nickinfo.$(OBJEXT) dccresumedialog.$(OBJEXT) \ - konversationsound.$(OBJEXT) quickconnectdialog.$(OBJEXT) \ - serverlistdialog.$(OBJEXT) dcctransfersend.$(OBJEXT) \ - dcctransferrecv.$(OBJEXT) channelnick.$(OBJEXT) \ - dccdetaildialog.$(OBJEXT) insertchardialog.$(OBJEXT) \ + multilineedit.$(OBJEXT) nickinfo.$(OBJEXT) \ + dccresumedialog.$(OBJEXT) konversationsound.$(OBJEXT) \ + quickconnectdialog.$(OBJEXT) serverlistdialog.$(OBJEXT) \ + dcctransfersend.$(OBJEXT) dcctransferrecv.$(OBJEXT) \ + channelnick.$(OBJEXT) insertchardialog.$(OBJEXT) \ irccharsets.$(OBJEXT) editnotifydialog.$(OBJEXT) \ common.$(OBJEXT) serverison.$(OBJEXT) sslsocket.$(OBJEXT) \ servergroupsettings.$(OBJEXT) serversettings.$(OBJEXT) \ servergroupdialog.$(OBJEXT) ssllabel.$(OBJEXT) \ serverdialog.$(OBJEXT) channeldialog.$(OBJEXT) \ identitydialog.$(OBJEXT) topiclabel.$(OBJEXT) \ - channeloptionsdialog.$(OBJEXT) notificationhandler.$(OBJEXT) \ - joinchanneldialog.$(OBJEXT) emoticon.$(OBJEXT) \ - warnings_preferences.$(OBJEXT) konvibookmarkhandler.$(OBJEXT) \ - konvibookmarkmenu.$(OBJEXT) ircviewbox.$(OBJEXT) \ - searchbar.$(OBJEXT) osd_preferences.$(OBJEXT) \ - theme_preferences.$(OBJEXT) dcc_preferences.$(OBJEXT) \ - alias_preferences.$(OBJEXT) highlight_preferences.$(OBJEXT) \ + notificationhandler.$(OBJEXT) joinchanneldialog.$(OBJEXT) \ + emoticon.$(OBJEXT) warnings_preferences.$(OBJEXT) \ + konvibookmarkhandler.$(OBJEXT) konvibookmarkmenu.$(OBJEXT) \ + ircviewbox.$(OBJEXT) searchbar.$(OBJEXT) \ + osd_preferences.$(OBJEXT) theme_preferences.$(OBJEXT) \ + dcc_preferences.$(OBJEXT) alias_preferences.$(OBJEXT) \ + highlight_preferences.$(OBJEXT) \ watchednicknames_preferences.$(OBJEXT) \ quickbuttons_preferences.$(OBJEXT) \ - nicklistbehavior_preferences.$(OBJEXT) konviiphelper.$(OBJEXT) \ + nicklistbehavior_preferences.$(OBJEXT) \ multilinetextedit.$(OBJEXT) serverlistview.$(OBJEXT) \ nicksonlineitem.$(OBJEXT) autoreplace_preferences.$(OBJEXT) \ - viewcontainer.$(OBJEXT) viewtree.$(OBJEXT) \ - viewtreeitem.$(OBJEXT) + dcctransfer.$(OBJEXT) dcctransfermanager.$(OBJEXT) \ + dcctransferdetailedinfopanel.$(OBJEXT) dcccommon.$(OBJEXT) \ + queuetuner.$(OBJEXT) ircqueue.$(OBJEXT) \ + connectionsettings.$(OBJEXT) connectionmanager.$(OBJEXT) \ + awaymanager.$(OBJEXT) #>- konversation_OBJECTS = $(am_konversation_OBJECTS) -#>+ 51 +#>+ 54 konversation_final_OBJECTS = konversation.all_cpp.o konversation_nofinal_OBJECTS = konviconfigdialog.$(OBJEXT) \ konversationstatusbar.$(OBJEXT) konvisettingsdialog.$(OBJEXT) \ - konversationmainwindow.$(OBJEXT) valuelistviewitem.$(OBJEXT) \ - urlcatcher.$(OBJEXT) scriptlauncher.$(OBJEXT) rawlog.$(OBJEXT) \ - konvdcop.$(OBJEXT) channellistpanel.$(OBJEXT) \ - konsolepanel.$(OBJEXT) identity.$(OBJEXT) \ - statuspanel.$(OBJEXT) dccrecipientdialog.$(OBJEXT) \ - topiccombobox.$(OBJEXT) nicksonline.$(OBJEXT) \ - dccpanel.$(OBJEXT) dcctransfer.$(OBJEXT) \ - nicklistviewitem.$(OBJEXT) highlight.$(OBJEXT) \ + viewcontainer.$(OBJEXT) viewtree.$(OBJEXT) \ + viewtreeitem.$(OBJEXT) konversationmainwindow.$(OBJEXT) \ + valuelistviewitem.$(OBJEXT) urlcatcher.$(OBJEXT) \ + scriptlauncher.$(OBJEXT) rawlog.$(OBJEXT) konvdcop.$(OBJEXT) \ + channellistpanel.$(OBJEXT) konsolepanel.$(OBJEXT) \ + identity.$(OBJEXT) statuspanel.$(OBJEXT) \ + dccrecipientdialog.$(OBJEXT) topiccombobox.$(OBJEXT) \ + nicksonline.$(OBJEXT) dcctransferpanel.$(OBJEXT) \ + dcctransferpanelitem.$(OBJEXT) highlight.$(OBJEXT) \ highlightviewitem.$(OBJEXT) modebutton.$(OBJEXT) \ ignore_preferences.$(OBJEXT) ignore.$(OBJEXT) \ nicklistview.$(OBJEXT) ircinput.$(OBJEXT) \ - ignorelistviewitem.$(OBJEXT) images.$(OBJEXT) \ - quickbutton.$(OBJEXT) chatwindow.$(OBJEXT) \ - outputfilter.$(OBJEXT) query.$(OBJEXT) \ + channeloptionsdialog.$(OBJEXT) ignorelistviewitem.$(OBJEXT) \ + images.$(OBJEXT) quickbutton.$(OBJEXT) chatwindow.$(OBJEXT) \ + outputfilter.$(OBJEXT) logfilereader.$(OBJEXT) query.$(OBJEXT) \ konversationapplication.$(OBJEXT) nick.$(OBJEXT) \ inputfilter.$(OBJEXT) channel.$(OBJEXT) ircview.$(OBJEXT) \ server.$(OBJEXT) main.$(OBJEXT) tabs_preferences.$(OBJEXT) \ irccolorchooser.$(OBJEXT) channellistviewitem.$(OBJEXT) \ osd.$(OBJEXT) trayicon.$(OBJEXT) dccchat.$(OBJEXT) \ - logfilereader.$(OBJEXT) multilineedit.$(OBJEXT) \ - nickinfo.$(OBJEXT) dccresumedialog.$(OBJEXT) \ - konversationsound.$(OBJEXT) quickconnectdialog.$(OBJEXT) \ - serverlistdialog.$(OBJEXT) dcctransfersend.$(OBJEXT) \ - dcctransferrecv.$(OBJEXT) channelnick.$(OBJEXT) \ - dccdetaildialog.$(OBJEXT) insertchardialog.$(OBJEXT) \ + multilineedit.$(OBJEXT) nickinfo.$(OBJEXT) \ + dccresumedialog.$(OBJEXT) konversationsound.$(OBJEXT) \ + quickconnectdialog.$(OBJEXT) serverlistdialog.$(OBJEXT) \ + dcctransfersend.$(OBJEXT) dcctransferrecv.$(OBJEXT) \ + channelnick.$(OBJEXT) insertchardialog.$(OBJEXT) \ irccharsets.$(OBJEXT) editnotifydialog.$(OBJEXT) \ common.$(OBJEXT) serverison.$(OBJEXT) sslsocket.$(OBJEXT) \ servergroupsettings.$(OBJEXT) serversettings.$(OBJEXT) \ servergroupdialog.$(OBJEXT) ssllabel.$(OBJEXT) \ serverdialog.$(OBJEXT) channeldialog.$(OBJEXT) \ identitydialog.$(OBJEXT) topiclabel.$(OBJEXT) \ - channeloptionsdialog.$(OBJEXT) notificationhandler.$(OBJEXT) \ - joinchanneldialog.$(OBJEXT) emoticon.$(OBJEXT) \ - warnings_preferences.$(OBJEXT) konvibookmarkhandler.$(OBJEXT) \ - konvibookmarkmenu.$(OBJEXT) ircviewbox.$(OBJEXT) \ - searchbar.$(OBJEXT) osd_preferences.$(OBJEXT) \ - theme_preferences.$(OBJEXT) dcc_preferences.$(OBJEXT) \ - alias_preferences.$(OBJEXT) highlight_preferences.$(OBJEXT) \ + notificationhandler.$(OBJEXT) joinchanneldialog.$(OBJEXT) \ + emoticon.$(OBJEXT) warnings_preferences.$(OBJEXT) \ + konvibookmarkhandler.$(OBJEXT) konvibookmarkmenu.$(OBJEXT) \ + ircviewbox.$(OBJEXT) searchbar.$(OBJEXT) \ + osd_preferences.$(OBJEXT) theme_preferences.$(OBJEXT) \ + dcc_preferences.$(OBJEXT) alias_preferences.$(OBJEXT) \ + highlight_preferences.$(OBJEXT) \ watchednicknames_preferences.$(OBJEXT) \ quickbuttons_preferences.$(OBJEXT) \ - nicklistbehavior_preferences.$(OBJEXT) konviiphelper.$(OBJEXT) \ + nicklistbehavior_preferences.$(OBJEXT) \ multilinetextedit.$(OBJEXT) serverlistview.$(OBJEXT) \ nicksonlineitem.$(OBJEXT) autoreplace_preferences.$(OBJEXT) \ - viewcontainer.$(OBJEXT) viewtree.$(OBJEXT) \ - viewtreeitem.$(OBJEXT) konviface_skel.$(OBJEXT) ignore_preferencesui.$(OBJEXT) dcc_preferencesui.$(OBJEXT) log_preferences.$(OBJEXT) tabs_preferencesui.$(OBJEXT) chatwindowappearance_preferences.$(OBJEXT) irccolorchooserui.$(OBJEXT) colorsappearance_preferences.$(OBJEXT) channeloptionsui.$(OBJEXT) joinchannelui.$(OBJEXT) chatwindowbehaviour_preferences.$(OBJEXT) alias_preferencesui.$(OBJEXT) osd_preferencesui.$(OBJEXT) theme_preferencesui.$(OBJEXT) highlight_preferencesui.$(OBJEXT) warnings_preferencesui.$(OBJEXT) quickbuttons_preferencesui.$(OBJEXT) watchednicknames_preferencesui.$(OBJEXT) generalbehavior_preferences.$(OBJEXT) connectionbehavior_preferences.$(OBJEXT) fontappearance_preferences.$(OBJEXT) nicklistbehavior_preferencesui.$(OBJEXT) tabnotifications_preferences.$(OBJEXT) searchbarbase.$(OBJEXT) autoreplace_preferencesui.$(OBJEXT) servergroupdialogui.$(OBJEXT)\ + dcctransfer.$(OBJEXT) dcctransfermanager.$(OBJEXT) \ + dcctransferdetailedinfopanel.$(OBJEXT) dcccommon.$(OBJEXT) \ + queuetuner.$(OBJEXT) ircqueue.$(OBJEXT) \ + connectionsettings.$(OBJEXT) connectionmanager.$(OBJEXT) \ + awaymanager.$(OBJEXT) konviface_skel.$(OBJEXT) ignore_preferencesui.$(OBJEXT) channeloptionsui.$(OBJEXT) dcc_preferencesui.$(OBJEXT) log_preferences.$(OBJEXT) tabs_preferencesui.$(OBJEXT) chatwindowappearance_preferences.$(OBJEXT) irccolorchooserui.$(OBJEXT) colorsappearance_preferences.$(OBJEXT) joinchannelui.$(OBJEXT) chatwindowbehaviour_preferences.$(OBJEXT) alias_preferencesui.$(OBJEXT) osd_preferencesui.$(OBJEXT) theme_preferencesui.$(OBJEXT) highlight_preferencesui.$(OBJEXT) warnings_preferencesui.$(OBJEXT) quickbuttons_preferencesui.$(OBJEXT) watchednicknames_preferencesui.$(OBJEXT) generalbehavior_preferences.$(OBJEXT) connectionbehavior_preferences.$(OBJEXT) fontappearance_preferences.$(OBJEXT) nicklistbehavior_preferencesui.$(OBJEXT) tabnotifications_preferences.$(OBJEXT) searchbarbase.$(OBJEXT) autoreplace_preferencesui.$(OBJEXT) servergroupdialogui.$(OBJEXT) dcctransferdetailedinfopanelui.$(OBJEXT) queuetunerbase.$(OBJEXT)\ konviconfigdialog.moc.o @KDE_USE_FINAL_FALSE@konversation_OBJECTS = $(konversation_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@konversation_OBJECTS = $(konversation_final_OBJECTS) am__DEPENDENCIES_1 = konversation_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - linkaddressbook/liblinkaddressbookui.la \ + $(am__DEPENDENCIES_1) linkaddressbook/liblinkaddressbookui.la \ blowfish/libblowfish.la config/libkonversationconfig.la -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +#>- konversation_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ +#>- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +#>- $(CXXFLAGS) $(konversation_LDFLAGS) $(LDFLAGS) -o $@ +#>+ 3 +konversation_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(KDE_CXXFLAGS) $(konversation_LDFLAGS) $(LDFLAGS) -o $@ updateSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(bin_SCRIPTS) $(update_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +SCRIPTS = $(update_SCRIPTS) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ @@ -175,34 +182,38 @@ #>+ 2 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -#>- $(AM_CXXFLAGS) $(CXXFLAGS) -#>+ 3 -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) +#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +#>- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +#>+ 3 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) CXXLD = $(CXX) -#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -#>+ 2 -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +#>- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +#>- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ +#>- $(LDFLAGS) -o $@ +#>+ 3 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(konversation_SOURCES) DIST_SOURCES = $(konversation_SOURCES) #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ #>- html-recursive info-recursive install-data-recursive \ -#>- install-exec-recursive install-info-recursive \ -#>- install-recursive installcheck-recursive installdirs-recursive \ -#>- pdf-recursive ps-recursive uninstall-info-recursive \ -#>- uninstall-recursive -#>+ 6 +#>- install-dvi-recursive install-exec-recursive \ +#>- install-html-recursive install-info-recursive \ +#>- install-pdf-recursive install-ps-recursive install-recursive \ +#>- installcheck-recursive installdirs-recursive pdf-recursive \ +#>- ps-recursive uninstall-recursive +#>+ 7 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive nmcheck-recursive bcheck-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -215,6 +226,8 @@ xdg_appsDATA_INSTALL = $(INSTALL_DATA) DATA = $(kdelnk_DATA) $(rc_DATA) $(update_DATA) $(xdg_apps_DATA) HEADERS = $(noinst_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -222,8 +235,6 @@ #>+ 1 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -263,7 +274,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -338,12 +351,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -357,6 +372,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -376,24 +392,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -405,19 +419,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -444,30 +457,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -475,73 +488,64 @@ xdg_menudir = @xdg_menudir@ SUBDIRS = config linkaddressbook blowfish . #>- METASOURCES = AUTO -bin_SCRIPTS = konversationircprotocolhandler #>- konversation_SOURCES = konviface.skel konviconfigdialog.cpp konversationstatusbar.cpp \ -#>- konvisettingsdialog.cpp konversationmainwindow.cpp valuelistviewitem.cpp urlcatcher.cpp \ -#>- scriptlauncher.cpp rawlog.cpp konvdcop.cpp channellistpanel.cpp \ -#>- konsolepanel.cpp identity.cpp statuspanel.cpp \ -#>- dccrecipientdialog.cpp topiccombobox.cpp nicksonline.cpp dccpanel.cpp dcctransfer.cpp \ -#>- nicklistviewitem.cpp highlight.cpp highlightviewitem.cpp modebutton.cpp \ -#>- ignore_preferencesui.ui ignore_preferences.cpp ignore.cpp nicklistview.cpp ircinput.cpp \ -#>- ignorelistviewitem.cpp images.cpp quickbutton.cpp chatwindow.cpp outputfilter.cpp query.cpp \ -#>- konversationapplication.cpp nick.cpp inputfilter.cpp channel.cpp ircview.cpp server.cpp main.cpp \ -#>- dcc_preferencesui.ui log_preferences.ui tabs_preferencesui.ui tabs_preferences.cpp \ -#>- chatwindowappearance_preferences.ui irccolorchooserui.ui colorsappearance_preferences.ui \ -#>- irccolorchooser.cpp channellistviewitem.cpp osd.cpp trayicon.cpp dccchat.cpp \ -#>- logfilereader.cpp multilineedit.cpp nickinfo.cpp dccresumedialog.cpp \ -#>- konversationsound.cpp quickconnectdialog.cpp serverlistdialog.cpp dcctransfersend.cpp \ -#>- dcctransferrecv.cpp channelnick.cpp dccdetaildialog.cpp insertchardialog.cpp \ -#>- irccharsets.cpp editnotifydialog.cpp common.cpp serverison.cpp sslsocket.cpp \ -#>- servergroupsettings.cpp serversettings.cpp servergroupdialog.cpp ssllabel.cpp serverdialog.cpp \ -#>- channeldialog.cpp identitydialog.cpp topiclabel.cpp channeloptionsui.ui \ -#>- channeloptionsdialog.cpp notificationhandler.cpp joinchannelui.ui joinchanneldialog.cpp \ -#>- emoticon.cpp chatwindowbehaviour_preferences.ui alias_preferencesui.ui \ -#>- osd_preferencesui.ui theme_preferencesui.ui highlight_preferencesui.ui \ -#>- warnings_preferencesui.ui warnings_preferences.cpp quickbuttons_preferencesui.ui \ -#>- watchednicknames_preferencesui.ui generalbehavior_preferences.ui connectionbehavior_preferences.ui \ -#>- fontappearance_preferences.ui nicklistbehavior_preferencesui.ui konvibookmarkhandler.cpp \ -#>- konvibookmarkmenu.cpp ircviewbox.cpp searchbar.cpp osd_preferences.cpp \ -#>- theme_preferences.cpp dcc_preferences.cpp alias_preferences.cpp highlight_preferences.cpp \ -#>- watchednicknames_preferences.cpp quickbuttons_preferences.cpp nicklistbehavior_preferences.cpp \ -#>- konviiphelper.cpp tabnotifications_preferences.ui \ -#>- multilinetextedit.cpp serverlistview.cpp nicksonlineitem.cpp searchbarbase.ui \ -#>- autoreplace_preferencesui.ui autoreplace_preferences.cpp viewcontainer.cpp viewtree.cpp \ -#>- viewtreeitem.cpp servergroupdialogui.ui -#>+ 31 +#>- konvisettingsdialog.cpp viewcontainer.cpp viewtree.cpp viewtreeitem.cpp konversationmainwindow.cpp \ +#>- valuelistviewitem.cpp urlcatcher.cpp scriptlauncher.cpp rawlog.cpp konvdcop.cpp channellistpanel.cpp \ +#>- konsolepanel.cpp identity.cpp statuspanel.cpp dccrecipientdialog.cpp topiccombobox.cpp nicksonline.cpp \ +#>- dcctransferpanel.cpp dcctransferpanelitem.cpp highlight.cpp highlightviewitem.cpp modebutton.cpp \ +#>- ignore_preferencesui.ui ignore_preferences.cpp ignore.cpp nicklistview.cpp ircinput.cpp \ +#>- channeloptionsui.ui channeloptionsdialog.cpp ignorelistviewitem.cpp images.cpp quickbutton.cpp \ +#>- chatwindow.cpp outputfilter.cpp logfilereader.cpp query.cpp konversationapplication.cpp nick.cpp \ +#>- inputfilter.cpp channel.cpp ircview.cpp server.cpp main.cpp dcc_preferencesui.ui log_preferences.ui \ +#>- tabs_preferencesui.ui tabs_preferences.cpp chatwindowappearance_preferences.ui irccolorchooserui.ui \ +#>- colorsappearance_preferences.ui irccolorchooser.cpp channellistviewitem.cpp osd.cpp trayicon.cpp \ +#>- dccchat.cpp multilineedit.cpp nickinfo.cpp dccresumedialog.cpp konversationsound.cpp quickconnectdialog.cpp \ +#>- serverlistdialog.cpp dcctransfersend.cpp dcctransferrecv.cpp channelnick.cpp insertchardialog.cpp \ +#>- irccharsets.cpp editnotifydialog.cpp common.cpp serverison.cpp sslsocket.cpp servergroupsettings.cpp \ +#>- serversettings.cpp servergroupdialog.cpp ssllabel.cpp serverdialog.cpp channeldialog.cpp identitydialog.cpp \ +#>- topiclabel.cpp notificationhandler.cpp joinchannelui.ui joinchanneldialog.cpp emoticon.cpp \ +#>- chatwindowbehaviour_preferences.ui alias_preferencesui.ui osd_preferencesui.ui theme_preferencesui.ui \ +#>- highlight_preferencesui.ui warnings_preferencesui.ui warnings_preferences.cpp quickbuttons_preferencesui.ui \ +#>- watchednicknames_preferencesui.ui generalbehavior_preferences.ui connectionbehavior_preferences.ui \ +#>- fontappearance_preferences.ui nicklistbehavior_preferencesui.ui konvibookmarkhandler.cpp konvibookmarkmenu.cpp \ +#>- ircviewbox.cpp searchbar.cpp osd_preferences.cpp theme_preferences.cpp dcc_preferences.cpp \ +#>- alias_preferences.cpp highlight_preferences.cpp watchednicknames_preferences.cpp quickbuttons_preferences.cpp \ +#>- nicklistbehavior_preferences.cpp tabnotifications_preferences.ui multilinetextedit.cpp serverlistview.cpp \ +#>- nicksonlineitem.cpp searchbarbase.ui autoreplace_preferencesui.ui autoreplace_preferences.cpp \ +#>- servergroupdialogui.ui dcctransfer.cpp dcctransfermanager.cpp dcctransferdetailedinfopanelui.ui \ +#>- dcctransferdetailedinfopanel.cpp dcccommon.cpp queuetunerbase.ui queuetuner.cpp ircqueue.cpp \ +#>- connectionsettings.cpp connectionmanager.cpp awaymanager.cpp +#>+ 27 konversation_SOURCES= konviconfigdialog.cpp konversationstatusbar.cpp \ - konvisettingsdialog.cpp konversationmainwindow.cpp valuelistviewitem.cpp urlcatcher.cpp \ - scriptlauncher.cpp rawlog.cpp konvdcop.cpp channellistpanel.cpp \ - konsolepanel.cpp identity.cpp statuspanel.cpp \ - dccrecipientdialog.cpp topiccombobox.cpp nicksonline.cpp dccpanel.cpp dcctransfer.cpp \ - nicklistviewitem.cpp highlight.cpp highlightviewitem.cpp modebutton.cpp \ - ignore_preferences.cpp ignore.cpp nicklistview.cpp ircinput.cpp \ - ignorelistviewitem.cpp images.cpp quickbutton.cpp chatwindow.cpp outputfilter.cpp query.cpp \ - konversationapplication.cpp nick.cpp inputfilter.cpp channel.cpp ircview.cpp server.cpp main.cpp \ - tabs_preferences.cpp \ - \ - irccolorchooser.cpp channellistviewitem.cpp osd.cpp trayicon.cpp dccchat.cpp \ - logfilereader.cpp multilineedit.cpp nickinfo.cpp dccresumedialog.cpp \ - konversationsound.cpp quickconnectdialog.cpp serverlistdialog.cpp dcctransfersend.cpp \ - dcctransferrecv.cpp channelnick.cpp dccdetaildialog.cpp insertchardialog.cpp \ - irccharsets.cpp editnotifydialog.cpp common.cpp serverison.cpp sslsocket.cpp \ - servergroupsettings.cpp serversettings.cpp servergroupdialog.cpp ssllabel.cpp serverdialog.cpp \ - channeldialog.cpp identitydialog.cpp topiclabel.cpp \ - channeloptionsdialog.cpp notificationhandler.cpp joinchanneldialog.cpp \ - emoticon.cpp \ - \ - warnings_preferences.cpp \ - \ - konvibookmarkhandler.cpp \ - konvibookmarkmenu.cpp ircviewbox.cpp searchbar.cpp osd_preferences.cpp \ - theme_preferences.cpp dcc_preferences.cpp alias_preferences.cpp highlight_preferences.cpp \ - watchednicknames_preferences.cpp quickbuttons_preferences.cpp nicklistbehavior_preferences.cpp \ - konviiphelper.cpp \ - multilinetextedit.cpp serverlistview.cpp nicksonlineitem.cpp \ - autoreplace_preferences.cpp viewcontainer.cpp viewtree.cpp \ - viewtreeitem.cpp konviface_skel.cpp ignore_preferencesui.cpp dcc_preferencesui.cpp log_preferences.cpp tabs_preferencesui.cpp chatwindowappearance_preferences.cpp irccolorchooserui.cpp colorsappearance_preferences.cpp channeloptionsui.cpp joinchannelui.cpp chatwindowbehaviour_preferences.cpp alias_preferencesui.cpp osd_preferencesui.cpp theme_preferencesui.cpp highlight_preferencesui.cpp warnings_preferencesui.cpp quickbuttons_preferencesui.cpp watchednicknames_preferencesui.cpp generalbehavior_preferences.cpp connectionbehavior_preferences.cpp fontappearance_preferences.cpp nicklistbehavior_preferencesui.cpp tabnotifications_preferences.cpp searchbarbase.cpp autoreplace_preferencesui.cpp servergroupdialogui.cpp + konvisettingsdialog.cpp viewcontainer.cpp viewtree.cpp viewtreeitem.cpp konversationmainwindow.cpp \ + valuelistviewitem.cpp urlcatcher.cpp scriptlauncher.cpp rawlog.cpp konvdcop.cpp channellistpanel.cpp \ + konsolepanel.cpp identity.cpp statuspanel.cpp dccrecipientdialog.cpp topiccombobox.cpp nicksonline.cpp \ + dcctransferpanel.cpp dcctransferpanelitem.cpp highlight.cpp highlightviewitem.cpp modebutton.cpp \ + ignore_preferences.cpp ignore.cpp nicklistview.cpp ircinput.cpp \ + channeloptionsdialog.cpp ignorelistviewitem.cpp images.cpp quickbutton.cpp \ + chatwindow.cpp outputfilter.cpp logfilereader.cpp query.cpp konversationapplication.cpp nick.cpp \ + inputfilter.cpp channel.cpp ircview.cpp server.cpp main.cpp \ + tabs_preferences.cpp \ + irccolorchooser.cpp channellistviewitem.cpp osd.cpp trayicon.cpp \ + dccchat.cpp multilineedit.cpp nickinfo.cpp dccresumedialog.cpp konversationsound.cpp quickconnectdialog.cpp \ + serverlistdialog.cpp dcctransfersend.cpp dcctransferrecv.cpp channelnick.cpp insertchardialog.cpp \ + irccharsets.cpp editnotifydialog.cpp common.cpp serverison.cpp sslsocket.cpp servergroupsettings.cpp \ + serversettings.cpp servergroupdialog.cpp ssllabel.cpp serverdialog.cpp channeldialog.cpp identitydialog.cpp \ + topiclabel.cpp notificationhandler.cpp joinchanneldialog.cpp emoticon.cpp \ + \ + warnings_preferences.cpp \ + \ + konvibookmarkhandler.cpp konvibookmarkmenu.cpp \ + ircviewbox.cpp searchbar.cpp osd_preferences.cpp theme_preferences.cpp dcc_preferences.cpp \ + alias_preferences.cpp highlight_preferences.cpp watchednicknames_preferences.cpp quickbuttons_preferences.cpp \ + nicklistbehavior_preferences.cpp multilinetextedit.cpp serverlistview.cpp \ + nicksonlineitem.cpp autoreplace_preferences.cpp \ + dcctransfer.cpp dcctransfermanager.cpp \ + dcctransferdetailedinfopanel.cpp dcccommon.cpp queuetuner.cpp ircqueue.cpp \ + connectionsettings.cpp connectionmanager.cpp awaymanager.cpp konviface_skel.cpp ignore_preferencesui.cpp channeloptionsui.cpp dcc_preferencesui.cpp log_preferences.cpp tabs_preferencesui.cpp chatwindowappearance_preferences.cpp irccolorchooserui.cpp colorsappearance_preferences.cpp joinchannelui.cpp chatwindowbehaviour_preferences.cpp alias_preferencesui.cpp osd_preferencesui.cpp theme_preferencesui.cpp highlight_preferencesui.cpp warnings_preferencesui.cpp quickbuttons_preferencesui.cpp watchednicknames_preferencesui.cpp generalbehavior_preferences.cpp connectionbehavior_preferences.cpp fontappearance_preferences.cpp nicklistbehavior_preferencesui.cpp tabnotifications_preferences.cpp searchbarbase.cpp autoreplace_preferencesui.cpp servergroupdialogui.cpp dcctransferdetailedinfopanelui.cpp queuetunerbase.cpp konversation_COMPILE_FIRST = config/preferences_base.h -konversation_LDADD = $(LIB_KIO) $(LIB_KABC) $(LIB_KIMIFACE) linkaddressbook/liblinkaddressbookui.la blowfish/libblowfish.la config/libkonversationconfig.la +konversation_LDADD = $(LIB_KIO) $(LIB_XSS) $(LIB_KABC) $(LIB_KIMIFACE) linkaddressbook/liblinkaddressbookui.la blowfish/libblowfish.la config/libkonversationconfig.la xdg_apps_DATA = konversation.desktop # set the include path for X, qt and KDE @@ -562,7 +566,7 @@ konversation-0.20-quickbuttons.pl konversation-0.20-customfonts.pl noinst_HEADERS = serverlistdialog.h dcctransfersend.h dcctransferrecv.h \ - dccdetaildialog.h insertchardialog.h editnotifydialog.h serverison.h \ + insertchardialog.h editnotifydialog.h serverison.h \ servergroupsettings.h serversettings.h servergroupdialog.h serverdialog.h channeldialog.h \ identitydialog.h topiclabel.h channeloptionsdialog.h joinchanneldialog.h \ highlight_preferences.h watchednicknames_preferences.h quickbuttons_preferences.h \ @@ -621,15 +625,15 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ || test -f $$p1 \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ else :; fi; \ done @@ -649,29 +653,10 @@ done konversation$(EXEEXT): $(konversation_OBJECTS) $(konversation_DEPENDENCIES) @rm -f konversation$(EXEEXT) - $(CXXLINK) $(konversation_LDFLAGS) $(konversation_OBJECTS) $(konversation_LDADD) $(LIBS) -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done + $(konversation_LINK) $(konversation_OBJECTS) $(konversation_LDADD) $(LIBS) install-updateSCRIPTS: $(update_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)" + test -z "$(updatedir)" || $(MKDIR_P) "$(DESTDIR)$(updatedir)" @list='$(update_SCRIPTS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f $$d$$p; then \ @@ -697,6 +682,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alias_preferences.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autoreplace_preferences.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/awaymanager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channeldialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channellistpanel.Po@am__quote@ @@ -705,13 +691,18 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channeloptionsdialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chatwindow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connectionmanager.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connectionsettings.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcc_preferences.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dccchat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dccdetaildialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dccpanel.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcccommon.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dccrecipientdialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dccresumedialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcctransfer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcctransferdetailedinfopanel.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcctransfermanager.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcctransferpanel.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcctransferpanelitem.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcctransferrecv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcctransfersend.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editnotifydialog.Po@am__quote@ @@ -730,6 +721,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/irccharsets.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/irccolorchooser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ircinput.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ircqueue.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ircview.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ircviewbox.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/joinchanneldialog.Po@am__quote@ @@ -742,7 +734,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konvibookmarkhandler.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konvibookmarkmenu.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konviconfigdialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konviiphelper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konvisettingsdialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logfilereader.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ @@ -753,7 +744,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nickinfo.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nicklistbehavior_preferences.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nicklistview.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nicklistviewitem.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nicksonline.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nicksonlineitem.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/notificationhandler.Po@am__quote@ @@ -761,6 +751,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osd_preferences.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/outputfilter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/query.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queuetuner.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quickbutton.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quickbuttons_preferences.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quickconnectdialog.Po@am__quote@ @@ -792,22 +783,22 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/watchednicknames_preferences.Po@am__quote@ .cpp.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< .cpp.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cpp.lo: -@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< @@ -817,13 +808,9 @@ clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-kdelnkDATA: $(kdelnk_DATA) @$(NORMAL_INSTALL) - test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)" + test -z "$(kdelnkdir)" || $(MKDIR_P) "$(DESTDIR)$(kdelnkdir)" @list='$(kdelnk_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -840,7 +827,7 @@ done install-rcDATA: $(rc_DATA) @$(NORMAL_INSTALL) - test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)" + test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)" @list='$(rc_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -857,7 +844,7 @@ done install-updateDATA: $(update_DATA) @$(NORMAL_INSTALL) - test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)" + test -z "$(updatedir)" || $(MKDIR_P) "$(DESTDIR)$(updatedir)" @list='$(update_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -874,7 +861,7 @@ done install-xdg_appsDATA: $(xdg_apps_DATA) @$(NORMAL_INSTALL) - test -z "$(xdg_appsdir)" || $(mkdir_p) "$(DESTDIR)$(xdg_appsdir)" + test -z "$(xdg_appsdir)" || $(MKDIR_P) "$(DESTDIR)$(xdg_appsdir)" @list='$(xdg_apps_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -921,8 +908,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -966,8 +952,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -992,8 +978,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -1003,13 +989,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -1023,22 +1008,21 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -1052,7 +1036,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -1060,6 +1044,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -1069,8 +1055,8 @@ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_appsdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_appsdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -1109,7 +1095,7 @@ -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-recursive @@ -1124,12 +1110,20 @@ install-data-am: install-kdelnkDATA install-rcDATA install-updateDATA \ install-updateSCRIPTS install-xdg_appsDATA -install-exec-am: install-binPROGRAMS install-binSCRIPTS +install-dvi: install-dvi-recursive + +install-exec-am: install-binPROGRAMS + +install-html: install-html-recursive install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -1150,29 +1144,29 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \ - uninstall-info-am uninstall-kdelnkDATA uninstall-rcDATA \ - uninstall-updateDATA uninstall-updateSCRIPTS \ +uninstall-am: uninstall-binPROGRAMS uninstall-kdelnkDATA \ + uninstall-rcDATA uninstall-updateDATA uninstall-updateSCRIPTS \ uninstall-xdg_appsDATA -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-binPROGRAMS clean-generic clean-libtool \ - clean-recursive ctags ctags-recursive distclean \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags ctags-recursive distclean \ distclean-compile distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-binSCRIPTS install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ - install-kdelnkDATA install-man install-rcDATA install-strip \ - install-updateDATA install-updateSCRIPTS install-xdg_appsDATA \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ - pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-kdelnkDATA install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-rcDATA \ + install-strip install-updateDATA install-updateSCRIPTS \ + install-xdg_appsDATA installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-kdelnkDATA uninstall-rcDATA uninstall-updateDATA \ uninstall-updateSCRIPTS uninstall-xdg_appsDATA @@ -1195,6 +1189,13 @@ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub konviface.kidl #>+ 3 +dcctransferpanelitem.moc: $(srcdir)/dcctransferpanelitem.h + $(MOC) $(srcdir)/dcctransferpanelitem.h -o dcctransferpanelitem.moc + +#>+ 2 +mocs: dcctransferpanelitem.moc + +#>+ 3 channelnick.moc: $(srcdir)/channelnick.h $(MOC) $(srcdir)/channelnick.h -o channelnick.moc @@ -1202,11 +1203,11 @@ mocs: channelnick.moc #>+ 3 -nicklistviewitem.moc: $(srcdir)/nicklistviewitem.h - $(MOC) $(srcdir)/nicklistviewitem.h -o nicklistviewitem.moc +dcctransferdetailedinfopanel.moc: $(srcdir)/dcctransferdetailedinfopanel.h + $(MOC) $(srcdir)/dcctransferdetailedinfopanel.h -o dcctransferdetailedinfopanel.moc #>+ 2 -mocs: nicklistviewitem.moc +mocs: dcctransferdetailedinfopanel.moc #>+ 3 ircinput.moc: $(srcdir)/ircinput.h @@ -1216,18 +1217,18 @@ mocs: ircinput.moc #>+ 3 -serverdialog.moc: $(srcdir)/serverdialog.h - $(MOC) $(srcdir)/serverdialog.h -o serverdialog.moc +konvibookmarkhandler.moc: $(srcdir)/konvibookmarkhandler.h + $(MOC) $(srcdir)/konvibookmarkhandler.h -o konvibookmarkhandler.moc #>+ 2 -mocs: serverdialog.moc +mocs: konvibookmarkhandler.moc #>+ 3 -konvibookmarkhandler.moc: $(srcdir)/konvibookmarkhandler.h - $(MOC) $(srcdir)/konvibookmarkhandler.h -o konvibookmarkhandler.moc +serverdialog.moc: $(srcdir)/serverdialog.h + $(MOC) $(srcdir)/serverdialog.h -o serverdialog.moc #>+ 2 -mocs: konvibookmarkhandler.moc +mocs: serverdialog.moc #>+ 3 dccchat.moc: $(srcdir)/dccchat.h @@ -1237,18 +1238,18 @@ mocs: dccchat.moc #>+ 3 -konsolepanel.moc: $(srcdir)/konsolepanel.h - $(MOC) $(srcdir)/konsolepanel.h -o konsolepanel.moc +serverlistview.moc: $(srcdir)/serverlistview.h + $(MOC) $(srcdir)/serverlistview.h -o serverlistview.moc #>+ 2 -mocs: konsolepanel.moc +mocs: serverlistview.moc #>+ 3 -serverlistview.moc: $(srcdir)/serverlistview.h - $(MOC) $(srcdir)/serverlistview.h -o serverlistview.moc +konsolepanel.moc: $(srcdir)/konsolepanel.h + $(MOC) $(srcdir)/konsolepanel.h -o konsolepanel.moc #>+ 2 -mocs: serverlistview.moc +mocs: konsolepanel.moc #>+ 3 konvisettingsdialog.moc: $(srcdir)/konvisettingsdialog.h @@ -1265,18 +1266,18 @@ mocs: viewtree.moc #>+ 3 -serverlistdialog.moc: $(srcdir)/serverlistdialog.h - $(MOC) $(srcdir)/serverlistdialog.h -o serverlistdialog.moc +dccrecipientdialog.moc: $(srcdir)/dccrecipientdialog.h + $(MOC) $(srcdir)/dccrecipientdialog.h -o dccrecipientdialog.moc #>+ 2 -mocs: serverlistdialog.moc +mocs: dccrecipientdialog.moc #>+ 3 -dccrecipientdialog.moc: $(srcdir)/dccrecipientdialog.h - $(MOC) $(srcdir)/dccrecipientdialog.h -o dccrecipientdialog.moc +serverlistdialog.moc: $(srcdir)/serverlistdialog.h + $(MOC) $(srcdir)/serverlistdialog.h -o serverlistdialog.moc #>+ 2 -mocs: dccrecipientdialog.moc +mocs: serverlistdialog.moc #>+ 3 tabs_preferences.moc: $(srcdir)/tabs_preferences.h @@ -1286,18 +1287,18 @@ mocs: tabs_preferences.moc #>+ 3 -viewcontainer.moc: $(srcdir)/viewcontainer.h - $(MOC) $(srcdir)/viewcontainer.h -o viewcontainer.moc +editnotifydialog.moc: $(srcdir)/editnotifydialog.h + $(MOC) $(srcdir)/editnotifydialog.h -o editnotifydialog.moc #>+ 2 -mocs: viewcontainer.moc +mocs: editnotifydialog.moc #>+ 3 -editnotifydialog.moc: $(srcdir)/editnotifydialog.h - $(MOC) $(srcdir)/editnotifydialog.h -o editnotifydialog.moc +viewcontainer.moc: $(srcdir)/viewcontainer.h + $(MOC) $(srcdir)/viewcontainer.h -o viewcontainer.moc #>+ 2 -mocs: editnotifydialog.moc +mocs: viewcontainer.moc #>+ 3 konversationstatusbar.moc: $(srcdir)/konversationstatusbar.h @@ -1307,18 +1308,18 @@ mocs: konversationstatusbar.moc #>+ 3 -sslsocket.moc: $(srcdir)/sslsocket.h - $(MOC) $(srcdir)/sslsocket.h -o sslsocket.moc +quickbuttons_preferences.moc: $(srcdir)/quickbuttons_preferences.h + $(MOC) $(srcdir)/quickbuttons_preferences.h -o quickbuttons_preferences.moc #>+ 2 -mocs: sslsocket.moc +mocs: quickbuttons_preferences.moc #>+ 3 -quickbuttons_preferences.moc: $(srcdir)/quickbuttons_preferences.h - $(MOC) $(srcdir)/quickbuttons_preferences.h -o quickbuttons_preferences.moc +sslsocket.moc: $(srcdir)/sslsocket.h + $(MOC) $(srcdir)/sslsocket.h -o sslsocket.moc #>+ 2 -mocs: quickbuttons_preferences.moc +mocs: sslsocket.moc #>+ 3 modebutton.moc: $(srcdir)/modebutton.h @@ -1335,6 +1336,13 @@ mocs: alias_preferences.moc #>+ 3 +nicksonline.moc: $(srcdir)/nicksonline.h + $(MOC) $(srcdir)/nicksonline.h -o nicksonline.moc + +#>+ 2 +mocs: nicksonline.moc + +#>+ 3 dccresumedialog.moc: $(srcdir)/dccresumedialog.h $(MOC) $(srcdir)/dccresumedialog.h -o dccresumedialog.moc @@ -1342,11 +1350,11 @@ mocs: dccresumedialog.moc #>+ 3 -nicksonline.moc: $(srcdir)/nicksonline.h - $(MOC) $(srcdir)/nicksonline.h -o nicksonline.moc +dcctransferpanel.moc: $(srcdir)/dcctransferpanel.h + $(MOC) $(srcdir)/dcctransferpanel.h -o dcctransferpanel.moc #>+ 2 -mocs: nicksonline.moc +mocs: dcctransferpanel.moc #>+ 3 notificationhandler.moc: $(srcdir)/notificationhandler.h @@ -1356,6 +1364,13 @@ mocs: notificationhandler.moc #>+ 3 +ircqueue.moc: $(srcdir)/ircqueue.h + $(MOC) $(srcdir)/ircqueue.h -o ircqueue.moc + +#>+ 2 +mocs: ircqueue.moc + +#>+ 3 channel.moc: $(srcdir)/channel.h $(MOC) $(srcdir)/channel.h -o channel.moc @@ -1363,18 +1378,18 @@ mocs: channel.moc #>+ 3 -nickinfo.moc: $(srcdir)/nickinfo.h - $(MOC) $(srcdir)/nickinfo.h -o nickinfo.moc +queuetuner.moc: $(srcdir)/queuetuner.h + $(MOC) $(srcdir)/queuetuner.h -o queuetuner.moc #>+ 2 -mocs: nickinfo.moc +mocs: queuetuner.moc #>+ 3 -outputfilter.moc: $(srcdir)/outputfilter.h - $(MOC) $(srcdir)/outputfilter.h -o outputfilter.moc +nickinfo.moc: $(srcdir)/nickinfo.h + $(MOC) $(srcdir)/nickinfo.h -o nickinfo.moc #>+ 2 -mocs: outputfilter.moc +mocs: nickinfo.moc #>+ 3 channeloptionsdialog.moc: $(srcdir)/channeloptionsdialog.h @@ -1384,6 +1399,13 @@ mocs: channeloptionsdialog.moc #>+ 3 +outputfilter.moc: $(srcdir)/outputfilter.h + $(MOC) $(srcdir)/outputfilter.h -o outputfilter.moc + +#>+ 2 +mocs: outputfilter.moc + +#>+ 3 quickbutton.moc: $(srcdir)/quickbutton.h $(MOC) $(srcdir)/quickbutton.h -o quickbutton.moc @@ -1398,6 +1420,13 @@ mocs: dcc_preferences.moc #>+ 3 +dcctransfermanager.moc: $(srcdir)/dcctransfermanager.h + $(MOC) $(srcdir)/dcctransfermanager.h -o dcctransfermanager.moc + +#>+ 2 +mocs: dcctransfermanager.moc + +#>+ 3 topiccombobox.moc: $(srcdir)/topiccombobox.h $(MOC) $(srcdir)/topiccombobox.h -o topiccombobox.moc @@ -1440,13 +1469,6 @@ mocs: servergroupdialog.moc #>+ 3 -konviiphelper.moc: $(srcdir)/konviiphelper.h - $(MOC) $(srcdir)/konviiphelper.h -o konviiphelper.moc - -#>+ 2 -mocs: konviiphelper.moc - -#>+ 3 konversationmainwindow.moc: $(srcdir)/konversationmainwindow.h $(MOC) $(srcdir)/konversationmainwindow.h -o konversationmainwindow.moc @@ -1461,6 +1483,13 @@ mocs: dcctransfersend.moc #>+ 3 +joinchanneldialog.moc: $(srcdir)/joinchanneldialog.h + $(MOC) $(srcdir)/joinchanneldialog.h -o joinchanneldialog.moc + +#>+ 2 +mocs: joinchanneldialog.moc + +#>+ 3 konversationsound.moc: $(srcdir)/konversationsound.h $(MOC) $(srcdir)/konversationsound.h -o konversationsound.moc @@ -1475,11 +1504,11 @@ mocs: trayicon.moc #>+ 3 -joinchanneldialog.moc: $(srcdir)/joinchanneldialog.h - $(MOC) $(srcdir)/joinchanneldialog.h -o joinchanneldialog.moc +nick.moc: $(srcdir)/nick.h + $(MOC) $(srcdir)/nick.h -o nick.moc #>+ 2 -mocs: joinchanneldialog.moc +mocs: nick.moc #>+ 3 statuspanel.moc: $(srcdir)/statuspanel.h @@ -1496,18 +1525,18 @@ mocs: quickconnectdialog.moc #>+ 3 -nicklistbehavior_preferences.moc: $(srcdir)/nicklistbehavior_preferences.h - $(MOC) $(srcdir)/nicklistbehavior_preferences.h -o nicklistbehavior_preferences.moc +server.moc: $(srcdir)/server.h + $(MOC) $(srcdir)/server.h -o server.moc #>+ 2 -mocs: nicklistbehavior_preferences.moc +mocs: server.moc #>+ 3 -server.moc: $(srcdir)/server.h - $(MOC) $(srcdir)/server.h -o server.moc +nicklistbehavior_preferences.moc: $(srcdir)/nicklistbehavior_preferences.h + $(MOC) $(srcdir)/nicklistbehavior_preferences.h -o nicklistbehavior_preferences.moc #>+ 2 -mocs: server.moc +mocs: nicklistbehavior_preferences.moc #>+ 3 ssllabel.moc: $(srcdir)/ssllabel.h @@ -1566,11 +1595,11 @@ mocs: ircview.moc #>+ 3 -inputfilter.moc: $(srcdir)/inputfilter.h - $(MOC) $(srcdir)/inputfilter.h -o inputfilter.moc +highlight_preferences.moc: $(srcdir)/highlight_preferences.h + $(MOC) $(srcdir)/highlight_preferences.h -o highlight_preferences.moc #>+ 2 -mocs: inputfilter.moc +mocs: highlight_preferences.moc #>+ 3 autoreplace_preferences.moc: $(srcdir)/autoreplace_preferences.h @@ -1580,25 +1609,25 @@ mocs: autoreplace_preferences.moc #>+ 3 -highlight_preferences.moc: $(srcdir)/highlight_preferences.h - $(MOC) $(srcdir)/highlight_preferences.h -o highlight_preferences.moc +inputfilter.moc: $(srcdir)/inputfilter.h + $(MOC) $(srcdir)/inputfilter.h -o inputfilter.moc #>+ 2 -mocs: highlight_preferences.moc +mocs: inputfilter.moc #>+ 3 -dccpanel.moc: $(srcdir)/dccpanel.h - $(MOC) $(srcdir)/dccpanel.h -o dccpanel.moc +insertchardialog.moc: $(srcdir)/insertchardialog.h + $(MOC) $(srcdir)/insertchardialog.h -o insertchardialog.moc #>+ 2 -mocs: dccpanel.moc +mocs: insertchardialog.moc #>+ 3 -insertchardialog.moc: $(srcdir)/insertchardialog.h - $(MOC) $(srcdir)/insertchardialog.h -o insertchardialog.moc +connectionmanager.moc: $(srcdir)/connectionmanager.h + $(MOC) $(srcdir)/connectionmanager.h -o connectionmanager.moc #>+ 2 -mocs: insertchardialog.moc +mocs: connectionmanager.moc #>+ 3 theme_preferences.moc: $(srcdir)/theme_preferences.h @@ -1622,6 +1651,13 @@ mocs: logfilereader.moc #>+ 3 +awaymanager.moc: $(srcdir)/awaymanager.h + $(MOC) $(srcdir)/awaymanager.h -o awaymanager.moc + +#>+ 2 +mocs: awaymanager.moc + +#>+ 3 channellistpanel.moc: $(srcdir)/channellistpanel.h $(MOC) $(srcdir)/channellistpanel.h -o channellistpanel.moc @@ -1650,18 +1686,18 @@ mocs: nicklistview.moc #>+ 3 -multilineedit.moc: $(srcdir)/multilineedit.h - $(MOC) $(srcdir)/multilineedit.h -o multilineedit.moc +irccolorchooser.moc: $(srcdir)/irccolorchooser.h + $(MOC) $(srcdir)/irccolorchooser.h -o irccolorchooser.moc #>+ 2 -mocs: multilineedit.moc +mocs: irccolorchooser.moc #>+ 3 -irccolorchooser.moc: $(srcdir)/irccolorchooser.h - $(MOC) $(srcdir)/irccolorchooser.h -o irccolorchooser.moc +multilineedit.moc: $(srcdir)/multilineedit.h + $(MOC) $(srcdir)/multilineedit.h -o multilineedit.moc #>+ 2 -mocs: irccolorchooser.moc +mocs: multilineedit.moc #>+ 3 dcctransfer.moc: $(srcdir)/dcctransfer.h @@ -1692,13 +1728,6 @@ mocs: multilinetextedit.moc #>+ 3 -dccdetaildialog.moc: $(srcdir)/dccdetaildialog.h - $(MOC) $(srcdir)/dccdetaildialog.h -o dccdetaildialog.moc - -#>+ 2 -mocs: dccdetaildialog.moc - -#>+ 3 query.moc: $(srcdir)/query.h $(MOC) $(srcdir)/query.h -o query.moc @@ -1749,27 +1778,27 @@ #>+ 3 clean-metasources: - -rm -f channelnick.moc nicklistviewitem.moc ircinput.moc serverdialog.moc konvibookmarkhandler.moc dccchat.moc konsolepanel.moc serverlistview.moc konvisettingsdialog.moc viewtree.moc serverlistdialog.moc dccrecipientdialog.moc tabs_preferences.moc viewcontainer.moc editnotifydialog.moc konversationstatusbar.moc sslsocket.moc quickbuttons_preferences.moc modebutton.moc alias_preferences.moc dccresumedialog.moc nicksonline.moc notificationhandler.moc channel.moc nickinfo.moc outputfilter.moc channeloptionsdialog.moc quickbutton.moc dcc_preferences.moc topiccombobox.moc osd_preferences.moc watchednicknames_preferences.moc ignore_preferences.moc konvibookmarkmenu.moc servergroupdialog.moc konviiphelper.moc konversationmainwindow.moc dcctransfersend.moc konversationsound.moc trayicon.moc joinchanneldialog.moc statuspanel.moc quickconnectdialog.moc nicklistbehavior_preferences.moc server.moc ssllabel.moc images.moc dcctransferrecv.moc identitydialog.moc konviconfigdialog.moc.cpp serverison.moc osd.moc ircview.moc inputfilter.moc autoreplace_preferences.moc highlight_preferences.moc dccpanel.moc insertchardialog.moc theme_preferences.moc chatwindow.moc logfilereader.moc channellistpanel.moc konversationapplication.moc urlcatcher.moc nicklistview.moc multilineedit.moc irccolorchooser.moc dcctransfer.moc topiclabel.moc searchbar.moc multilinetextedit.moc dccdetaildialog.moc query.moc scriptlauncher.moc warnings_preferences.moc rawlog.moc channeldialog.moc ircviewbox.moc konvdcop.moc + -rm -f dcctransferpanelitem.moc channelnick.moc dcctransferdetailedinfopanel.moc ircinput.moc konvibookmarkhandler.moc serverdialog.moc dccchat.moc serverlistview.moc konsolepanel.moc konvisettingsdialog.moc viewtree.moc dccrecipientdialog.moc serverlistdialog.moc tabs_preferences.moc editnotifydialog.moc viewcontainer.moc konversationstatusbar.moc quickbuttons_preferences.moc sslsocket.moc modebutton.moc alias_preferences.moc nicksonline.moc dccresumedialog.moc dcctransferpanel.moc notificationhandler.moc ircqueue.moc channel.moc queuetuner.moc nickinfo.moc channeloptionsdialog.moc outputfilter.moc quickbutton.moc dcc_preferences.moc dcctransfermanager.moc topiccombobox.moc osd_preferences.moc watchednicknames_preferences.moc ignore_preferences.moc konvibookmarkmenu.moc servergroupdialog.moc konversationmainwindow.moc dcctransfersend.moc joinchanneldialog.moc konversationsound.moc trayicon.moc nick.moc statuspanel.moc quickconnectdialog.moc server.moc nicklistbehavior_preferences.moc ssllabel.moc images.moc dcctransferrecv.moc identitydialog.moc konviconfigdialog.moc.cpp serverison.moc osd.moc ircview.moc highlight_preferences.moc autoreplace_preferences.moc inputfilter.moc insertchardialog.moc connectionmanager.moc theme_preferences.moc chatwindow.moc logfilereader.moc awaymanager.moc channellistpanel.moc konversationapplication.moc urlcatcher.moc nicklistview.moc irccolorchooser.moc multilineedit.moc dcctransfer.moc topiclabel.moc searchbar.moc multilinetextedit.moc query.moc scriptlauncher.moc warnings_preferences.moc rawlog.moc channeldialog.moc ircviewbox.moc konvdcop.moc #>+ 2 -KDE_DIST=osd_preferencesui.ui viewtree.h nicksonline.h konversationstatusbar.h konsolepanel.h konversation-0.19-colors.pl joinchannelui.ui nicklistviewitem.h konversation-0.19-notifylists.pl channel.h eventsrc query.h guess_ja.h notificationhandler.h konvisettingsdialog.h common.h konviiphelper.h dccpanel.h alias_preferences.h ssllabel.h konversation-0.20-customfonts.pl sslsocket.h topiccombobox.h replycodes.h ignore_preferences.h konversation-0.19-custombrowser.pl konversationui.rc generalbehavior_preferences.ui ircinput.h konviconfigdialog.h outputfilter.h ircview.h tabnotifications_preferences.ui scriptlauncher.h searchbarbase.ui ignorelistviewitem.h channeloptionsui.ui dccresumedialog.h theme_preferences.h viewcontainer.h osd.h identity.h quickbuttons_preferencesui.ui logfilereader.h konversationircprotocolhandler konviface.h Makefile.in server.h konvirc.protocol log_preferences.ui konvibookmarkmenu.h servergroupdialogui.ui highlight.h unicode.cpp konversation-0.19-tabplacement.pl viewtreeitem.h urlcatcher.h konvibookmarkhandler.h nicklistview.h nickinfo.h commit.h images.h tabs_preferencesui.ui connectionbehavior_preferences.ui warnings_preferencesui.ui konversationsound.h valuelistviewitem.h konversation-0.19-appearance.pl chatwindowbehaviour_preferences.ui quickconnectdialog.h konversation-0.19-colorcodes.pl konversationapplication.h trayicon.h irccolorchooserui.ui guess_ja.cpp osd_preferences.h ignore_preferencesui.ui channelnick.h ircviewbox.h konversation.upd irccharsets.h konvdcop.h theme_preferencesui.ui multilinetextedit.h konversation-0.19-sortorder.pl dcc_preferences.h alias_preferencesui.ui decoder.h modebutton.h inputfilter.h serverlistview.h chatwindow.h autoreplace_preferences.h konversation-0.20-quickbuttons.pl irccolorchooser.h fontappearance_preferences.ui rawlog.h konvirc6.protocol watchednicknames_preferencesui.ui searchbar.h warnings_preferences.h dcctransfer.h channellistviewitem.h tabs_preferences.h colorsappearance_preferences.ui nick.h emoticon.h highlight_preferencesui.ui nicklistbehavior_preferencesui.ui multilineedit.h chatwindowappearance_preferences.ui highlightviewitem.h dccchat.h dccrecipientdialog.h quickbutton.h channellistpanel.h dcc_preferencesui.ui ignore.h autoreplace_preferencesui.ui konversationmainwindow.h version.h Makefile.am konversation.desktop statuspanel.h +KDE_DIST=osd_preferencesui.ui viewtree.h nicksonline.h connectionmanager.h konversationstatusbar.h konversation-0.19-colors.pl konsolepanel.h joinchannelui.ui konversation-0.19-notifylists.pl channel.h dcctransferdetailedinfopanelui.ui query.h eventsrc notificationhandler.h guess_ja.h konvisettingsdialog.h ircqueue.h common.h alias_preferences.h ssllabel.h konversation-0.20-customfonts.pl sslsocket.h replycodes.h topiccombobox.h ignore_preferences.h konversation-0.19-custombrowser.pl generalbehavior_preferences.ui konversationui.rc ircinput.h outputfilter.h konviconfigdialog.h ircview.h tabnotifications_preferences.ui scriptlauncher.h dcctransferdetailedinfopanel.h searchbarbase.ui ignorelistviewitem.h channeloptionsui.ui dccresumedialog.h connectionsettings.h theme_preferences.h viewcontainer.h osd.h quickbuttons_preferencesui.ui dcctransferpanelitem.h identity.h logfilereader.h awaymanager.h konviface.h Makefile.in server.h konvirc.protocol log_preferences.ui konvibookmarkmenu.h servergroupdialogui.ui highlight.h unicode.cpp konversation-0.19-tabplacement.pl viewtreeitem.h urlcatcher.h konvibookmarkhandler.h nicklistview.h nickinfo.h commit.h images.h tabs_preferencesui.ui connectionbehavior_preferences.ui konversationsound.h warnings_preferencesui.ui valuelistviewitem.h konversation-0.19-appearance.pl chatwindowbehaviour_preferences.ui quickconnectdialog.h dcctransfermanager.h konversation-0.19-colorcodes.pl trayicon.h konversationapplication.h irccolorchooserui.ui guess_ja.cpp osd_preferences.h ignore_preferencesui.ui channelnick.h ircviewbox.h konversation.upd irccharsets.h theme_preferencesui.ui konvdcop.h multilinetextedit.h dcc_preferences.h konversation-0.19-sortorder.pl alias_preferencesui.ui decoder.h modebutton.h inputfilter.h serverlistview.h autoreplace_preferences.h chatwindow.h konversation-0.20-quickbuttons.pl irccolorchooser.h queuetunerbase.ui fontappearance_preferences.ui dcctransferpanel.h rawlog.h konvirc6.protocol watchednicknames_preferencesui.ui searchbar.h warnings_preferences.h dcctransfer.h channellistviewitem.h tabs_preferences.h dcccommon.h colorsappearance_preferences.ui queuetuner.h emoticon.h nick.h nicklistbehavior_preferencesui.ui multilineedit.h highlight_preferencesui.ui chatwindowappearance_preferences.ui highlightviewitem.h dccchat.h dccrecipientdialog.h quickbutton.h channellistpanel.h dcc_preferencesui.ui autoreplace_preferencesui.ui ignore.h version.h konversationmainwindow.h Makefile.am statuspanel.h konversation.desktop #>+ 4 clean-idl: -rm -f \ konviface_skel.cpp konviface_skel.h konviface.kidl -#>+ 28 +#>+ 30 clean-ui: -rm -f \ ignore_preferencesui.cpp ignore_preferencesui.h ignore_preferencesui.moc \ + channeloptionsui.cpp channeloptionsui.h channeloptionsui.moc \ dcc_preferencesui.cpp dcc_preferencesui.h dcc_preferencesui.moc \ log_preferences.cpp log_preferences.h log_preferences.moc \ tabs_preferencesui.cpp tabs_preferencesui.h tabs_preferencesui.moc \ chatwindowappearance_preferences.cpp chatwindowappearance_preferences.h chatwindowappearance_preferences.moc \ irccolorchooserui.cpp irccolorchooserui.h irccolorchooserui.moc \ colorsappearance_preferences.cpp colorsappearance_preferences.h colorsappearance_preferences.moc \ - channeloptionsui.cpp channeloptionsui.h channeloptionsui.moc \ joinchannelui.cpp joinchannelui.h joinchannelui.moc \ chatwindowbehaviour_preferences.cpp chatwindowbehaviour_preferences.h chatwindowbehaviour_preferences.moc \ alias_preferencesui.cpp alias_preferencesui.h alias_preferencesui.moc \ @@ -1786,7 +1815,9 @@ tabnotifications_preferences.cpp tabnotifications_preferences.h tabnotifications_preferences.moc \ searchbarbase.cpp searchbarbase.h searchbarbase.moc \ autoreplace_preferencesui.cpp autoreplace_preferencesui.h autoreplace_preferencesui.moc \ - servergroupdialogui.cpp servergroupdialogui.h servergroupdialogui.moc + servergroupdialogui.cpp servergroupdialogui.h servergroupdialogui.moc \ + dcctransferdetailedinfopanelui.cpp dcctransferdetailedinfopanelui.h dcctransferdetailedinfopanelui.moc \ + queuetunerbase.cpp queuetunerbase.h queuetunerbase.moc #>+ 2 docs-am: @@ -1830,11 +1861,11 @@ #>+ 11 -konversation.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/konviconfigdialog.cpp $(srcdir)/konversationstatusbar.cpp $(srcdir)/konvisettingsdialog.cpp $(srcdir)/konversationmainwindow.cpp $(srcdir)/valuelistviewitem.cpp $(srcdir)/urlcatcher.cpp $(srcdir)/scriptlauncher.cpp $(srcdir)/rawlog.cpp $(srcdir)/konvdcop.cpp $(srcdir)/channellistpanel.cpp $(srcdir)/konsolepanel.cpp $(srcdir)/identity.cpp $(srcdir)/statuspanel.cpp $(srcdir)/dccrecipientdialog.cpp $(srcdir)/topiccombobox.cpp $(srcdir)/nicksonline.cpp $(srcdir)/dccpanel.cpp $(srcdir)/dcctransfer.cpp $(srcdir)/nicklistviewitem.cpp $(srcdir)/highlight.cpp $(srcdir)/highlightviewitem.cpp $(srcdir)/modebutton.cpp $(srcdir)/ignore_preferences.cpp $(srcdir)/ignore.cpp $(srcdir)/nicklistview.cpp $(srcdir)/ircinput.cpp $(srcdir)/ignorelistviewitem.cpp $(srcdir)/images.cpp $(srcdir)/quickbutton.cpp $(srcdir)/chatwindow.cpp $(srcdir)/outputfilter.cpp $(srcdir)/query.cpp $(srcdir)/konversationapplication.cpp $(srcdir)/nick.cpp $(srcdir)/inputfilter.cpp $(srcdir)/channel.cpp $(srcdir)/ircview.cpp $(srcdir)/server.cpp $(srcdir)/main.cpp $(srcdir)/tabs_preferences.cpp $(srcdir)/irccolorchooser.cpp $(srcdir)/channellistviewitem.cpp $(srcdir)/osd.cpp $(srcdir)/trayicon.cpp $(srcdir)/dccchat.cpp $(srcdir)/logfilereader.cpp $(srcdir)/multilineedit.cpp $(srcdir)/nickinfo.cpp $(srcdir)/dccresumedialog.cpp $(srcdir)/konversationsound.cpp $(srcdir)/quickconnectdialog.cpp $(srcdir)/serverlistdialog.cpp $(srcdir)/dcctransfersend.cpp $(srcdir)/dcctransferrecv.cpp $(srcdir)/channelnick.cpp $(srcdir)/dccdetaildialog.cpp $(srcdir)/insertchardialog.cpp $(srcdir)/irccharsets.cpp $(srcdir)/editnotifydialog.cpp $(srcdir)/common.cpp $(srcdir)/serverison.cpp $(srcdir)/sslsocket.cpp $(srcdir)/servergroupsettings.cpp $(srcdir)/serversettings.cpp $(srcdir)/servergroupdialog.cpp $(srcdir)/ssllabel.cpp $(srcdir)/serverdialog.cpp $(srcdir)/channeldialog.cpp $(srcdir)/identitydialog.cpp $(srcdir)/topiclabel.cpp $(srcdir)/channeloptionsdialog.cpp $(srcdir)/notificationhandler.cpp $(srcdir)/joinchanneldialog.cpp $(srcdir)/emoticon.cpp $(srcdir)/warnings_preferences.cpp $(srcdir)/konvibookmarkhandler.cpp $(srcdir)/konvibookmarkmenu.cpp $(srcdir)/ircviewbox.cpp $(srcdir)/searchbar.cpp $(srcdir)/osd_preferences.cpp $(srcdir)/theme_preferences.cpp $(srcdir)/dcc_preferences.cpp $(srcdir)/alias_preferences.cpp $(srcdir)/highlight_preferences.cpp $(srcdir)/watchednicknames_preferences.cpp $(srcdir)/quickbuttons_preferences.cpp $(srcdir)/nicklistbehavior_preferences.cpp $(srcdir)/konviiphelper.cpp $(srcdir)/multilinetextedit.cpp $(srcdir)/serverlistview.cpp $(srcdir)/nicksonlineitem.cpp $(srcdir)/autoreplace_preferences.cpp $(srcdir)/viewcontainer.cpp $(srcdir)/viewtree.cpp $(srcdir)/viewtreeitem.cpp konviface_skel.cpp ignore_preferencesui.cpp dcc_preferencesui.cpp log_preferences.cpp tabs_preferencesui.cpp chatwindowappearance_preferences.cpp irccolorchooserui.cpp colorsappearance_preferences.cpp channeloptionsui.cpp joinchannelui.cpp chatwindowbehaviour_preferences.cpp alias_preferencesui.cpp osd_preferencesui.cpp theme_preferencesui.cpp highlight_preferencesui.cpp warnings_preferencesui.cpp quickbuttons_preferencesui.cpp watchednicknames_preferencesui.cpp generalbehavior_preferences.cpp connectionbehavior_preferences.cpp fontappearance_preferences.cpp nicklistbehavior_preferencesui.cpp tabnotifications_preferences.cpp searchbarbase.cpp autoreplace_preferencesui.cpp servergroupdialogui.cpp konviconfigdialog.moc.cpp channelnick.moc nicklistviewitem.moc theme_preferencesui.moc konvibookmarkhandler.moc serverdialog.moc ircinput.moc serverlistview.moc konsolepanel.moc dccchat.moc autoreplace_preferencesui.moc konvisettingsdialog.moc viewtree.moc dccrecipientdialog.moc serverlistdialog.moc generalbehavior_preferences.moc searchbarbase.moc tabs_preferences.moc channeloptionsui.moc konversationstatusbar.moc editnotifydialog.moc viewcontainer.moc quickbuttons_preferences.moc sslsocket.moc modebutton.moc alias_preferences.moc nicklistbehavior_preferencesui.moc nicksonline.moc dccresumedialog.moc notificationhandler.moc channel.moc nickinfo.moc channeloptionsdialog.moc outputfilter.moc quickbutton.moc dcc_preferences.moc topiccombobox.moc osd_preferences.moc fontappearance_preferences.moc watchednicknames_preferences.moc chatwindowbehaviour_preferences.moc dcc_preferencesui.moc ignore_preferences.moc konvibookmarkmenu.moc konviiphelper.moc servergroupdialog.moc alias_preferencesui.moc tabnotifications_preferences.moc konversationmainwindow.moc dcctransfersend.moc joinchanneldialog.moc trayicon.moc konversationsound.moc irccolorchooserui.moc joinchannelui.moc statuspanel.moc quickconnectdialog.moc osd_preferencesui.moc server.moc nicklistbehavior_preferences.moc images.moc ssllabel.moc warnings_preferencesui.moc dcctransferrecv.moc identitydialog.moc servergroupdialogui.moc serverison.moc log_preferences.moc osd.moc tabs_preferencesui.moc ircview.moc dccpanel.moc highlight_preferences.moc autoreplace_preferences.moc inputfilter.moc chatwindowappearance_preferences.moc insertchardialog.moc chatwindow.moc theme_preferences.moc logfilereader.moc colorsappearance_preferences.moc channellistpanel.moc quickbuttons_preferencesui.moc urlcatcher.moc konversationapplication.moc irccolorchooser.moc multilineedit.moc nicklistview.moc dcctransfer.moc topiclabel.moc searchbar.moc connectionbehavior_preferences.moc watchednicknames_preferencesui.moc multilinetextedit.moc query.moc dccdetaildialog.moc ignore_preferencesui.moc warnings_preferences.moc scriptlauncher.moc rawlog.moc ircviewbox.moc channeldialog.moc konvdcop.moc highlight_preferencesui.moc +konversation.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/konviconfigdialog.cpp $(srcdir)/konversationstatusbar.cpp $(srcdir)/konvisettingsdialog.cpp $(srcdir)/viewcontainer.cpp $(srcdir)/viewtree.cpp $(srcdir)/viewtreeitem.cpp $(srcdir)/konversationmainwindow.cpp $(srcdir)/valuelistviewitem.cpp $(srcdir)/urlcatcher.cpp $(srcdir)/scriptlauncher.cpp $(srcdir)/rawlog.cpp $(srcdir)/konvdcop.cpp $(srcdir)/channellistpanel.cpp $(srcdir)/konsolepanel.cpp $(srcdir)/identity.cpp $(srcdir)/statuspanel.cpp $(srcdir)/dccrecipientdialog.cpp $(srcdir)/topiccombobox.cpp $(srcdir)/nicksonline.cpp $(srcdir)/dcctransferpanel.cpp $(srcdir)/dcctransferpanelitem.cpp $(srcdir)/highlight.cpp $(srcdir)/highlightviewitem.cpp $(srcdir)/modebutton.cpp $(srcdir)/ignore_preferences.cpp $(srcdir)/ignore.cpp $(srcdir)/nicklistview.cpp $(srcdir)/ircinput.cpp $(srcdir)/channeloptionsdialog.cpp $(srcdir)/ignorelistviewitem.cpp $(srcdir)/images.cpp $(srcdir)/quickbutton.cpp $(srcdir)/chatwindow.cpp $(srcdir)/outputfilter.cpp $(srcdir)/logfilereader.cpp $(srcdir)/query.cpp $(srcdir)/konversationapplication.cpp $(srcdir)/nick.cpp $(srcdir)/inputfilter.cpp $(srcdir)/channel.cpp $(srcdir)/ircview.cpp $(srcdir)/server.cpp $(srcdir)/main.cpp $(srcdir)/tabs_preferences.cpp $(srcdir)/irccolorchooser.cpp $(srcdir)/channellistviewitem.cpp $(srcdir)/osd.cpp $(srcdir)/trayicon.cpp $(srcdir)/dccchat.cpp $(srcdir)/multilineedit.cpp $(srcdir)/nickinfo.cpp $(srcdir)/dccresumedialog.cpp $(srcdir)/konversationsound.cpp $(srcdir)/quickconnectdialog.cpp $(srcdir)/serverlistdialog.cpp $(srcdir)/dcctransfersend.cpp $(srcdir)/dcctransferrecv.cpp $(srcdir)/channelnick.cpp $(srcdir)/insertchardialog.cpp $(srcdir)/irccharsets.cpp $(srcdir)/editnotifydialog.cpp $(srcdir)/common.cpp $(srcdir)/serverison.cpp $(srcdir)/sslsocket.cpp $(srcdir)/servergroupsettings.cpp $(srcdir)/serversettings.cpp $(srcdir)/servergroupdialog.cpp $(srcdir)/ssllabel.cpp $(srcdir)/serverdialog.cpp $(srcdir)/channeldialog.cpp $(srcdir)/identitydialog.cpp $(srcdir)/topiclabel.cpp $(srcdir)/notificationhandler.cpp $(srcdir)/joinchanneldialog.cpp $(srcdir)/emoticon.cpp $(srcdir)/warnings_preferences.cpp $(srcdir)/konvibookmarkhandler.cpp $(srcdir)/konvibookmarkmenu.cpp $(srcdir)/ircviewbox.cpp $(srcdir)/searchbar.cpp $(srcdir)/osd_preferences.cpp $(srcdir)/theme_preferences.cpp $(srcdir)/dcc_preferences.cpp $(srcdir)/alias_preferences.cpp $(srcdir)/highlight_preferences.cpp $(srcdir)/watchednicknames_preferences.cpp $(srcdir)/quickbuttons_preferences.cpp $(srcdir)/nicklistbehavior_preferences.cpp $(srcdir)/multilinetextedit.cpp $(srcdir)/serverlistview.cpp $(srcdir)/nicksonlineitem.cpp $(srcdir)/autoreplace_preferences.cpp $(srcdir)/dcctransfer.cpp $(srcdir)/dcctransfermanager.cpp $(srcdir)/dcctransferdetailedinfopanel.cpp $(srcdir)/dcccommon.cpp $(srcdir)/queuetuner.cpp $(srcdir)/ircqueue.cpp $(srcdir)/connectionsettings.cpp $(srcdir)/connectionmanager.cpp $(srcdir)/awaymanager.cpp konviface_skel.cpp ignore_preferencesui.cpp channeloptionsui.cpp dcc_preferencesui.cpp log_preferences.cpp tabs_preferencesui.cpp chatwindowappearance_preferences.cpp irccolorchooserui.cpp colorsappearance_preferences.cpp joinchannelui.cpp chatwindowbehaviour_preferences.cpp alias_preferencesui.cpp osd_preferencesui.cpp theme_preferencesui.cpp highlight_preferencesui.cpp warnings_preferencesui.cpp quickbuttons_preferencesui.cpp watchednicknames_preferencesui.cpp generalbehavior_preferences.cpp connectionbehavior_preferences.cpp fontappearance_preferences.cpp nicklistbehavior_preferencesui.cpp tabnotifications_preferences.cpp searchbarbase.cpp autoreplace_preferencesui.cpp servergroupdialogui.cpp dcctransferdetailedinfopanelui.cpp queuetunerbase.cpp konviconfigdialog.moc.cpp dcctransferpanelitem.moc channelnick.moc theme_preferencesui.moc dcctransferdetailedinfopanel.moc serverdialog.moc konvibookmarkhandler.moc ircinput.moc konsolepanel.moc serverlistview.moc dccchat.moc autoreplace_preferencesui.moc konvisettingsdialog.moc viewtree.moc serverlistdialog.moc dccrecipientdialog.moc generalbehavior_preferences.moc searchbarbase.moc tabs_preferences.moc channeloptionsui.moc konversationstatusbar.moc viewcontainer.moc editnotifydialog.moc sslsocket.moc quickbuttons_preferences.moc modebutton.moc alias_preferences.moc nicklistbehavior_preferencesui.moc dccresumedialog.moc nicksonline.moc dcctransferdetailedinfopanelui.moc dcctransferpanel.moc notificationhandler.moc ircqueue.moc queuetuner.moc channel.moc nickinfo.moc outputfilter.moc channeloptionsdialog.moc quickbutton.moc dcctransfermanager.moc dcc_preferences.moc topiccombobox.moc osd_preferences.moc fontappearance_preferences.moc watchednicknames_preferences.moc queuetunerbase.moc chatwindowbehaviour_preferences.moc dcc_preferencesui.moc ignore_preferences.moc konvibookmarkmenu.moc servergroupdialog.moc dcctransfersend.moc konversationmainwindow.moc alias_preferencesui.moc tabnotifications_preferences.moc trayicon.moc konversationsound.moc joinchanneldialog.moc nick.moc irccolorchooserui.moc joinchannelui.moc statuspanel.moc quickconnectdialog.moc osd_preferencesui.moc nicklistbehavior_preferences.moc server.moc images.moc ssllabel.moc warnings_preferencesui.moc dcctransferrecv.moc identitydialog.moc servergroupdialogui.moc serverison.moc log_preferences.moc osd.moc tabs_preferencesui.moc ircview.moc inputfilter.moc autoreplace_preferences.moc highlight_preferences.moc chatwindowappearance_preferences.moc insertchardialog.moc chatwindow.moc theme_preferences.moc connectionmanager.moc logfilereader.moc colorsappearance_preferences.moc channellistpanel.moc awaymanager.moc quickbuttons_preferencesui.moc urlcatcher.moc konversationapplication.moc multilineedit.moc irccolorchooser.moc nicklistview.moc dcctransfer.moc topiclabel.moc searchbar.moc connectionbehavior_preferences.moc watchednicknames_preferencesui.moc multilinetextedit.moc query.moc ignore_preferencesui.moc warnings_preferences.moc scriptlauncher.moc rawlog.moc ircviewbox.moc channeldialog.moc konvdcop.moc highlight_preferencesui.moc @echo 'creating konversation.all_cpp.cpp ...'; \ rm -f konversation.all_cpp.files konversation.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> konversation.all_cpp.final; \ - for file in konviconfigdialog.cpp konversationstatusbar.cpp konvisettingsdialog.cpp konversationmainwindow.cpp valuelistviewitem.cpp urlcatcher.cpp scriptlauncher.cpp rawlog.cpp konvdcop.cpp channellistpanel.cpp konsolepanel.cpp identity.cpp statuspanel.cpp dccrecipientdialog.cpp topiccombobox.cpp nicksonline.cpp dccpanel.cpp dcctransfer.cpp nicklistviewitem.cpp highlight.cpp highlightviewitem.cpp modebutton.cpp ignore_preferences.cpp ignore.cpp nicklistview.cpp ircinput.cpp ignorelistviewitem.cpp images.cpp quickbutton.cpp chatwindow.cpp outputfilter.cpp query.cpp konversationapplication.cpp nick.cpp inputfilter.cpp channel.cpp ircview.cpp server.cpp main.cpp tabs_preferences.cpp irccolorchooser.cpp channellistviewitem.cpp osd.cpp trayicon.cpp dccchat.cpp logfilereader.cpp multilineedit.cpp nickinfo.cpp dccresumedialog.cpp konversationsound.cpp quickconnectdialog.cpp serverlistdialog.cpp dcctransfersend.cpp dcctransferrecv.cpp channelnick.cpp dccdetaildialog.cpp insertchardialog.cpp irccharsets.cpp editnotifydialog.cpp common.cpp serverison.cpp sslsocket.cpp servergroupsettings.cpp serversettings.cpp servergroupdialog.cpp ssllabel.cpp serverdialog.cpp channeldialog.cpp identitydialog.cpp topiclabel.cpp channeloptionsdialog.cpp notificationhandler.cpp joinchanneldialog.cpp emoticon.cpp warnings_preferences.cpp konvibookmarkhandler.cpp konvibookmarkmenu.cpp ircviewbox.cpp searchbar.cpp osd_preferences.cpp theme_preferences.cpp dcc_preferences.cpp alias_preferences.cpp highlight_preferences.cpp watchednicknames_preferences.cpp quickbuttons_preferences.cpp nicklistbehavior_preferences.cpp konviiphelper.cpp multilinetextedit.cpp serverlistview.cpp nicksonlineitem.cpp autoreplace_preferences.cpp viewcontainer.cpp viewtree.cpp viewtreeitem.cpp konviface_skel.cpp ignore_preferencesui.cpp dcc_preferencesui.cpp log_preferences.cpp tabs_preferencesui.cpp chatwindowappearance_preferences.cpp irccolorchooserui.cpp colorsappearance_preferences.cpp channeloptionsui.cpp joinchannelui.cpp chatwindowbehaviour_preferences.cpp alias_preferencesui.cpp osd_preferencesui.cpp theme_preferencesui.cpp highlight_preferencesui.cpp warnings_preferencesui.cpp quickbuttons_preferencesui.cpp watchednicknames_preferencesui.cpp generalbehavior_preferences.cpp connectionbehavior_preferences.cpp fontappearance_preferences.cpp nicklistbehavior_preferencesui.cpp tabnotifications_preferences.cpp searchbarbase.cpp autoreplace_preferencesui.cpp servergroupdialogui.cpp konviconfigdialog.moc.cpp ; do \ + for file in konviconfigdialog.cpp konversationstatusbar.cpp konvisettingsdialog.cpp viewcontainer.cpp viewtree.cpp viewtreeitem.cpp konversationmainwindow.cpp valuelistviewitem.cpp urlcatcher.cpp scriptlauncher.cpp rawlog.cpp konvdcop.cpp channellistpanel.cpp konsolepanel.cpp identity.cpp statuspanel.cpp dccrecipientdialog.cpp topiccombobox.cpp nicksonline.cpp dcctransferpanel.cpp dcctransferpanelitem.cpp highlight.cpp highlightviewitem.cpp modebutton.cpp ignore_preferences.cpp ignore.cpp nicklistview.cpp ircinput.cpp channeloptionsdialog.cpp ignorelistviewitem.cpp images.cpp quickbutton.cpp chatwindow.cpp outputfilter.cpp logfilereader.cpp query.cpp konversationapplication.cpp nick.cpp inputfilter.cpp channel.cpp ircview.cpp server.cpp main.cpp tabs_preferences.cpp irccolorchooser.cpp channellistviewitem.cpp osd.cpp trayicon.cpp dccchat.cpp multilineedit.cpp nickinfo.cpp dccresumedialog.cpp konversationsound.cpp quickconnectdialog.cpp serverlistdialog.cpp dcctransfersend.cpp dcctransferrecv.cpp channelnick.cpp insertchardialog.cpp irccharsets.cpp editnotifydialog.cpp common.cpp serverison.cpp sslsocket.cpp servergroupsettings.cpp serversettings.cpp servergroupdialog.cpp ssllabel.cpp serverdialog.cpp channeldialog.cpp identitydialog.cpp topiclabel.cpp notificationhandler.cpp joinchanneldialog.cpp emoticon.cpp warnings_preferences.cpp konvibookmarkhandler.cpp konvibookmarkmenu.cpp ircviewbox.cpp searchbar.cpp osd_preferences.cpp theme_preferences.cpp dcc_preferences.cpp alias_preferences.cpp highlight_preferences.cpp watchednicknames_preferences.cpp quickbuttons_preferences.cpp nicklistbehavior_preferences.cpp multilinetextedit.cpp serverlistview.cpp nicksonlineitem.cpp autoreplace_preferences.cpp dcctransfer.cpp dcctransfermanager.cpp dcctransferdetailedinfopanel.cpp dcccommon.cpp queuetuner.cpp ircqueue.cpp connectionsettings.cpp connectionmanager.cpp awaymanager.cpp konviface_skel.cpp ignore_preferencesui.cpp channeloptionsui.cpp dcc_preferencesui.cpp log_preferences.cpp tabs_preferencesui.cpp chatwindowappearance_preferences.cpp irccolorchooserui.cpp colorsappearance_preferences.cpp joinchannelui.cpp chatwindowbehaviour_preferences.cpp alias_preferencesui.cpp osd_preferencesui.cpp theme_preferencesui.cpp highlight_preferencesui.cpp warnings_preferencesui.cpp quickbuttons_preferencesui.cpp watchednicknames_preferencesui.cpp generalbehavior_preferences.cpp connectionbehavior_preferences.cpp fontappearance_preferences.cpp nicklistbehavior_preferencesui.cpp tabnotifications_preferences.cpp searchbarbase.cpp autoreplace_preferencesui.cpp servergroupdialogui.cpp dcctransferdetailedinfopanelui.cpp queuetunerbase.cpp konviconfigdialog.moc.cpp ; do \ echo "#include \"$$file\"" >> konversation.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konversation.all_cpp.final; \ done; \ @@ -1865,58 +1896,61 @@ kde-rpo-clean: -rm -f *.rpo -#>+ 280 +#>+ 298 : config/preferences_base.h -$(srcdir)/ignorelistviewitem.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/statuspanel.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/ignorelistviewitem.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/statuspanel.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h channeldialog.o: channeldialog.moc dcctransfersend.lo: dcctransfersend.moc dcc_preferences.lo: dcc_preferences.moc -$(srcdir)/nickinfo.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/nickinfo.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h chatwindow.o: chatwindow.moc servergroupdialog.lo: servergroupdialog.moc dccresumedialog.lo: dccresumedialog.moc -$(srcdir)/valuelistviewitem.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/konversationsound.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/valuelistviewitem.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/konversationsound.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h topiclabel.o: topiclabel.moc channeloptionsui.cpp: config/preferences_base.h -$(srcdir)/nicklistview.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/osd.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/nicklistview.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/osd.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h dccrecipientdialog.lo: dccrecipientdialog.moc inputfilter.lo: inputfilter.moc colorsappearance_preferences.cpp: config/preferences_base.h sslsocket.o: sslsocket.moc connectionbehavior_preferences.cpp: config/preferences_base.h -$(srcdir)/servergroupdialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/common.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/servergroupdialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/common.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h tabs_preferencesui.cpp: config/preferences_base.h -$(srcdir)/konversationstatusbar.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/konversationstatusbar.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h osd.o: osd.moc -$(srcdir)/chatwindow.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/chatwindow.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h multilinetextedit.o: multilinetextedit.moc modebutton.o: modebutton.moc irccolorchooser.o: irccolorchooser.moc konversationsound.o: konversationsound.moc log_preferences.cpp: config/preferences_base.h chatwindowbehaviour_preferences.cpp: config/preferences_base.h -$(srcdir)/dccpanel.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/connectionmanager.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h quickconnectdialog.o: quickconnectdialog.moc server.o: server.moc serverison.lo: serverison.moc konvibookmarkmenu.lo: konvibookmarkmenu.moc -$(srcdir)/nicklistbehavior_preferences.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/dcctransferpanel.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/nicklistbehavior_preferences.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h logfilereader.lo: logfilereader.moc +awaymanager.lo: awaymanager.moc +$(srcdir)/connectionsettings.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h konvisettingsdialog.lo: konvisettingsdialog.moc -$(srcdir)/dcctransfersend.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/dcctransfersend.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h searchbarbase.cpp: config/preferences_base.h dcctransfersend.o: dcctransfersend.moc -$(srcdir)/query.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/ircviewbox.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/query.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/ircviewbox.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +konvibookmarkmenu.o: konvibookmarkmenu.moc konvibookmarkhandler.o: konvibookmarkhandler.moc nickinfo.o: nickinfo.moc -konvibookmarkmenu.o: konvibookmarkmenu.moc konvibookmarkhandler.lo: konvibookmarkhandler.moc -$(srcdir)/emoticon.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/emoticon.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h ignore_preferences.lo: ignore_preferences.moc channeloptionsdialog.lo: channeloptionsdialog.moc identitydialog.lo: identitydialog.moc @@ -1926,38 +1960,38 @@ dcctransferrecv.lo: dcctransferrecv.moc ircviewbox.lo: ircviewbox.moc trayicon.o: trayicon.moc -konviiphelper.lo: konviiphelper.moc -$(srcdir)/konvibookmarkmenu.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/quickconnectdialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/konvibookmarkmenu.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/quickconnectdialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h topiclabel.lo: topiclabel.moc autoreplace_preferences.o: autoreplace_preferences.moc joinchanneldialog.lo: joinchanneldialog.moc theme_preferences.lo: theme_preferences.moc konversationmainwindow.lo: konversationmainwindow.moc modebutton.lo: modebutton.moc +queuetuner.lo: queuetuner.moc highlight_preferences.lo: highlight_preferences.moc konsolepanel.o: konsolepanel.moc dcctransfer.lo: dcctransfer.moc -ircview.lo: ircview.moc nicklistview.o: nicklistview.moc +ircview.lo: ircview.moc servergroupdialogui.cpp: config/preferences_base.h -$(srcdir)/main.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/main.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h dccchat.o: dccchat.moc +dcctransferdetailedinfopanelui.cpp: config/preferences_base.h viewtree.lo: viewtree.moc +$(srcdir)/dcctransfermanager.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h notificationhandler.o: notificationhandler.moc ssllabel.lo: ssllabel.moc -$(srcdir)/channelnick.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -nicklistviewitem.lo: nicklistviewitem.moc -$(srcdir)/konvisettingsdialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/konversationapplication.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/channelnick.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/konvisettingsdialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/konversationapplication.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h channellistpanel.o: channellistpanel.moc -$(srcdir)/dccresumedialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/dccresumedialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h watchednicknames_preferences.o: watchednicknames_preferences.moc -$(srcdir)/konviiphelper.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/warnings_preferences.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/autoreplace_preferences.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/multilinetextedit.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/viewtreeitem.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/warnings_preferences.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/autoreplace_preferences.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/multilinetextedit.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/viewtreeitem.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h quickbuttons_preferences.lo: quickbuttons_preferences.moc ircview.o: ircview.moc dccchat.lo: dccchat.moc @@ -1972,37 +2006,41 @@ serverdialog.o: serverdialog.moc nicksonline.lo: nicksonline.moc quickconnectdialog.lo: quickconnectdialog.moc -$(srcdir)/dcctransfer.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/ircqueue.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/dcctransfer.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h serverdialog.lo: serverdialog.moc searchbar.lo: searchbar.moc -$(srcdir)/notificationhandler.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/notificationhandler.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +queuetuner.o: queuetuner.moc +ircqueue.lo: ircqueue.moc irccolorchooserui.cpp: config/preferences_base.h -$(srcdir)/ircinput.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/ircinput.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h rawlog.o: rawlog.moc dccresumedialog.o: dccresumedialog.moc logfilereader.o: logfilereader.moc -$(srcdir)/konvibookmarkhandler.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/konvibookmarkhandler.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h ssllabel.o: ssllabel.moc -$(srcdir)/highlight.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/osd_preferences.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/irccolorchooser.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/highlight.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/dcctransferpanelitem.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/osd_preferences.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/irccolorchooser.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h notificationhandler.lo: notificationhandler.moc images.o: images.moc -$(srcdir)/ignore.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/ignore.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h osd_preferencesui.cpp: config/preferences_base.h viewtree.o: viewtree.moc -$(srcdir)/highlightviewitem.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/highlightviewitem.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h urlcatcher.o: urlcatcher.moc highlight_preferences.o: highlight_preferences.moc theme_preferences.o: theme_preferences.moc -$(srcdir)/channellistviewitem.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/serversettings.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/channellistviewitem.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/serversettings.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h query.lo: query.moc konversationapplication.lo: konversationapplication.moc konsolepanel.lo: konsolepanel.moc sslsocket.lo: sslsocket.moc -$(srcdir)/insertchardialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/alias_preferences.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/insertchardialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/alias_preferences.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h insertchardialog.lo: insertchardialog.moc dcc_preferencesui.cpp: config/preferences_base.h konversationmainwindow.o: konversationmainwindow.moc @@ -2010,114 +2048,121 @@ urlcatcher.lo: urlcatcher.moc joinchannelui.cpp: config/preferences_base.h dcc_preferences.o: dcc_preferences.moc -$(srcdir)/serverison.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/konsolepanel.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/serverison.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/konsolepanel.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h channelnick.lo: channelnick.moc dcctransferrecv.o: dcctransferrecv.moc +$(srcdir)/queuetuner.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h watchednicknames_preferencesui.cpp: config/preferences_base.h -$(srcdir)/quickbutton.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/quickbutton.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h fontappearance_preferences.cpp: config/preferences_base.h -$(srcdir)/topiccombobox.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/topiccombobox.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +queuetunerbase.cpp: config/preferences_base.h osd_preferences.lo: osd_preferences.moc nmcheck-am: nmcheck serverison.o: serverison.moc -$(srcdir)/dccchat.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/dccchat.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h tabnotifications_preferences.cpp: config/preferences_base.h warnings_preferences.lo: warnings_preferences.moc -$(srcdir)/multilineedit.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/multilineedit.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h dcctransfer.o: dcctransfer.moc -$(srcdir)/ssllabel.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/ssllabel.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h konvdcop.o: konvdcop.moc -$(srcdir)/trayicon.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/sslsocket.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/trayicon.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/sslsocket.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h statuspanel.lo: statuspanel.moc -$(srcdir)/images.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/images.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h viewcontainer.o: viewcontainer.moc -dccdetaildialog.o: dccdetaildialog.moc nickinfo.lo: nickinfo.moc scriptlauncher.o: scriptlauncher.moc autoreplace_preferencesui.cpp: config/preferences_base.h -$(srcdir)/ignore_preferences.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +dcctransferdetailedinfopanel.o: dcctransferdetailedinfopanel.moc +$(srcdir)/ignore_preferences.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/awaymanager.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h serverlistdialog.lo: serverlistdialog.moc channeloptionsdialog.o: channeloptionsdialog.moc -$(srcdir)/tabs_preferences.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/outputfilter.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/tabs_preferences.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/outputfilter.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h chatwindow.lo: chatwindow.moc -dccdetaildialog.lo: dccdetaildialog.moc -$(srcdir)/dccrecipientdialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/dccrecipientdialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h warnings_preferences.o: warnings_preferences.moc -$(srcdir)/konviconfigdialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/channel.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/konviconfigdialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/channel.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/dcctransferdetailedinfopanel.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h watchednicknames_preferences.lo: watchednicknames_preferences.moc konvdcop.lo: konvdcop.moc -$(srcdir)/serverdialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/serverdialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h osd_preferences.o: osd_preferences.moc -$(srcdir)/serverlistview.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/serverlistview.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h multilinetextedit.lo: multilinetextedit.moc nicklistbehavior_preferences.o: nicklistbehavior_preferences.moc +dcctransferpanel.lo: dcctransferpanel.moc inputfilter.o: inputfilter.moc -$(srcdir)/nick.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/nick.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h nicklistbehavior_preferencesui.cpp: config/preferences_base.h channeldialog.lo: channeldialog.moc ircinput.o: ircinput.moc -$(srcdir)/theme_preferences.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/dcctransferrecv.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/theme_preferences.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/dcctransferrecv.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h topiccombobox.o: topiccombobox.moc -$(srcdir)/konversationmainwindow.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/irccharsets.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/konversationmainwindow.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/irccharsets.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h highlight_preferencesui.cpp: config/preferences_base.h -dccpanel.o: dccpanel.moc +$(srcdir)/viewtree.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +dcctransferpanel.o: dcctransferpanel.moc channellistpanel.lo: channellistpanel.moc -$(srcdir)/viewtree.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/nicksonline.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/channeloptionsdialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +dcctransferpanelitem.lo: dcctransferpanelitem.moc +$(srcdir)/nicksonline.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/channeloptionsdialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +ircqueue.o: ircqueue.moc images.lo: images.moc +connectionmanager.lo: connectionmanager.moc quickbutton.lo: quickbutton.moc server.lo: server.moc -$(srcdir)/urlcatcher.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/urlcatcher.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h konvisettingsdialog.o: konvisettingsdialog.moc warnings_preferencesui.cpp: config/preferences_base.h outputfilter.lo: outputfilter.moc -$(srcdir)/watchednicknames_preferences.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/watchednicknames_preferences.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h multilineedit.lo: multilineedit.moc -$(srcdir)/editnotifydialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -dccpanel.lo: dccpanel.moc +$(srcdir)/editnotifydialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h quickbuttons_preferences.o: quickbuttons_preferences.moc -$(srcdir)/server.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/topiclabel.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/modebutton.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +nick.lo: nick.moc +dcctransfermanager.lo: dcctransfermanager.moc +$(srcdir)/server.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/topiclabel.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/modebutton.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h konversationstatusbar.lo: konversationstatusbar.moc -$(srcdir)/searchbar.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/searchbar.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h tabs_preferences.lo: tabs_preferences.moc -$(srcdir)/quickbuttons_preferences.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/ircview.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -konviiphelper.o: konviiphelper.moc -konversationapplication.o: konversationapplication.moc +$(srcdir)/quickbuttons_preferences.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/ircview.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h servergroupdialog.o: servergroupdialog.moc -nicklistviewitem.o: nicklistviewitem.moc +konversationapplication.o: konversationapplication.moc +dcctransferdetailedinfopanel.lo: dcctransferdetailedinfopanel.moc irccolorchooser.lo: irccolorchooser.moc -$(srcdir)/inputfilter.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/identitydialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/channellistpanel.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/logfilereader.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/konvdcop.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/joinchanneldialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/inputfilter.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/identitydialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +awaymanager.o: awaymanager.moc +$(srcdir)/channellistpanel.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/logfilereader.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/konvdcop.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/joinchanneldialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h quickbutton.o: quickbutton.moc -$(srcdir)/serverlistdialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/serverlistdialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h serverlistview.o: serverlistview.moc quickbuttons_preferencesui.cpp: config/preferences_base.h serverlistdialog.o: serverlistdialog.moc -$(srcdir)/dccdetaildialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/viewcontainer.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/nicklistviewitem.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/viewcontainer.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +connectionmanager.o: connectionmanager.moc editnotifydialog.lo: editnotifydialog.moc -$(srcdir)/dcc_preferences.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/dcc_preferences.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h editnotifydialog.o: editnotifydialog.moc tabs_preferences.o: tabs_preferences.moc -$(srcdir)/nicksonlineitem.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/nicksonlineitem.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h chatwindowappearance_preferences.cpp: config/preferences_base.h -$(srcdir)/channeldialog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/rawlog.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/channeldialog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/rawlog.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h ignore_preferences.o: ignore_preferences.moc serverlistview.lo: serverlistview.moc alias_preferences.o: alias_preferences.moc @@ -2127,8 +2172,8 @@ channel.o: channel.moc identitydialog.o: identitydialog.moc outputfilter.o: outputfilter.moc -$(srcdir)/highlight_preferences.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h -$(srcdir)/identity.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/highlight_preferences.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h +$(srcdir)/identity.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h osd.lo: osd.moc multilineedit.o: multilineedit.moc dccrecipientdialog.o: dccrecipientdialog.moc @@ -2137,16 +2182,20 @@ alias_preferences.lo: alias_preferences.moc nicklistview.lo: nicklistview.moc alias_preferencesui.cpp: config/preferences_base.h -$(srcdir)/servergroupsettings.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/servergroupsettings.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h konversationsound.lo: konversationsound.moc +dcctransfermanager.o: dcctransfermanager.moc viewcontainer.lo: viewcontainer.moc nicksonline.o: nicksonline.moc +$(srcdir)/dcccommon.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h searchbar.o: searchbar.moc -$(srcdir)/scriptlauncher.cpp: ignore_preferencesui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h channeloptionsui.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h config/preferences_base.h +$(srcdir)/scriptlauncher.cpp: ignore_preferencesui.h channeloptionsui.h dcc_preferencesui.h log_preferences.h tabs_preferencesui.h chatwindowappearance_preferences.h irccolorchooserui.h colorsappearance_preferences.h joinchannelui.h chatwindowbehaviour_preferences.h alias_preferencesui.h osd_preferencesui.h theme_preferencesui.h highlight_preferencesui.h warnings_preferencesui.h quickbuttons_preferencesui.h watchednicknames_preferencesui.h generalbehavior_preferences.h connectionbehavior_preferences.h fontappearance_preferences.h nicklistbehavior_preferencesui.h tabnotifications_preferences.h searchbarbase.h autoreplace_preferencesui.h servergroupdialogui.h dcctransferdetailedinfopanelui.h queuetunerbase.h config/preferences_base.h joinchanneldialog.o: joinchanneldialog.moc generalbehavior_preferences.cpp: config/preferences_base.h +nick.o: nick.moc +dcctransferpanelitem.o: dcctransferpanelitem.moc -#>+ 375 +#>+ 405 theme_preferencesui.cpp: $(srcdir)/theme_preferencesui.ui theme_preferencesui.h theme_preferencesui.moc rm -f theme_preferencesui.cpp echo '#include ' > theme_preferencesui.cpp @@ -2267,6 +2316,21 @@ highlight_preferencesui.moc: highlight_preferencesui.h $(MOC) highlight_preferencesui.h -o highlight_preferencesui.moc +dcctransferdetailedinfopanelui.cpp: $(srcdir)/dcctransferdetailedinfopanelui.ui dcctransferdetailedinfopanelui.h dcctransferdetailedinfopanelui.moc + rm -f dcctransferdetailedinfopanelui.cpp + echo '#include ' > dcctransferdetailedinfopanelui.cpp + echo '#include ' >> dcctransferdetailedinfopanelui.cpp + $(UIC) -tr ${UIC_TR} -i dcctransferdetailedinfopanelui.h $(srcdir)/dcctransferdetailedinfopanelui.ui > dcctransferdetailedinfopanelui.cpp.temp ; ret=$$?; \ + $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" dcctransferdetailedinfopanelui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_dcctransferdetailedinfopanelui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> dcctransferdetailedinfopanelui.cpp ;\ + rm -f dcctransferdetailedinfopanelui.cpp.temp ;\ + if test "$$ret" = 0; then echo '#include "dcctransferdetailedinfopanelui.moc"' >> dcctransferdetailedinfopanelui.cpp; else rm -f dcctransferdetailedinfopanelui.cpp ; exit $$ret ; fi + +dcctransferdetailedinfopanelui.h: $(srcdir)/dcctransferdetailedinfopanelui.ui + rm -rf dcctransferdetailedinfopanelui.h; + $(UIC) $(srcdir)/dcctransferdetailedinfopanelui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include ,#include ,g" >> dcctransferdetailedinfopanelui.h ; +dcctransferdetailedinfopanelui.moc: dcctransferdetailedinfopanelui.h + $(MOC) dcctransferdetailedinfopanelui.h -o dcctransferdetailedinfopanelui.moc + channeloptionsui.cpp: $(srcdir)/channeloptionsui.ui channeloptionsui.h channeloptionsui.moc rm -f channeloptionsui.cpp echo '#include ' > channeloptionsui.cpp @@ -2282,6 +2346,21 @@ channeloptionsui.moc: channeloptionsui.h $(MOC) channeloptionsui.h -o channeloptionsui.moc +queuetunerbase.cpp: $(srcdir)/queuetunerbase.ui queuetunerbase.h queuetunerbase.moc + rm -f queuetunerbase.cpp + echo '#include ' > queuetunerbase.cpp + echo '#include ' >> queuetunerbase.cpp + $(UIC) -tr ${UIC_TR} -i queuetunerbase.h $(srcdir)/queuetunerbase.ui > queuetunerbase.cpp.temp ; ret=$$?; \ + $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" queuetunerbase.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_queuetunerbase,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> queuetunerbase.cpp ;\ + rm -f queuetunerbase.cpp.temp ;\ + if test "$$ret" = 0; then echo '#include "queuetunerbase.moc"' >> queuetunerbase.cpp; else rm -f queuetunerbase.cpp ; exit $$ret ; fi + +queuetunerbase.h: $(srcdir)/queuetunerbase.ui + rm -rf queuetunerbase.h; + $(UIC) $(srcdir)/queuetunerbase.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include ,#include ,g" >> queuetunerbase.h ; +queuetunerbase.moc: queuetunerbase.h + $(MOC) queuetunerbase.h -o queuetunerbase.moc + searchbarbase.cpp: $(srcdir)/searchbarbase.ui searchbarbase.h searchbarbase.moc rm -f searchbarbase.cpp echo '#include ' > searchbarbase.cpp diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/modebutton.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/modebutton.cpp --- konversation-1.0.1/konversation/src/modebutton.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/modebutton.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -13,6 +13,7 @@ #include "modebutton.h" + ModeButton::ModeButton(const QString& label,QWidget* parent,int newId) : QPushButton::QPushButton(label,parent) { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/modebutton.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/modebutton.h --- konversation-1.0.1/konversation/src/modebutton.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/modebutton.h 2008-08-06 16:56:27.000000000 +0100 @@ -16,9 +16,6 @@ #include -/* - @author Dario Abatianni -*/ class ModeButton : public QPushButton { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/multilineedit.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/multilineedit.cpp --- konversation-1.0.1/konversation/src/multilineedit.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/multilineedit.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -9,13 +9,14 @@ Copyright (C) 2006 Dario Abatianni */ +#include "multilineedit.h" +#include "multilinetextedit.h" +#include "konversationapplication.h" + #include #include -#include "multilineedit.h" -#include "multilinetextedit.h" -#include "konversationapplication.h" QString MultilineEdit::returnText; // static diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/multilineedit.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/multilineedit.h --- konversation-1.0.1/konversation/src/multilineedit.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/multilineedit.h 2008-08-06 16:56:27.000000000 +0100 @@ -14,9 +14,6 @@ #include -/* - @author Dario Abatianni -*/ class QWidget; class MultilineTextEdit; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/multilinetextedit.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/multilinetextedit.cpp --- konversation-1.0.1/konversation/src/multilinetextedit.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/multilinetextedit.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -9,12 +9,13 @@ Copyright (C) 2006 Dario Abatianni */ +#include "multilinetextedit.h" + #include #include #include -#include "multilinetextedit.h" MultilineTextEdit::MultilineTextEdit(QWidget* parent,const char* name) : QTextEdit(parent,name) { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/multilinetextedit.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/multilinetextedit.h --- konversation-1.0.1/konversation/src/multilinetextedit.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/multilinetextedit.h 2008-08-06 16:56:27.000000000 +0100 @@ -14,31 +14,28 @@ #include -/** - @author Dario Abatianni and the kbabel Team -*/ class QPaintEvent; class QWheelEvent; class MultilineTextEdit : public QTextEdit { - Q_OBJECT + Q_OBJECT - public: - MultilineTextEdit(QWidget* parent=0,const char* name=0); - ~MultilineTextEdit(); - - protected slots: - void drawWhitespaces(); - void cursorChanged(int,int); - - protected: - // reimplemented - virtual void drawContents(QPainter* p,int clipx,int clipy,int clipw,int cliph); + public: + explicit MultilineTextEdit(QWidget* parent=0,const char* name=0); + ~MultilineTextEdit(); + + protected slots: + void drawWhitespaces(); + void cursorChanged(int,int); + + protected: + // reimplemented + virtual void drawContents(QPainter* p,int clipx,int clipy,int clipw,int cliph); - // the stuff below is copied from kbabel. Thanks, guys! - QRect mapToView(int paragraph,int index); + // the stuff below is copied from kbabel. Thanks, guys! + QRect mapToView(int paragraph,int index); }; #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nick.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nick.cpp --- konversation-1.0.1/konversation/src/nick.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nick.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -11,88 +11,252 @@ email: eisfuchs@tigress.com */ -#include -#include - -#include "nicklistviewitem.h" #include "nick.h" #include "addressbook.h" -#include + #include + +#include +#include +#include #include +#include "konversationapplication.h" +#include "preferences.h" + Nick::Nick(KListView *listView, const ChannelNickPtr& channelnick) + : QObject (), + KListViewItem (listView, listView->lastItem(), QString::null, + channelnick->getNickname(), channelnick->getHostmask()) { + m_channelnickptr = channelnick; + Q_ASSERT(channelnick); if(!channelnick) return; - channelnickptr = channelnick; - listViewItem=new NickListViewItem(listView,listView->lastItem(), - channelnick->getNickname(),channelnick->getHostmask(),this); + m_flags = 0; + m_height = height(); - QObject::connect(listViewItem,SIGNAL(refreshed()),listView,SLOT(startResortTimer())); -} + refresh(); -Nick::~Nick() -{ - delete listViewItem; + connect(this, SIGNAL(refreshed()), listView, SLOT(startResortTimer())); + connect(getChannelNick(), SIGNAL(channelNickChanged()), SLOT(refresh())); + connect(getChannelNick()->getNickInfo(), SIGNAL(nickInfoChanged()), SLOT(refresh())); } -bool Nick::isAdmin() const -{ - return channelnickptr->isAdmin(); -} - -bool Nick::isOwner() const -{ - return channelnickptr->isOwner(); -} - -bool Nick::isOp() const -{ - return channelnickptr->isOp(); -} - -bool Nick::isHalfop() const -{ - return channelnickptr->isHalfOp(); -} - -bool Nick::hasVoice() const -{ - return channelnickptr->hasVoice(); -} - -NickInfoPtr Nick::getNickInfo() const +Nick::~Nick() { - Q_ASSERT(channelnickptr); - if(!channelnickptr) return NULL; - return channelnickptr->getNickInfo(); } ChannelNickPtr Nick::getChannelNick() const { - Q_ASSERT(channelnickptr); - return channelnickptr; + Q_ASSERT(m_channelnickptr); + return m_channelnickptr; } -QString Nick::getNickname() const +void Nick::refresh() { - return channelnickptr->getNickname(); -} + int flags = 0; + NickInfo* nickInfo = getChannelNick()->getNickInfo(); + bool away = false; + + if ( nickInfo ) + away = nickInfo->isAway(); + + if(away) + flags=1; + + Images* images = KonversationApplication::instance()->images(); + QPixmap icon; + + if ( getChannelNick()->isOwner() ) + { + flags += 64; + icon = images->getNickIcon( Images::Owner, away ); + } + else if ( getChannelNick()->isAdmin() ) + { + flags += 128; + icon = images->getNickIcon( Images::Admin, away ); + } + else if ( getChannelNick()->isOp() ) + { + flags += 32; + icon = images->getNickIcon( Images::Op, away ); + } + else if ( getChannelNick()->isHalfOp() ) + { + flags += 16; + icon = images->getNickIcon( Images::HalfOp, away ); + } + else if ( getChannelNick()->hasVoice() ) + { + flags += 8; + icon = images->getNickIcon( Images::Voice, away ); + } + else + { + flags += 4; + icon = images->getNickIcon( Images::Normal, away ); + } + + setPixmap( 0, icon ); + + KABC::Picture pic = nickInfo->getAddressee().photo(); + + if(!pic.isIntern()) + { + pic = nickInfo->getAddressee().logo(); + } + + if(pic.isIntern()) + { + QPixmap qpixmap(pic.data().scaleHeight(m_height)); + setPixmap(1,qpixmap); + } + + QString newtext1 = calculateLabel1(); + if(newtext1 != text(1)) + { + setText(1, newtext1); + flags += 2; + } + + setText(2, calculateLabel2()); + repaint(); + + if(m_flags != flags) + { + m_flags = flags; + emit refreshed(); // Resort nick list + } +} + +QString Nick::calculateLabel1() +{ + NickInfoPtr nickinfo = getChannelNick()->getNickInfo(); + KABC::Addressee addressee = nickinfo->getAddressee(); + + if(!addressee.realName().isEmpty()) //if no addressee, realName will be empty + { + return nickinfo->getNickname() + " (" + addressee.realName() + ')'; + } + else if(Preferences::showRealNames() && !nickinfo->getRealName().isEmpty()) + { + return nickinfo->getNickname() + " (" + nickinfo->getRealName() + ')'; + } + + return nickinfo->getNickname(); +} + +QString Nick::calculateLabel2() +{ + return getChannelNick()->getNickInfo()->getHostmask(); +} + +int Nick::compare(QListViewItem* item,int col,bool ascending) const +{ + Nick* otherItem = static_cast(item); + + if(Preferences::sortByActivity()) + { + uint thisRecentActivity = getChannelNick()->recentActivity(); + uint otherRecentActivity = otherItem->getChannelNick()->recentActivity(); + if(thisRecentActivity > otherRecentActivity) + { + return -1; + } + if(thisRecentActivity < otherRecentActivity) + { + return 1; + } + uint thisTimestamp = getChannelNick()->timeStamp(); + uint otherTimestamp = otherItem->getChannelNick()->timeStamp(); + if(thisTimestamp > otherTimestamp) + { + return -1; + } + if(thisTimestamp < otherTimestamp) + { + return 1; + } + } + + if(Preferences::sortByStatus()) + { + int thisFlags = getSortingValue(); + int otherFlags = otherItem->getSortingValue(); + + if(thisFlags > otherFlags) + { + return 1; + } + if(thisFlags < otherFlags) + { + return -1; + } + } + + QString thisKey; + QString otherKey; + + if(col > 1) //the reason we need this: enabling hostnames adds another column + { + if(Preferences::sortCaseInsensitive()) + { + thisKey = thisKey.lower(); + otherKey = otherKey.lower(); + } + else + { + thisKey = key(col, ascending); + otherKey = otherItem->key(col, ascending); + } + } + else if(col == 1) + { + if(Preferences::sortCaseInsensitive()) + { + thisKey = getChannelNick()->loweredNickname(); + otherKey = otherItem->getChannelNick()->loweredNickname(); + } + else + { + thisKey = key(col, ascending); + otherKey = otherItem->key(col, ascending); + } + } + + return thisKey.compare(otherKey); +} + +void Nick::paintCell(QPainter * p, const QColorGroup & cg, int column, int width, int align ) +{ + QColorGroup cg2 = cg; + NickInfo* nickInfo = getChannelNick()->getNickInfo(); + + if(nickInfo->isAway()) + { + cg2.setColor(QColorGroup::Text, kapp->palette(listView()).disabled().text()); + } + + KListViewItem::paintCell(p,cg2,column,width,align); +} + +int Nick::getSortingValue() const +{ + int flags; + QString sortingOrder = Preferences::sortOrder(); + + if(getChannelNick()->isOwner()) flags=sortingOrder.find('q'); + else if(getChannelNick()->isAdmin()) flags=sortingOrder.find('p'); + else if(getChannelNick()->isOp() ) flags=sortingOrder.find('o'); + else if(getChannelNick()->isHalfOp()) flags=sortingOrder.find('h'); + else if(getChannelNick()->hasVoice()) flags=sortingOrder.find('v'); + else flags=sortingOrder.find('-'); -QString Nick::getHostmask() const -{ - return channelnickptr->getHostmask(); + return flags; } -bool Nick::isSelected() const -{ - return listViewItem->isSelected(); -} - -QString Nick::loweredNickname() const -{ - return channelnickptr->loweredNickname(); -} +#include "nick.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nick.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nick.h --- konversation-1.0.1/konversation/src/nick.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nick.h 2008-08-06 16:56:27.000000000 +0100 @@ -8,44 +8,48 @@ /* begin: Fri Jan 25 2002 copyright: (C) 2002 by Dario Abatianni + (C) 2007 Peter Simonsson email: eisfuchs@tigress.com */ #ifndef NICK_H #define NICK_H -/* - @author Dario Abatianni -*/ +#include +#include #include "channelnick.h" -class KListView; -class NickListViewItem; - -class Nick +class Nick : public QObject, public KListViewItem { + Q_OBJECT public: Nick(KListView *listView, const ChannelNickPtr& channelnick); ~Nick(); - bool isAdmin() const; - bool isOwner() const; - bool isOp() const; - bool isHalfop() const; - bool hasVoice() const; - - bool isSelected() const; - - QString getNickname() const; - QString loweredNickname() const; - QString getHostmask() const; - NickInfoPtr getNickInfo() const; ChannelNickPtr getChannelNick() const; + int getSortingValue() const; + + virtual void paintCell(QPainter * p, const QColorGroup & cg, int column, int width, int align); + virtual int compare(QListViewItem* item,int col,bool ascending) const; + + public slots: + void refresh(); + + signals: + void refreshed(); + + protected: + QString calculateLabel1(); + QString calculateLabel2(); protected: - ChannelNickPtr channelnickptr; - NickListViewItem* listViewItem; + ChannelNickPtr m_channelnickptr; + + QString label; + int m_height; + int m_flags; + bool m_away; }; #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nickinfo.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nickinfo.cpp --- konversation-1.0.1/konversation/src/nickinfo.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nickinfo.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,31 +12,28 @@ email: garycramblitt@comcast.net */ -#include "nickinfo.h" - -#include -#include "server.h" -#include +/* + The NickInfo object is a data container for information about a single nickname. + It is owned by the Server object and should NOT be deleted by anything other than Server. + Store a pointer to this with NickInfoPtr +*/ +#include "nickinfo.h" #include "konversationapplication.h" #include "linkaddressbook/addressbook.h" #include "linkaddressbook/linkaddressbookui.h" #include "konversationmainwindow.h" #include "viewcontainer.h" +#include "server.h" -/* - @author Gary Cramblitt -*/ +#include + +#include -/* - The NickInfo object is a data container for information about a single nickname. - It is owned by the Server object and should NOT be deleted by anything other than Server. - Store a pointer to this with NickInfoPtr -*/ NickInfo::NickInfo(const QString& nick, Server* server): KShared() { - m_addressee=Konversation::Addressbook::self()->getKABCAddresseeFromNick(nick, server->getServerName(), server->getServerGroup()); + m_addressee=Konversation::Addressbook::self()->getKABCAddresseeFromNick(nick, server->getServerName(), server->getDisplayName()); m_nickname = nick; m_loweredNickname = nick.lower(); m_owningServer = server; @@ -121,17 +118,17 @@ Q_ASSERT(!newNickname.isEmpty()); if(newNickname == m_nickname) return; - KABC::Addressee newaddressee = Konversation::Addressbook::self()->getKABCAddresseeFromNick(newNickname, m_owningServer->getServerName(), m_owningServer->getServerGroup()); + KABC::Addressee newaddressee = Konversation::Addressbook::self()->getKABCAddresseeFromNick(newNickname, m_owningServer->getServerName(), m_owningServer->getDisplayName()); //We now know who this person is if(m_addressee.isEmpty() && !newaddressee.isEmpty()) { //Associate the old nickname with new contact - Konversation::Addressbook::self()->associateNick(newaddressee,m_nickname, m_owningServer->getServerName(), m_owningServer->getServerGroup()); + Konversation::Addressbook::self()->associateNick(newaddressee,m_nickname, m_owningServer->getServerName(), m_owningServer->getDisplayName()); Konversation::Addressbook::self()->saveAddressee(newaddressee); } else if(!m_addressee.isEmpty() && newaddressee.isEmpty()) { - Konversation::Addressbook::self()->associateNick(m_addressee, newNickname, m_owningServer->getServerName(), m_owningServer->getServerGroup()); + Konversation::Addressbook::self()->associateNick(m_addressee, newNickname, m_owningServer->getServerName(), m_owningServer->getDisplayName()); Konversation::Addressbook::self()->saveAddressee(newaddressee); newaddressee = m_addressee; } @@ -245,7 +242,7 @@ void NickInfo::refreshAddressee() { //m_addressee might not have changed, but information inside it may have. - KABC::Addressee addressee=Konversation::Addressbook::self()->getKABCAddresseeFromNick(m_nickname, m_owningServer->getServerName(), m_owningServer->getServerGroup()); + KABC::Addressee addressee=Konversation::Addressbook::self()->getKABCAddresseeFromNick(m_nickname, m_owningServer->getServerName(), m_owningServer->getDisplayName()); if(!addressee.isEmpty() && addressee.uid() != m_addressee.uid()) { //This nick now belongs to a different addressee. We need to update the status for both the old and new addressees. @@ -282,7 +279,7 @@ { return m_addressee.realName(); } - else if(!getRealName().isEmpty() && getRealName().lower() != loweredNickname()) + else if(!getRealName().isEmpty()) { return getRealName(); } @@ -414,7 +411,7 @@ void NickInfo::showLinkAddressbookUI() { - LinkAddressbookUI *linkaddressbookui = new LinkAddressbookUI(m_owningServer->getViewContainer()->getWindow(), NULL, m_nickname, m_owningServer->getServerName(), m_owningServer->getServerGroup(), m_realName); + LinkAddressbookUI *linkaddressbookui = new LinkAddressbookUI(m_owningServer->getViewContainer()->getWindow(), NULL, m_nickname, m_owningServer->getServerName(), m_owningServer->getDisplayName(), m_realName); linkaddressbookui->show(); } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nickinfo.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nickinfo.h --- konversation-1.0.1/konversation/src/nickinfo.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nickinfo.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,16 +15,13 @@ #ifndef NICKINFO_H #define NICKINFO_H -/* - @author Gary Cramblitt -*/ - #include #include #include #include + class Server; class QTimer; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nicklistbehavior_preferences.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nicklistbehavior_preferences.cpp --- konversation-1.0.1/konversation/src/nicklistbehavior_preferences.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nicklistbehavior_preferences.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -8,19 +8,18 @@ /* Copyright (C) 2006 Dario Abatianni Copyright (C) 2006 John Tapsell - Copyright (C) 2006 Eike Hein + Copyright (C) 2006 Eike Hein */ +#include "nicklistbehavior_preferences.h" +#include "valuelistviewitem.h" +#include "config/preferences.h" + #include #include #include -#include "valuelistviewitem.h" - -#include "config/preferences.h" - -#include "nicklistbehavior_preferences.h" NicklistBehavior_Config::NicklistBehavior_Config(QWidget *parent, const char *name) : NicklistBehavior_ConfigUI(parent, name) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nicklistbehavior_preferences.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nicklistbehavior_preferences.h --- konversation-1.0.1/konversation/src/nicklistbehavior_preferences.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nicklistbehavior_preferences.h 2008-08-06 16:56:27.000000000 +0100 @@ -13,37 +13,34 @@ #ifndef NICKLISTBEHAVIOR_Config_H #define NICKLISTBEHAVIOR_Config_H -#include #include "konvisettingspage.h" #include "nicklistbehavior_preferencesui.h" -/** - @author Dario Abatianni - */ +#include + class NicklistBehavior_Config : public NicklistBehavior_ConfigUI, public KonviSettingsPage { - Q_OBJECT - - public: - NicklistBehavior_Config(QWidget *parent = 0, const char *name = 0); - ~NicklistBehavior_Config(); + Q_OBJECT - virtual void saveSettings(); - virtual void loadSettings(); - virtual void restorePageToDefaults(); + public: + explicit NicklistBehavior_Config(QWidget *parent = 0, const char *name = 0); + ~NicklistBehavior_Config(); - virtual bool hasChanged(); + virtual void saveSettings(); + virtual void loadSettings(); + virtual void restorePageToDefaults(); - private: - void setNickList(const QString &sortingOrder); - QString currentSortingOrder(); + virtual bool hasChanged(); - QString m_oldSortingOrder; + private: + void setNickList(const QString &sortingOrder); + QString currentSortingOrder(); - signals: - void modified(); + QString m_oldSortingOrder; + signals: + void modified(); }; #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nicklistbehavior_preferencesui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nicklistbehavior_preferencesui.ui --- konversation-1.0.1/konversation/src/nicklistbehavior_preferencesui.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nicklistbehavior_preferencesui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -44,7 +44,15 @@ Sort case &insensitive - + + + kcfg_SortByActivity + + + Sort by &activity + + + kcfg_SortByStatus @@ -60,7 +68,7 @@ Sort b&y user status - + Mode @@ -110,7 +118,7 @@ kcfg_ChannelDoubleClickAction - + orderHintLabel @@ -137,6 +145,12 @@ setEnabled(bool) + + kcfg_ChannelDoubleClickAction + kcfg_SortCaseInsensitive + kcfg_SortByStatus + sortOrder + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nicklistview.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nicklistview.cpp --- konversation-1.0.1/konversation/src/nicklistview.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nicklistview.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,6 +12,11 @@ email: eisfuchs@tigress.com */ +#include "nicklistview.h" +#include "konversationapplication.h" +#include "images.h" +#include "linkaddressbook/addressbook.h" + #include #include #include @@ -21,12 +26,6 @@ #include #include -#include "images.h" - -#include "konversationapplication.h" -#include "nicklistview.h" -#include "nicklistviewitem.h" -#include "linkaddressbook/addressbook.h" NickListView::NickListView(QWidget* parent, Channel *chan) : KListView(parent) @@ -130,26 +129,27 @@ NickListView::~NickListView() { + delete m_tooltip; + m_tooltip = 0; } void NickListView::setWhatsThis() { Images* images = KonversationApplication::instance()->images(); - QMimeSourceFactory::defaultFactory()->setImage( "admin", images->getNickIcon( Images::Admin, false ).convertToImage() ); - QMimeSourceFactory::defaultFactory()->setImage( "owner", images->getNickIcon( Images::Owner, false ).convertToImage()); - QMimeSourceFactory::defaultFactory()->setImage( "op", images->getNickIcon( Images::Op, false ).convertToImage() ); - QMimeSourceFactory::defaultFactory()->setImage( "halfop", images->getNickIcon( Images::HalfOp, false ).convertToImage() ); - QMimeSourceFactory::defaultFactory()->setImage( "voice", images->getNickIcon( Images::Voice, false ).convertToImage() ); - QMimeSourceFactory::defaultFactory()->setImage( "normal", images->getNickIcon( Images::Normal, false ).convertToImage() ); - QMimeSourceFactory::defaultFactory()->setImage( "normalaway", images->getNickIcon( Images::Normal, true).convertToImage() ); - if(images->getNickIcon( Images::Normal, false).isNull()) { QWhatsThis::add(this, i18n("This shows all the people in the channel. The nick for each person is shown.
Usually an icon is shown showing the status of each person, but you do not seem to have any icon theme installed. See the Konversation settings - Configure Konversation under the Settings menu. Then view the page for Themes under Appearence.")); } else { + QMimeSourceFactory::defaultFactory()->setImage( "admin", images->getNickIcon( Images::Admin, false ).convertToImage() ); + QMimeSourceFactory::defaultFactory()->setImage( "owner", images->getNickIcon( Images::Owner, false ).convertToImage()); + QMimeSourceFactory::defaultFactory()->setImage( "op", images->getNickIcon( Images::Op, false ).convertToImage() ); + QMimeSourceFactory::defaultFactory()->setImage( "halfop", images->getNickIcon( Images::HalfOp, false ).convertToImage() ); + QMimeSourceFactory::defaultFactory()->setImage( "voice", images->getNickIcon( Images::Voice, false ).convertToImage() ); + QMimeSourceFactory::defaultFactory()->setImage( "normal", images->getNickIcon( Images::Normal, false ).convertToImage() ); + QMimeSourceFactory::defaultFactory()->setImage( "normalaway", images->getNickIcon( Images::Normal, true).convertToImage() ); QWhatsThis::add(this, i18n("This shows all the people in the channel. The nick for each person is shown, with a picture showing their status.

" "" @@ -172,14 +172,14 @@ void NickListView::refresh() { - QPtrList nicklist; QListViewItemIterator it(this); while (it.current()) { - static_cast(it.current())->refresh(); + static_cast(it.current())->refresh(); ++it; } + setWhatsThis(); } @@ -214,7 +214,10 @@ int unignoreCounter = 0; int notifyCounter = 0; - int serverGroupId = channel->getServer()->serverGroupSettings()->id(); + int serverGroupId = -1; + + if (channel->getServer()->getServerGroup()) + serverGroupId = channel->getServer()->getServerGroup()->id(); ChannelNickList nickList=channel->getSelectedChannelNicks(); ChannelNickList::ConstIterator it; @@ -226,7 +229,7 @@ else ++ignoreCounter; - if (Preferences::isNotify(serverGroupId,(*it)->getNickname())) + if (serverGroupId != -1 && Preferences::isNotify(serverGroupId, (*it)->getNickname())) ++notifyCounter; } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nicklistview.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nicklistview.h --- konversation-1.0.1/konversation/src/nicklistview.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nicklistview.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,15 +15,13 @@ #ifndef NICKLISTVIEW_H #define NICKLISTVIEW_H -#include #include "channel.h" #include "nicklisttooltip.h" #include "images.h" #include "common.h" -/* - @author Dario Abatianni -*/ +#include + class QPopupMenu; class QContextMenuEvent; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nicklistviewitem.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nicklistviewitem.cpp --- konversation-1.0.1/konversation/src/nicklistviewitem.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nicklistviewitem.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,232 +0,0 @@ -/*************************************************************************** - begin : Thu Jul 25 2002 - copyright : (C) 2002 by Matthias Gierlings - email : gismore@users.sourceforge.net - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include - -#include "nicklistviewitem.h" -#include "konversationapplication.h" -#include "nick.h" -#include "nickinfo.h" -#include "nicklistview.h" -#include "images.h" - -NickListViewItem::NickListViewItem(KListView* parent, -QListViewItem *after, -const QString& passed_label, -const QString& passed_label2, -Nick *n) : -KListViewItem(parent,after,QString::null,passed_label,passed_label2) -{ - Q_ASSERT(n); - nick = n; - m_flags = 0; - - m_height = height(); - connect(nick->getChannelNick(), SIGNAL(channelNickChanged()), SLOT(refresh())); - connect(nick->getNickInfo(), SIGNAL(nickInfoChanged()), SLOT(refresh())); - - refresh(); -} - -NickListViewItem::~NickListViewItem() -{ -} - -void NickListViewItem::refresh() -{ - int flags = 0; - NickInfo* nickInfo = nick->getNickInfo(); - bool away = false; - - if ( nickInfo ) - away = nickInfo->isAway(); - - if(away) - flags=1; - - Images* images = KonversationApplication::instance()->images(); - QPixmap icon; - - if ( nick->isOwner() ) - { - flags += 64; - icon = images->getNickIcon( Images::Owner, away ); - } - else if ( nick->isAdmin() ) - { - flags += 128; - icon = images->getNickIcon( Images::Admin, away ); - } - else if ( nick->isOp() ) - { - flags += 32; - icon = images->getNickIcon( Images::Op, away ); - } - else if ( nick->isHalfop() ) - { - flags += 16; - icon = images->getNickIcon( Images::HalfOp, away ); - } - else if ( nick->hasVoice() ) - { - flags += 8; - icon = images->getNickIcon( Images::Voice, away ); - } - else - { - flags += 4; - icon = images->getNickIcon( Images::Normal, away ); - } - - setPixmap( 0, icon ); - - KABC::Picture pic = nickInfo->getAddressee().photo(); - - if(!pic.isIntern()) - { - pic = nickInfo->getAddressee().logo(); - } - - if(pic.isIntern()) - { - QPixmap qpixmap(pic.data().scaleHeight(m_height)); - setPixmap(1,qpixmap); - } - - QString newtext1 = calculateLabel1(); - if(newtext1 != text(1)) - { - setText(1,calculateLabel1()); - flags += 2; - } - - setText(2,calculateLabel2()); - repaint(); - - if(m_flags != flags) - { - m_flags = flags; - emit refreshed(); // Resort nick list - } -} - -QString NickListViewItem::calculateLabel1() -{ - NickInfoPtr nickinfo = nick->getNickInfo(); - KABC::Addressee addressee = nickinfo->getAddressee(); - - if(!addressee.realName().isEmpty()) //if no addressee, realName will be empty - { - return nick->getNickInfo()->getNickname() + " (" + addressee.realName() + ')'; - } - else if(Preferences::showRealNames() && !nick->getNickInfo()->getRealName().isEmpty()) - { - return nick->getNickInfo()->getNickname() + " (" + nick->getNickInfo()->getRealName() + ')'; - } - - return nick->getNickInfo()->getNickname(); -} - -QString NickListViewItem::calculateLabel2() -{ - return nick->getNickInfo()->getHostmask(); -} - -int NickListViewItem::compare(QListViewItem* item,int col,bool ascending) const -{ - NickListViewItem* otherItem = static_cast(item); - - if(Preferences::sortByStatus()) - { - int thisFlags = getSortingValue(); - int otherFlags = otherItem->getSortingValue(); - - if(thisFlags > otherFlags) - { - return 1; - } - if(thisFlags < otherFlags) - { - return -1; - } - } - - QString thisKey; - QString otherKey; - - if(col > 1) - { - if(Preferences::sortCaseInsensitive()) - { - thisKey = thisKey.lower(); - otherKey = otherKey.lower(); - } - else - { - thisKey = key(col, ascending); - otherKey = otherItem->key(col, ascending); - } - } - else if(col == 1) - { - if(Preferences::sortCaseInsensitive()) - { - thisKey = nick->loweredNickname(); - otherKey = otherItem->getNick()->loweredNickname(); - } - else - { - thisKey = key(col, ascending); - otherKey = otherItem->key(col, ascending); - } - } - - return thisKey.compare(otherKey); -} - -void NickListViewItem::paintCell(QPainter * p, const QColorGroup & cg, int column, int width, int align ) -{ - QColorGroup cg2 = cg; - NickInfo* nickInfo = nick->getNickInfo(); - - if(nickInfo->isAway()) - { - cg2.setColor(QColorGroup::Text, kapp->palette().disabled().text()); - } - - KListViewItem::paintCell(p,cg2,column,width,align); -} - -int NickListViewItem::getSortingValue() const -{ - int flags; - QString sortingOrder=Preferences::sortOrder(); - - if(nick->isOwner()) flags=sortingOrder.find('q'); - else if(nick->isAdmin()) flags=sortingOrder.find('p'); - else if(nick->isOp() ) flags=sortingOrder.find('o'); - else if(nick->isHalfop()) flags=sortingOrder.find('h'); - else if(nick->hasVoice()) flags=sortingOrder.find('v'); - else flags=sortingOrder.find('-'); - - return flags; -} - -Nick *NickListViewItem::getNick() -{ - return nick; -} - -#include "nicklistviewitem.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nicklistviewitem.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nicklistviewitem.h --- konversation-1.0.1/konversation/src/nicklistviewitem.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nicklistviewitem.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -/*************************************************************************** - begin : Thu Jul 25 2002 - copyright : (C) 2002 by Matthias Gierlings - email : gismore@users.sourceforge.net - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef NICKLISTVIEWITEM_H -#define NICKLISTVIEWITEM_H - -#include - -class Nick; - -/* - @author Matthias Gierlings - @author Dario Abatianni (sorting code) -*/ - -class NickListViewItem : public QObject, public KListViewItem -{ - Q_OBJECT - public: - NickListViewItem(KListView* parent, - QListViewItem *after, - const QString &passed_label, - const QString &passed_label2, - Nick *n); - ~NickListViewItem(); - - // returns a number thar represents the sorting order for the nicknames - int getSortingValue() const; - // get the Nick object - Nick *getNick(); - - virtual void paintCell(QPainter * p, const QColorGroup & cg, int column, int width, int align); - virtual int compare(QListViewItem* item,int col,bool ascending) const; - - public slots: - void refresh(); - - signals: - void refreshed(); - - protected: - Nick *nick; - - QString label; - - QString calculateLabel1(); - QString calculateLabel2(); - int m_height; - int m_flags; - bool m_away; -}; -#endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nicksonline.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nicksonline.cpp --- konversation-1.0.1/konversation/src/nicksonline.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nicksonline.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -14,7 +14,20 @@ email: eisfuchs@tigress.com */ -// Qt includes. +#include "nicksonline.h" +#include "channel.h" +#include "server.h" +#include "konversationapplication.h" +#include "connectionmanager.h" +#include "images.h" +#include "query.h" +#include "linkaddressbook/linkaddressbookui.h" +#include "linkaddressbook/addressbook.h" +#include "linkaddressbook/nicksonlinetooltip.h" +#include "konversationmainwindow.h" +#include "viewcontainer.h" +#include "nicksonlineitem.h" + #include #include #include @@ -24,7 +37,7 @@ #include #include -// KDE includes. + #include #include #include @@ -33,19 +46,6 @@ #include #include -// Konversation includes. -#include "channel.h" -#include "nicksonline.h" -#include "server.h" -#include "konversationapplication.h" -#include "images.h" -#include "query.h" -#include "linkaddressbook/linkaddressbookui.h" -#include "linkaddressbook/addressbook.h" -#include "linkaddressbook/nicksonlinetooltip.h" -#include "konversationmainwindow.h" -#include "viewcontainer.h" -#include "nicksonlineitem.h" NicksOnline::NicksOnline(QWidget* parent): ChatWindow(parent) { @@ -269,9 +269,7 @@ { bool newNetworkRoot = false; QString serverName = servr->getServerName(); - // TODO: The method name "getServerGroup" is a misnomer. Actually returns the - // network for a server. - QString networkName = servr->getServerGroup(); + QString networkName = servr->getDisplayName(); QListViewItem* networkRoot = findNetworkRoot(networkName); // If network is not in our list, add it. if (!networkRoot) @@ -428,13 +426,20 @@ item = nextItem; } item = offlineRoot->firstChild(); - while (item) + + if(item) { + while (item) + { + QListViewItem* nextItem = item->nextSibling(); + QString nickname = item->text(nlvcNick); + if ((watchList.find(nickname) == watchList.end()) && + (serverName == item->text(nlvcServerName))) delete item; + item = nextItem; + } + } + else { - QListViewItem* nextItem = item->nextSibling(); - QString nickname = item->text(nlvcNick); - if ((watchList.find(nickname) == watchList.end()) && - (serverName == item->text(nlvcServerName))) delete item; - item = nextItem; + delete offlineRoot; } // Expand server if newly added to list. if (newNetworkRoot) @@ -456,11 +461,11 @@ NickInfoPtr NicksOnline::getOnlineNickInfo(QString& networkName, QString& nickname) { // Get list of pointers to all servers. - KonversationApplication *konvApp=static_cast(KApplication::kApplication()); - QPtrList serverList = konvApp->getServerList(); + KonversationApplication* konvApp = static_cast(kapp); + QPtrList serverList = konvApp->getConnectionManager()->getServerList(); for (Server* server = serverList.first(); server; server = serverList.next()) { - if (server->getServerGroup() == networkName) + if (server->getDisplayName() == networkName) { NickInfoPtr nickInfo = server->getNickInfo(nickname); if (nickInfo) return nickInfo; @@ -477,11 +482,11 @@ */ void NicksOnline::requestWhois(QString& networkName, QString& nickname) { - KonversationApplication *konvApp=static_cast(KApplication::kApplication()); - QPtrList serverList = konvApp->getServerList(); + KonversationApplication* konvApp = static_cast(kapp); + QPtrList serverList = konvApp->getConnectionManager()->getServerList(); for (Server* server = serverList.first(); server; server = serverList.next()) { - if (server->getServerGroup() == networkName) + if (server->getDisplayName() == networkName) { server->requestWhois(nickname); return; @@ -494,9 +499,8 @@ */ void NicksOnline::refreshAllServerOnlineLists() { - KonversationApplication *konvApp=static_cast(KApplication::kApplication()); - // Get list of pointers to all servers. - QPtrList serverList = konvApp->getServerList(); + KonversationApplication* konvApp = static_cast(kapp); + QPtrList serverList = konvApp->getConnectionManager()->getServerList(); Server* server; // Remove servers no longer connected. QListViewItem* child = m_nickListView->firstChild(); @@ -515,7 +519,7 @@ for (server = serverList.first(); server; server = serverList.next()) { if ((server->getServerName() == serverName) && - (server->getServerGroup() == networkName)) found = true; + (server->getDisplayName() == networkName)) found = true; } if (!found) it = serverNameList.remove(it); @@ -591,10 +595,17 @@ { QString serverName; QString nickname; + getItemServerAndNick(item, serverName, nickname); - if(!serverName || !nickname) return 0; - Server *server = static_cast(kapp)->getServerByName(serverName); - return server->getNickInfo(nickname); + + if (!serverName || !nickname) + return 0; + + Server* server = KonversationApplication::instance()->getConnectionManager()->getServerByName(serverName); + + if (server) return server->getNickInfo(nickname); + + return 0; } /** @@ -609,9 +620,9 @@ QListViewItem* NicksOnline::getServerAndNickItem(const QString& serverName, const QString& nickname) { - KonversationApplication *konvApp=static_cast(KApplication::kApplication()); - Server* server = konvApp->getServerByName(serverName); - QString networkName = server->getServerGroup(); + Server* server = KonversationApplication::instance()->getConnectionManager()->getServerByName(serverName); + if (!server) return 0; + QString networkName = server->getDisplayName(); QListViewItem* networkRoot = m_nickListView->findItem(networkName, nlvcNetwork); if (!networkRoot) return 0; QListViewItem* nickRoot = findItemChild(networkRoot, nickname, NicksOnlineItem::NicknameItem); @@ -646,13 +657,9 @@ } // Get the server object corresponding to the server name. - KonversationApplication *konvApp = static_cast(kapp); - Server* server = konvApp->getServerByName(serverName); + Server* server = KonversationApplication::instance()->getConnectionManager()->getServerByName(serverName); - if(!server) - { - return; - } + if (!server) return; // Get NickInfo object corresponding to the nickname. NickInfoPtr nickInfo = server->getNickInfo(nickname); @@ -683,7 +690,7 @@ } else { - LinkAddressbookUI *linkaddressbookui = new LinkAddressbookUI(server->getViewContainer()->getWindow(), NULL, nickname, server->getServerName(), server->getServerGroup(), addressee.realName()); + LinkAddressbookUI *linkaddressbookui = new LinkAddressbookUI(server->getViewContainer()->getWindow(), NULL, nickname, server->getServerName(), server->getDisplayName(), addressee.realName()); linkaddressbookui->show(); } break; @@ -701,13 +708,13 @@ return; } - addressbook->unassociateNick(addressee, nickname, server->getServerName(), server->getServerGroup()); + addressbook->unassociateNick(addressee, nickname, server->getServerName(), server->getDisplayName()); } else { addressee.setGivenName(nickname); addressee.setNickName(nickname); - addressbook->associateNickAndUnassociateFromEveryoneElse(addressee, nickname, server->getServerName(), server->getServerGroup()); + addressbook->associateNickAndUnassociateFromEveryoneElse(addressee, nickname, server->getServerName(), server->getDisplayName()); } if(addressbook->saveTicket()) { @@ -756,8 +763,7 @@ QString nickname; if (getItemServerAndNick(item, serverName, nickname)) { - Server *server = - static_cast(kapp)->getServerByName(serverName); + Server *server = KonversationApplication::instance()->getConnectionManager()->getServerByName(serverName); if (!server) return nsNotANick; NickInfoPtr nickInfo = server->getNickInfo(nickname); if (nickInfo) @@ -925,8 +931,7 @@ QString nickname; if (getItemServerAndNick(item, serverName, nickname)) { - Server *server = - static_cast(kapp)->getServerByName(serverName); + Server *server = KonversationApplication::instance()->getConnectionManager()->getServerByName(serverName); if (server) { NickInfoPtr nickInfo = server->getNickInfo(nickname); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nicksonline.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nicksonline.h --- konversation-1.0.1/konversation/src/nicksonline.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nicksonline.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,20 +15,15 @@ #ifndef NICKSONLINE_H #define NICKSONLINE_H -// Qt includes. -#include -#include -#include - -// Konversation includes. #include "nickinfo.h" #include "nicksonlineitem.h" #include "chatwindow.h" #include "linkaddressbook/nicksonlinetooltip.h" -/** - * @author Dario Abatianni - * @author Gary Cramblitt - */ + +#include +#include +#include + class KListView; class QPushButton; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nicksonlineitem.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nicksonlineitem.cpp --- konversation-1.0.1/konversation/src/nicksonlineitem.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nicksonlineitem.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -9,10 +9,9 @@ Copyright (C) 2006 Dario Abatianni */ -#include - #include "nicksonlineitem.h" + NicksOnlineItem::NicksOnlineItem(int type, QListView* parent, const QString& name, const QString& col2) : KListViewItem(parent, name, col2) { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/nicksonlineitem.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/nicksonlineitem.h --- konversation-1.0.1/konversation/src/nicksonlineitem.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/nicksonlineitem.h 2008-08-06 16:56:27.000000000 +0100 @@ -14,9 +14,6 @@ #include -/** - @author Dario Abatianni -*/ class NicksOnlineItem : public KListViewItem { @@ -32,12 +29,12 @@ NicksOnlineItem(int type, QListView* parent, const QString& name, - const QString& col2 = QString::null); + const QString& col2 = QString()); NicksOnlineItem(int type, QListViewItem* parent, const QString& name, - const QString& col2 = QString::null); + const QString& col2 = QString()); /** * Reimplemented to make sure, "Offline" items always get sorted to the bottom of the list diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/notificationhandler.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/notificationhandler.cpp --- konversation-1.0.1/konversation/src/notificationhandler.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/notificationhandler.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -9,14 +9,8 @@ copyright: (C) 2004 by Peter Simonsson email: psn@linux.se */ -#include "notificationhandler.h" - -#include - -#include -#include -#include +#include "notificationhandler.h" #include "common.h" #include "chatwindow.h" #include "konversationapplication.h" @@ -25,6 +19,13 @@ #include "trayicon.h" #include "server.h" +#include + +#include +#include +#include + + namespace Konversation { @@ -40,15 +41,11 @@ void NotificationHandler::message(ChatWindow* chatWin, const QString& fromNick, const QString& message) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } QString cleanedMessage = QStyleSheet::escape(Konversation::removeIrcMarkup(message)); QString cutup = addLineBreaks(cleanedMessage); @@ -70,15 +67,11 @@ void NotificationHandler::nick(ChatWindow* chatWin, const QString& fromNick, const QString& message) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } QString cleanedMessage = QStyleSheet::escape(Konversation::removeIrcMarkup(message)); QString cutup = addLineBreaks(cleanedMessage); @@ -89,54 +82,58 @@ KonversationApplication* konvApp = static_cast(kapp); - if(chatWin->getType() == ChatWindow::Channel) + if((Preferences::oSDShowChannel() || Preferences::oSDShowOwnNick()) && + (!m_mainWindow->isActiveWindow() || + (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) { - if((Preferences::oSDShowChannel() || - Preferences::oSDShowOwnNick()) && - (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) - { - konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").arg(chatWin->getName()).arg(fromNick).arg(cleanedMessage)); - } + konvApp->osd->showOSD(i18n("[HighLight] (%1) <%2> %3").arg(chatWin->getName()).arg(fromNick).arg(cleanedMessage)); } - else if(chatWin->getType() == ChatWindow::Query) + } + + void NotificationHandler::queryMessage(ChatWindow* chatWin, + const QString& fromNick, const QString& message) + { + if (!chatWin || !chatWin->notificationsEnabled()) + return; + + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) + return; + + QString cleanedMessage = QStyleSheet::escape(Konversation::removeIrcMarkup(message)); + QString cutup = addLineBreaks(cleanedMessage); + + KNotifyClient::event(m_mainWindow->winId(), "queryMessage", QString("<%1> %2").arg(fromNick).arg(cutup)); + + startTrayNotification(chatWin); + + KonversationApplication* konvApp = static_cast(kapp); + + if(Preferences::oSDShowQuery() && (!m_mainWindow->isActiveWindow() || + (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) { - if(Preferences::oSDShowQuery() && - (!m_mainWindow->isActiveWindow() || (chatWin != m_mainWindow->getViewContainer()->getFrontView()))) - { - konvApp->osd->showOSD(i18n("(Query) <%1> %2").arg(fromNick).arg(cleanedMessage)); - } + konvApp->osd->showOSD(i18n("[Query] <%1> %2").arg(fromNick).arg(cleanedMessage)); } } void NotificationHandler::startTrayNotification(ChatWindow* chatWin) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (!chatWin->getServer() || (Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway())) return; - } - if(!m_mainWindow->isActiveWindow() && chatWin->getServer() && chatWin->getServer()->connected()) - { + if (!m_mainWindow->isActiveWindow() && chatWin->getServer()->isConnected()) m_mainWindow->systemTrayIcon()->startNotification(); - } } void NotificationHandler::join(ChatWindow* chatWin, const QString& nick) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } KNotifyClient::event(m_mainWindow->winId(), "join", i18n("%1 joined %2").arg(nick, chatWin->getName())); @@ -151,15 +148,11 @@ void NotificationHandler::part(ChatWindow* chatWin, const QString& nick) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 parted %2").arg(nick, chatWin->getName())); @@ -174,75 +167,55 @@ void NotificationHandler::quit(ChatWindow* chatWin, const QString& nick) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } KNotifyClient::event(m_mainWindow->winId(), "part", i18n("%1 quit %2").arg(nick, chatWin->getServer()->getServerName())); } void NotificationHandler::nickChange(ChatWindow* chatWin, const QString& oldNick, const QString& newNick) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } KNotifyClient::event(m_mainWindow->winId(), "nickchange", i18n("%1 changed nickname to %2").arg(oldNick, newNick)); } void NotificationHandler::dccIncoming(ChatWindow* chatWin, const QString& fromNick) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } KNotifyClient::event(m_mainWindow->winId(), "dcc_incoming", i18n("%1 wants to send a file to you").arg(fromNick)); } void NotificationHandler::mode(ChatWindow* chatWin, const QString& /*nick*/) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } KNotifyClient::event(m_mainWindow->winId(), "mode"); } void NotificationHandler::query(ChatWindow* chatWin, const QString& fromNick) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } startTrayNotification(chatWin); @@ -252,15 +225,11 @@ void NotificationHandler::nickOnline(ChatWindow* chatWin, const QString& nick) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } KNotifyClient::event(m_mainWindow->winId(), "notify", i18n("%1 is online (%2).").arg(nick).arg(chatWin->getServer()->getServerName())); @@ -268,15 +237,11 @@ void NotificationHandler::nickOffline(ChatWindow* chatWin, const QString& nick) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } KNotifyClient::event(m_mainWindow->winId(), "notify", i18n("%1 went offline (%2).").arg(nick).arg(chatWin->getServer()->getServerName())); @@ -284,10 +249,11 @@ void NotificationHandler::kick(ChatWindow* chatWin, const QString& channel,const QString& nick) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) + return; + + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } KNotifyClient::event(m_mainWindow->winId(), "kick", i18n("You are kicked by %1 from %2").arg(nick).arg(channel)); @@ -295,10 +261,11 @@ void NotificationHandler::dccChat(ChatWindow* chatWin, const QString& nick) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) + return; + + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } KNotifyClient::event(m_mainWindow->winId(), "dccChat", i18n("%1 started a dcc chat with you").arg(nick)); @@ -306,15 +273,11 @@ void NotificationHandler::highlight(ChatWindow* chatWin, const QString& fromNick, const QString& message) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } startTrayNotification(chatWin); @@ -334,10 +297,8 @@ void NotificationHandler::connectionFailure(ChatWindow* chatWin, const QString& server) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } KNotifyClient::event(m_mainWindow->winId(), "connectionFailure", i18n("Failed to connect to %1").arg(server)); @@ -345,15 +306,11 @@ void NotificationHandler::channelJoin(ChatWindow* chatWin, const QString& channel) { - if(!chatWin || !chatWin->notificationsEnabled()) - { + if (!chatWin || !chatWin->notificationsEnabled()) return; - } - if(Preferences::disableNotifyWhileAway() && chatWin->getServer()->isAway()) - { + if (Preferences::disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - } KNotifyClient::event(m_mainWindow->winId(), "channelJoin", i18n("You have joined %1.").arg(channel)); } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/notificationhandler.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/notificationhandler.h --- konversation-1.0.1/konversation/src/notificationhandler.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/notificationhandler.h 2008-08-06 16:56:27.000000000 +0100 @@ -14,6 +14,7 @@ #include + class ChatWindow; class KonversationApplication; class KonversationMainWindow; @@ -24,8 +25,9 @@ class NotificationHandler : public QObject { Q_OBJECT - public: - NotificationHandler(KonversationApplication* parent = 0, const char* name = 0); + + public: + explicit NotificationHandler(KonversationApplication* parent = 0, const char* name = 0); ~NotificationHandler(); public slots: @@ -38,6 +40,7 @@ void dccIncoming(ChatWindow* chatWin, const QString& fromNick); void mode(ChatWindow* chatWin, const QString& nick); void query(ChatWindow* chatWin, const QString& fromNick); + void queryMessage(ChatWindow* chatWin, const QString& fromNick, const QString& message); void nickOnline(ChatWindow* chatWin, const QString& nick); void nickOffline(ChatWindow* chatWin, const QString& nick); void kick(ChatWindow* chatWin, const QString& channel,const QString& nick); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/osd.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/osd.cpp --- konversation-1.0.1/konversation/src/osd.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/osd.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,8 +12,8 @@ Copyright (C) 2004 Michael Goettsche */ -#include "konversationapplication.h" #include "osd.h" +#include "konversationapplication.h" #include "common.h" #include @@ -28,6 +28,7 @@ #include //reposition() + OSDWidget::OSDWidget( const QString &appName, QWidget *parent, const char *name ) : QWidget( parent, name, WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop | WStyle_Tool ) , m_appName( appName ) @@ -240,7 +241,7 @@ void OSDWidget::show() { // Don't show the OSD widget when the desktop is locked - if ( isKDesktopLockRunning() ) + if ( isKDesktopLockRunning() == Locked ) { minReached(); // don't queue the message return; @@ -408,11 +409,10 @@ DCOPClient *dcopptr = KApplication::kApplication()->dcopClient(); - // Can't tell, very weird, err on the side of safety. + // Can't tell, very weird if (!dcopptr || !dcopptr->isAttached()) { - kdWarning() << k_funcinfo << ": Could not make DCOP connection. " - << "Assuming screensaver is active." << endl; + kdWarning() << k_funcinfo << ": Could not make DCOP connection." << endl; return DCOPError; } @@ -422,9 +422,8 @@ if (!dcopptr->call("kdesktop","KScreensaverIface","isBlanked()", data,returnType,returnValue,true)) { - kdWarning() << k_funcinfo << ": Check for screensaver failed." - << "Assuming screensaver is active." << endl; - // Err on the side of safety again. + // KDesktop is not running. Maybe we are in a KDE4 desktop... + kdDebug() << k_funcinfo << ": Check for screensaver failed." << endl; return DCOPError; } @@ -440,7 +439,7 @@ kdWarning() << k_funcinfo << ": Strange return value from screensaver. " << "Assuming screensaver is active." << endl; // Err on the side of safety. - return DCOPError; + return Locked; } } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/osd.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/osd.h --- konversation-1.0.1/konversation/src/osd.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/osd.h 2008-08-06 16:56:27.000000000 +0100 @@ -19,6 +19,7 @@ #include //stack allocated #include //baseclass + class QFont; class QString; class QStringList; @@ -102,8 +103,9 @@ class OSDPreviewWidget : public OSDWidget { Q_OBJECT - public: - OSDPreviewWidget( const QString &appName, QWidget *parent = 0, const char *name = "osdpreview" ); + + public: + explicit OSDPreviewWidget( const QString &appName, QWidget *parent = 0, const char *name = "osdpreview" ); static QPoint m_previewOffset; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/osd_preferences.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/osd_preferences.cpp --- konversation-1.0.1/konversation/src/osd_preferences.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/osd_preferences.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -27,6 +27,7 @@ #include + OSD_Config::OSD_Config( QWidget* parent, const char* name, WFlags fl ) : OSD_ConfigUI( parent, name, fl ) { @@ -91,12 +92,12 @@ if (kcfg_UseOSD->isChecked()) { konvApp->osd->setFont(Preferences::oSDFont()); - if(kcfg_OSDUseCustomColors->isChecked()) + if(kcfg_OSDUseCustomColors->isChecked()) { konvApp->osd->setTextColor(kcfg_OSDTextColor->color()); konvApp->osd->setBackgroundColor(kcfg_OSDBackgroundColor->color()); } - else + else { konvApp->osd->unsetColors(); } @@ -106,8 +107,8 @@ konvApp->osd->setShadow(kcfg_OSDDrawShadow->isChecked()); //x is ignored anyway, but leave incase we use in future - konvApp->osd->setOffset(m_pOSDPreview->x(),m_pOSDPreview->y()); - konvApp->osd->setAlignment((OSDWidget::Alignment)m_pOSDPreview->alignment()); + konvApp->osd->setOffset(kcfg_OSDOffsetX->value(), kcfg_OSDOffsetY->value()); + konvApp->osd->setAlignment((OSDWidget::Alignment)kcfg_OSDAlignment->value()); } } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/osd_preferences.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/osd_preferences.h --- konversation-1.0.1/konversation/src/osd_preferences.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/osd_preferences.h 2008-08-06 16:56:27.000000000 +0100 @@ -19,38 +19,39 @@ #include "osd_preferencesui.h" #include "konvisettingspage.h" + class OSDPreviewWidget; class OSD_Config : public OSD_ConfigUI, public KonviSettingsPage { Q_OBJECT -public: - OSD_Config( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~OSD_Config(); - - virtual void restorePageToDefaults(); - virtual void saveSettings(); - virtual void loadSettings(); - - virtual bool hasChanged(); // implement the interface, will not be used here, though - -protected slots: - void slotOSDEnabledChanged(bool on); - void slotCustomColorsChanged(bool on); - void slotTextColorChanged(const QColor& color); - void slotBackgroundColorChanged(const QColor& color); - void slotScreenChanged(int index); - void slotDrawShadowChanged(bool on); - void slotUpdateFont(const QFont& font); - void slotPositionChanged(); - -protected: - void showEvent(QShowEvent* event); - void hideEvent(QHideEvent* event); + public: + explicit OSD_Config( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ~OSD_Config(); + + virtual void restorePageToDefaults(); + virtual void saveSettings(); + virtual void loadSettings(); + + virtual bool hasChanged(); // implement the interface, will not be used here, though + + protected slots: + void slotOSDEnabledChanged(bool on); + void slotCustomColorsChanged(bool on); + void slotTextColorChanged(const QColor& color); + void slotBackgroundColorChanged(const QColor& color); + void slotScreenChanged(int index); + void slotDrawShadowChanged(bool on); + void slotUpdateFont(const QFont& font); + void slotPositionChanged(); + + protected: + void showEvent(QShowEvent* event); + void hideEvent(QHideEvent* event); -private: - OSDPreviewWidget* m_pOSDPreview; + private: + OSDPreviewWidget* m_pOSDPreview; }; #endif // EXOSDPREFERENCES_H diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/osd_preferencesui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/osd_preferencesui.ui --- konversation-1.0.1/konversation/src/osd_preferencesui.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/osd_preferencesui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -36,81 +36,163 @@ - + - groupBox4 + kcfg_UseOSD + + + &Enable On Screen Display + + + + + groupBox2 false - O&ther Settings + On &Screen Display unnamed - + - textLabel1_2 + kcfg_OSDDrawShadow - - &Duration: + + false - - kcfg_OSDDuration + + &Draw shadows - textLabel2_2 + textLabel1 + + + false + + + Sunken - S&creen: + OSD font: - kcfg_OSDScreen + kFontRequester1 - + - kcfg_OSDDuration + kcfg_OSDFont - - ms + + false + + + + + kcfg_OSDOffsetX + + + + 4 + 4 + 0 + 0 + - 10000 + 2048 - 500 + -2048 - - 100 + + + + kcfg_OSDOffsetY + + + + 4 + 4 + 0 + 0 + + + + 2048 + + + -2048 - + - kcfg_OSDScreen + kcfg_OSDAlignment + + + + 4 + 4 + 0 + 0 + - + + + + + groupBox3 + + + false + + + Show &OSD Message + + + + unnamed + + - spacer3 + kcfg_OSDShowOwnNick - - Horizontal + + &If own nick appears in channel message - - Expanding + + + + kcfg_OSDShowChannel - - - 50 - 21 - + + On an&y channel message - + + + + kcfg_OSDShowQuery + + + On &query activity + + + + + kcfg_OSDShowChannelEvent + + + On &Join/Part events + + @@ -190,165 +272,83 @@ - + - groupBox3 + groupBox4 false - Show &OSD Message + O&ther Settings unnamed - - - kcfg_OSDShowOwnNick - - - &If own nick appears in channel message - - - - - kcfg_OSDShowChannel - - - On an&y channel message - - - - - kcfg_OSDShowQuery - - - On &query activity - - - + - kcfg_OSDShowChannelEvent + textLabel1_2 - On &Join/Part events - - - - - - - groupBox2 - - - false - - - On &Screen Display - - - - unnamed - - - - kcfg_OSDDrawShadow - - - false + &Duration: - - &Draw shadows + + kcfg_OSDDuration - textLabel1 - - - false - - - Sunken + textLabel2_2 - OSD font: + S&creen: - kFontRequester1 - - - - - kcfg_OSDFont - - - false + kcfg_OSDScreen - + - kcfg_OSDOffsetX + kcfg_OSDDuration - - - 4 - 4 - 0 - 0 - + + ms - 2048 + 10000 - -2048 + 500 + + + 100 - + - kcfg_OSDOffsetY - - - - 4 - 4 - 0 - 0 - - - - 2048 - - - -2048 + kcfg_OSDScreen - + - kcfg_OSDAlignment + spacer3 - - - 4 - 4 - 0 - 0 - + + Horizontal - + + Expanding + + + + 50 + 21 + + + - - - kcfg_UseOSD - - - &Enable On Screen Display - - @@ -395,6 +395,24 @@ setEnabled(bool) + + kcfg_UseOSD + kcfg_OSDDrawShadow + kcfg_OSDFont + kcfg_OSDOffsetX + kcfg_OSDOffsetY + kcfg_OSDAlignment + kcfg_OSDShowOwnNick + kcfg_OSDShowChannel + kcfg_OSDShowQuery + kcfg_OSDShowChannelEvent + kcfg_OSDUseCustomColors + kcfg_OSDTextColor + kcfg_OSDBackgroundColor + kcfg_OSDDuration + kcfg_OSDScreen + kcfg_OSDUseCustomColors + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/outputfilter.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/outputfilter.cpp --- konversation-1.0.1/konversation/src/outputfilter.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/outputfilter.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -10,9 +10,19 @@ Copyright (C) 2005 Ismail Donmez Copyright (C) 2005 Peter Simonsson Copyright (C) 2005 John Tapsell - Copyright (C) 2005 Eike Hein + Copyright (C) 2005-2008 Eike Hein */ +#include "outputfilter.h" +#include "konversationapplication.h" +#include "konversationmainwindow.h" +#include "awaymanager.h" +#include "ignore.h" +#include "server.h" +#include "irccharsets.h" +#include "linkaddressbook/addressbook.h" +#include "query.h" + #include #include #include @@ -27,21 +37,11 @@ #include #include #include - #include #include #include +#include -#include "outputfilter.h" -#include "konversationapplication.h" -#include "konversationmainwindow.h" -#include "ignore.h" -#include "server.h" -#include "irccharsets.h" -#include "linkaddressbook/addressbook.h" -#include "konviiphelper.h" - -#include "query.h" namespace Konversation { @@ -97,28 +97,17 @@ return false; } - QStringList OutputFilter::splitForEncoding(const QString& inputLine, int MAX) + QStringList OutputFilter::splitForEncoding(const QString& inputLine, uint max) { - QString channelCodecName=Preferences::channelEncoding(m_server->getServerGroup(), destination); - - int sublen=0; //The encoded length since the last split - int charLength=0; //the length of this char - - //MAX= 7; // for testing + uint sublen = 0; //The encoded length since the last split + int charLength = 0; //the length of this char + int lastBreakPoint = 0; //FIXME should we run this through the encoder first, checking with "canEncode"? - QString text=inputLine; // the text we'll send, currently in Unicode - + QString text = inputLine; // the text we'll send, currently in Unicode QStringList finals; // The strings we're going to output - QChar *c=(QChar*)text.unicode(), // Pointer to the character we're looking at - *end=c+text.length(); // If it were a char*, it would be pointing at the \0; - - QChar *frag=c, // The beginning of this fragment - *lastSBC=c, // The last single byte char we saw in case we have to chop - *lastSpace=c; // The last space we saw - bool sbcGood = 0; // We can't trust that a single byte char was ever seen - + QString channelCodecName=Preferences::channelEncoding(m_server->getDisplayName(), destination); //Get the codec we're supposed to use. This must not fail. (not verified) QTextCodec* codec; @@ -129,74 +118,50 @@ } else { - // FIXME Doesn't this just return `getIdentity()->getCodec();` if no codec set? codec = Konversation::IRCCharsets::self()->codecForName(channelCodecName); } Q_ASSERT(codec); + int index = 0; - while (c max) { // The most important bit - turn the current char into a QCString so we can measure it - QCString ch=codec->fromUnicode(*c); - charLength=ch.length(); + QCString ch = codec->fromUnicode(QString(text[index])); + charLength = ch.length(); // If adding this char puts us over the limit: - if (charLength+sublen > MAX) + if (charLength + sublen > max) { - // If lastSpace isn't pointing to a space, we have to chop - if ( !lastSpace->isSpace() ) //used in case we end up supporting unicode spaces + if(lastBreakPoint != 0) { - // FIXME This is only theory, it might not work - if (sbcGood) // Copy up to and including the last SBC. - { - QString curs(frag, (++lastSBC)-frag); // Since there is a continue below, safe to increment here - finals+=curs; - lastSpace=frag=c=lastSBC; - } - else //Split right here - { - QString curs(frag, c-frag); // Don't include c - finals+=curs; - lastSpace=frag=c; //we need to see this char again, to collect its stats, so no increment - } + finals.append(text.left(lastBreakPoint + 1)); + text = text.mid(lastBreakPoint + 1); } - else // Most common case, we saw a space we can split at + else { - // Copy the current substring, but not the space (unlike the SBC case) - QString curs(frag, lastSpace-frag); - finals+=curs; - - // Rewind to the last good splitpoint, dropping the space character as - // it was technically replaced with a \n - frag=c=++lastSpace; //pre-increment + finals.append(text.left(index)); + text = text.mid(index); } - sbcGood=false; - // Since c always gets reset to the splitpoint, sublen gets recalculated - sublen=0; - continue; // SLAM!!! - } - else if (*c==' ') // If we want to support typographic spaces, change this to c->isSpace(), and rewrite above - { - lastSpace=c; + lastBreakPoint = 0; + sublen = 0; + index = 0; } - // Won't get here if the string was split - if (charLength==1) + else if (text[index].isSpace() || text[index].isPunct()) { - sbcGood=1; - lastSBC=c; + lastBreakPoint = index; } - sublen+=charLength; - ++c; - }//wend - //so when we hit this point, frag to end is all thats left - Q_ASSERT((frag!=c)); - if (frag != c) + + ++index; + sublen += charLength; + } + + if (!text.isEmpty()) { - QString curs(frag, c-frag); - finals+=curs; + finals.append(text); } + return finals; } @@ -241,15 +206,8 @@ QString line=inputLine.lower(); - // Action? - if(line.startsWith(commandChar+"me ") && !destination.isEmpty()) - { - result.toServer = "PRIVMSG " + name + " :" + '\x01' + "ACTION " + inputLine.mid(4) + '\x01'; - result.output = inputLine.mid(4); - result.type = Action; - } // Convert double command chars at the beginning to single ones - else if(line.startsWith(commandChar+commandChar) && !destination.isEmpty()) + if(line.startsWith(commandChar+commandChar) && !destination.isEmpty()) { inputLine=inputLine.mid(1); goto BYPASS_COMMAND_PARSING; @@ -267,8 +225,10 @@ else if(command == "part") result = parsePart(parameter); else if(command == "leave") result = parsePart(parameter); else if(command == "quit") result = parseQuit(parameter); + else if(command == "close") result = parseClose(parameter); else if(command == "notice") result = parseNotice(parameter); else if(command == "j") result = parseJoin(parameter); + else if(command == "me") result = parseMe(parameter, destination); else if(command == "msg") result = parseMsg(myNick,parameter, false); else if(command == "m") result = parseMsg(myNick,parameter, false); else if(command == "smsg") result = parseSMsg(parameter); @@ -284,9 +244,9 @@ else if(command == "ping") result = parseCtcp(parameter.section(' ', 0, 0) + " ping"); else if(command == "kick") result = parseKick(parameter); else if(command == "topic") result = parseTopic(parameter); - else if(command == "away") result = parseAway(parameter); - else if(command == "unaway") result = parseBack(); - else if(command == "back") result = parseBack(); + else if(command == "away") parseAway(parameter); + else if(command == "unaway") parseBack(); + else if(command == "back") parseBack(); else if(command == "invite") result = parseInvite(parameter); else if(command == "exec") result = parseExec(parameter); else if(command == "notify") result = parseNotify(parameter); @@ -303,8 +263,9 @@ else if(command == "raw") result = parseRaw(parameter); else if(command == "dcc") result = parseDcc(parameter); else if(command == "konsole") parseKonsole(); - else if(command == "aaway") parseAaway(parameter); - else if(command == "aback") emit multiServerCommand("back", QString::null); + else if(command == "aaway") KonversationApplication::instance()->getAwayManager()->requestAllAway(parameter); + else if(command == "aunaway") KonversationApplication::instance()->getAwayManager()->requestAllUnaway(); + else if(command == "aback") KonversationApplication::instance()->getAwayManager()->requestAllUnaway(); else if(command == "ame") result = parseAme(parameter); else if(command == "amsg") result = parseAmsg(parameter); else if(command == "omsg") result = parseOmsg(parameter); @@ -312,11 +273,14 @@ else if(command == "server") parseServer(parameter); else if(command == "reconnect") emit reconnectServer(); else if(command == "disconnect") emit disconnectServer(); - else if(command == "prefs") result = parsePrefs(parameter); - else if(command == "charset") parseCharset(parameter); + else if(command == "charset") result = parseCharset(parameter); + else if(command == "encoding") result = parseCharset(parameter); else if(command == "setkey") result = parseSetKey(parameter); else if(command == "delkey") result = parseDelKey(parameter); + else if(command == "showkey") result = parseShowKey(parameter); else if(command == "dns") result = parseDNS(parameter); + else if(command == "kill") result = parseKill(parameter); + else if(command == "queuetuner") result = parseShowTuner(parameter); // Forward unknown commands to server else @@ -360,6 +324,21 @@ return result; } + OutputFilterResult OutputFilter::parseShowTuner(const QString ¶meter) + { + KonversationApplication *konvApp = static_cast(KApplication::kApplication()); + OutputFilterResult result; + + if(parameter.isEmpty() || parameter == "on") + konvApp->showQueueTuner(true); + else if(parameter == "off") + konvApp->showQueueTuner(false); + else + result = usage(i18n("Usage: %1queuetuner [on | off]").arg(commandChar)); + + return result; + } + OutputFilterResult OutputFilter::parseOp(const QString ¶meter) { return changeMode(parameter,'o','+'); @@ -400,15 +379,25 @@ if (channelName.isEmpty()) { - result = usage(i18n("Usage: %1JOIN [password]").arg(commandChar)); + if (destination.isEmpty() || !isAChannel(destination)) + return usage(i18n("Usage: %1JOIN [password]").arg(commandChar)); + channelName=destination; } - else + else if (!isAChannel(channelName)) + channelName = "#" + channelName.stripWhiteSpace(); + + Channel* channel = m_server->getChannelByName(channelName); + + if (channel) { - if(!isAChannel(channelName)) - result.toServer = "JOIN #" + channelName.stripWhiteSpace(); - else + // Note that this relies on the channels-flush-nicklists-on-disconnect behavior. + if (!channel->numberOfNicks()) result.toServer = "JOIN " + channelName; + + if (channel->joined()) emit showView (channel); } + else + result.toServer = "JOIN " + channelName; return result; } @@ -564,30 +553,17 @@ return result; } - OutputFilterResult OutputFilter::parseAway(QString &reason) + void OutputFilter::parseAway(QString& reason) { - OutputFilterResult result; - - if (reason.isEmpty()) - reason = i18n("Gone away for now."); - - if (m_server->getIdentity()->getShowAwayMessage()) - { - QString message = m_server->getIdentity()->getAwayMessage(); - emit sendToAllChannels(message.replace(QRegExp("%s",false),reason)); - } - - m_server->setAwayReason(reason); - result.toServer = "AWAY :" + reason; - - return result; + if (reason.isEmpty() && m_server->isAway()) + m_server->requestUnaway(); + else + m_server->requestAway(reason); } - OutputFilterResult OutputFilter::parseBack() + void OutputFilter::parseBack() { - OutputFilterResult result; - result.toServer = "AWAY"; - return result; + m_server->requestUnaway(); } OutputFilterResult OutputFilter::parseNames(const QString ¶meter) @@ -605,6 +581,22 @@ return result; } + OutputFilterResult OutputFilter::parseClose(QString parm) + { + if (parm.isEmpty()) + parm=destination; + + if (isAChannel(parm) && m_server->getChannelByName(parm)) + m_server->getChannelByName(parm)->closeYourself(false); + else if (m_server->getQueryByName(parm)) + m_server->getQueryByName(parm)->closeYourself(false); + else if (parm.isEmpty()) // this can only mean one thing.. we're in the Server tab + m_server->closeYourself(false); + else + return usage(i18n("Usage: %1close [window] closes the named channel or query tab, or the current tab if none specified.").arg(commandChar)); + return OutputFilterResult(); + } + OutputFilterResult OutputFilter::parseQuit(const QString &reason) { OutputFilterResult result; @@ -612,7 +604,7 @@ result.toServer = "QUIT :"; // if no reason given, take default reason if(reason.isEmpty()) - result.toServer += m_server->getIdentity()->getPartReason(); + result.toServer += m_server->getIdentity()->getQuitReason(); else result.toServer += reason; @@ -640,6 +632,24 @@ return result; } + OutputFilterResult OutputFilter::parseMe(const QString ¶meter, const QString &destination) + { + OutputFilterResult result; + + if (!destination.isEmpty() && !parameter.isEmpty()) + { + result.toServer = "PRIVMSG " + destination + " :" + '\x01' + "ACTION " + parameter + '\x01'; + result.output = parameter; + result.type = Action; + } + else + { + result = usage(i18n("Usage: %1ME text").arg(commandChar)); + } + + return result; + } + OutputFilterResult OutputFilter::parseMsg(const QString &myNick, const QString ¶meter, bool isQuery) { OutputFilterResult result; @@ -647,17 +657,28 @@ QString message = parameter.section(" ", 1); QString output; - if(recipient.isEmpty()) + if (recipient.isEmpty()) { result = error("Error: You need to specify a recipient."); return result; } - if(message.stripWhiteSpace().isEmpty()) + if (isQuery && m_server->isAChannel(recipient)) + { + result = error("Error: You cannot open queries to channels."); + return result; + } + + if (message.stripWhiteSpace().isEmpty()) { //empty result - we don't want to send any message to the server + if (!isQuery) + { + result = error("Error: You need to specify a message."); + return result; + } } - else if(message.startsWith(commandChar+"me")) + else if (message.startsWith(commandChar+"me")) { result.toServer = "PRIVMSG " + recipient + " :" + '\x01' + "ACTION " + message.mid(4) + '\x01'; output = QString("* %1 %2").arg(myNick).arg(message.mid(4)); @@ -670,7 +691,7 @@ ::Query *query; - if(isQuery || output.isEmpty()) + if (isQuery || output.isEmpty()) { //if this is a /query, always open a query window. //treat "/msg nick" as "/query nick" @@ -689,9 +710,9 @@ query = m_server->getQueryByName(recipient); } - if(query && !output.isEmpty()) + if (query && !output.isEmpty()) { - if(message.startsWith(commandChar+"me")) + if (message.startsWith(commandChar+"me")) //log if and only if the query open query->appendAction(m_server->getNickname(), message.mid(4)); else @@ -699,10 +720,10 @@ query->appendQuery(m_server->getNickname(), output); } - if(output.isEmpty()) return result; //result should be completely empty; + if (output.isEmpty()) return result; //result should be completely empty; //FIXME - don't do below line if query is focused result.output = output; - result.typeString= "-> " + recipient; + result.typeString= recipient; result.type = PrivateMessage; return result; } @@ -731,11 +752,15 @@ // who is the recipient? QString recipient = parameter.section(' ', 0, 0); // what is the first word of the ctcp? - QString request = parameter.section(' ', 1, 1, QString::SectionSkipEmpty); + QString request = parameter.section(' ', 1, 1, QString::SectionSkipEmpty).upper(); // what is the complete ctcp command? - QString message = parameter.section(' ', 1, 0xffffff, QString::SectionSkipEmpty); + QString message = parameter.section(' ', 2, 0xffffff, QString::SectionSkipEmpty); - if(request.lower() == "ping") + QString out = request; + if (!message.isEmpty()) + out+= ' ' + message; + + if (request == "PING") { unsigned int time_t = QDateTime::currentDateTime().toTime_t(); result.toServer = QString("PRIVMSG %1 :\x01PING %2\x01").arg(recipient).arg(time_t); @@ -743,8 +768,8 @@ } else { - result.toServer = "PRIVMSG " + recipient + " :" + '\x01' + message + '\x01'; - result.output = i18n("Sending CTCP-%1 request to %2.").arg(message).arg(recipient); + result.toServer = "PRIVMSG " + recipient + " :" + '\x01' + out + '\x01'; + result.output = i18n("Sending CTCP-%1 request to %2.").arg(out).arg(recipient); } result.typeString = i18n("CTCP"); @@ -862,7 +887,7 @@ { if(parameterList.count()==2) { - emit requestDccChat(parameterList[1]); + emit openDccChat(parameterList[1]); } else { @@ -896,8 +921,24 @@ return result; } + OutputFilterResult OutputFilter::passiveSendRequest(const QString& recipient,const QString &fileName,const QString &address,unsigned long size,const QString &token) + { + OutputFilterResult result; + QString niftyFileName(fileName); + + result.toServer = "PRIVMSG " + recipient + " :" + '\x01' + "DCC SEND " + + fileName + + ' ' + address + " 0 " + QString::number(size) + ' ' + token + '\x01'; + + // Dirty hack to avoid printing ""name with spaces.ext"" instead of "name with spaces.ext" + if ((fileName.startsWith("\"")) && (fileName.endsWith("\""))) + niftyFileName = fileName.mid(1, fileName.length()-2); + + return result; + } + // Accepting Resume Request - OutputFilterResult OutputFilter::acceptRequest(const QString &recipient,const QString &fileName,const QString &port,int startAt) + OutputFilterResult OutputFilter::acceptResumeRequest(const QString &recipient,const QString &fileName,const QString &port,int startAt) { QString niftyFileName(fileName); @@ -929,6 +970,23 @@ return result; } + OutputFilterResult OutputFilter::acceptPassiveSendRequest(const QString& recipient,const QString &fileName,const QString &address,const QString &port,unsigned long size,const QString &token) + { + OutputFilterResult result; + QString niftyFileName(fileName); + + // "DCC SEND" to receive a file sounds weird, but it's ok. + result.toServer = "PRIVMSG " + recipient + " :" + '\x01' + "DCC SEND " + + fileName + + ' ' + address + ' ' + port + ' ' + QString::number(size) + ' ' + token + '\x01'; + + // Dirty hack to avoid printing ""name with spaces.ext"" instead of "name with spaces.ext" + if ((fileName.startsWith("\"")) && (fileName.endsWith("\""))) + niftyFileName = fileName.mid(1, fileName.length()-2); + + return result; + } + OutputFilterResult OutputFilter::parseInvite(const QString ¶meter) { OutputFilterResult result; @@ -1019,10 +1077,14 @@ { OutputFilterResult result; - QString groupName = m_server->getServerGroup(); - int serverGroupId = m_server->serverGroupSettings()->id(); + QString groupName = m_server->getDisplayName(); + + int serverGroupId = -1; + + if (m_server->getServerGroup()) + serverGroupId = m_server->getServerGroup()->id(); - if (!parameter.isEmpty()) + if (!parameter.isEmpty() && serverGroupId != -1) { QStringList list = QStringList::split(' ', parameter); @@ -1041,7 +1103,7 @@ } // show (new) notify list to user - QString list = Preferences::notifyStringByGroupName(groupName) + ' ' + Konversation::Addressbook::self()->allContactsNicksForServer(m_server->getServerName(), m_server->getServerGroup()).join(" "); + QString list = Preferences::notifyStringByGroupName(groupName) + ' ' + Konversation::Addressbook::self()->allContactsNicksForServer(m_server->getServerName(), m_server->getDisplayName()).join(" "); result.typeString = i18n("Notify"); @@ -1100,10 +1162,11 @@ QString channel; QString option; // check for option - bool host = (parameterList[0].lower() == "-host"); - bool domain = (parameterList[0].lower() == "-domain"); - bool uhost = (parameterList[0].lower() == "-userhost"); - bool udomain = (parameterList[0].lower() == "-userdomain"); + QString lowerParameter = parameterList[0].lower(); + bool host = (lowerParameter == "-host"); + bool domain = (lowerParameter == "-domain"); + bool uhost = (lowerParameter == "-userhost"); + bool udomain = (lowerParameter == "-userdomain"); // remove possible option if (host || domain || uhost || udomain) @@ -1163,9 +1226,9 @@ if (showUsage) { if (!kick) - result = usage(i18n("Usage: %1BAN [-HOST | -DOMAIN] [channel] ").arg(commandChar)); + result = usage(i18n("Usage: %1BAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] ").arg(commandChar)); else - result = usage(i18n("Usage: %1KICKBAN [-HOST | -DOMAIN] [channel] [reason]").arg(commandChar)); + result = usage(i18n("Usage: %1KICKBAN [-HOST | -DOMAIN | -USERHOST | -USERDOMAIN] [channel] [reason]").arg(commandChar)); } return result; @@ -1438,11 +1501,6 @@ return result; } - void OutputFilter::parseAaway(const QString& parameter) - { - emit multiServerCommand("away", parameter); - } - OutputFilterResult OutputFilter::parseAme(const QString& parameter) { OutputFilterResult result; @@ -1471,10 +1529,8 @@ void OutputFilter::parseServer(const QString& parameter) { - if(parameter.isEmpty()) - { + if (parameter.isEmpty() && !m_server->isConnected() && !m_server->isConnecting()) emit reconnectServer(); - } else { QStringList splitted = QStringList::split(" ", parameter); @@ -1482,165 +1538,20 @@ QString port = "6667"; QString password; - // 'hostname port password' - if (splitted.count()==3) + if (splitted.count() == 3) + emit connectTo(Konversation::CreateNewConnection, splitted[0], splitted[1], splitted[2]); + else if (splitted.count() == 2) { - KonviIpHelper hostParser(host); - host = hostParser.host(); - - port = splitted[1]; - password = splitted[2]; - } - // 'hostname:port password' or 'hostname port' - else if (splitted.count()==2) - { - KonviIpHelper hostParser(host); - host = hostParser.host(); - - if (!hostParser.port().isEmpty()) - { - port = hostParser.port(); - password = splitted[1]; - } + if (splitted[0].contains(QRegExp(":[0-9]+$"))) + emit connectTo(Konversation::CreateNewConnection, splitted[0], "", splitted[1]); else - { - port = splitted[1]; - } - } - // 'hostname:port' or 'hostname' - else - { - KonviIpHelper hostParser(host); - host = hostParser.host(); - - if (!hostParser.port().isEmpty()) - { - port = hostParser.port(); - } - } - - if (Preferences::isServerGroup(host)) - { - emit connectToServerGroup(host); + emit connectTo(Konversation::CreateNewConnection, splitted[0], splitted[1]); } else - { - emit connectToServer(host, port, password); - } + emit connectTo(Konversation::CreateNewConnection, splitted[0]); } } - OutputFilterResult OutputFilter::parsePrefs(const QString& parameter) - { - OutputFilterResult result; - bool showUsage = false; - - if (parameter.isEmpty()) - showUsage = true; - else - { - KConfig* config=KApplication::kApplication()->config(); - - QStringList splitted = KShell::splitArgs(parameter); - - if (splitted.count() > 0) - { - QString group = splitted[0]; - QStringList groupList(config->groupList()); - uint i; - if (group.lower() == "list") - { - // List available groups. - result = usage(i18n("Available preferences groups: ") + groupList.join("|")); - } - else - { - // Validate group. - bool validGroup = false; - for (i = 0; i < groupList.count(); ++i) - { - if (group.lower() == groupList[i].lower()) - { - validGroup = true; - group = groupList[i]; - break; - } - } - if (validGroup && splitted.count() > 1) - { - QString option = splitted[1]; - QMap options = config->entryMap(group); - QValueList optionList = options.keys(); - QValueList optionValueList = options.values(); - - if (option.lower() == "list") - { - // List available options in group. - QString output = i18n("Available options in group %1:").arg( group ); - - for (i = 0; i < optionList.count(); ++i) - { - output += optionList[i] + '(' + optionValueList[i] + ")|"; - } - - result = usage(output); - } - else - { - // Validate option. - bool validOption = false; - for (i = 0; i < optionList.count(); ++i) - { - if (option.lower() == optionList[i].lower()) - { - validOption = true; - option = optionList[i]; - break; - } - } - if (validOption) - { - if (splitted.count() > 2) - { - // Set the desired option. - config->setGroup(group); - config->writeEntry(option, splitted[2]); - config->sync(); - // Reload preferences object. - dynamic_cast(kapp)->readOptions(); - } - // If no value given, just display current value. - else - { - result = usage(group + '/' + option + " = " + options[option]); - } - } - else - { - showUsage = true; - } - } - } - else - { - showUsage = true; - } - } - } - else - { - showUsage = true; - } - } - - if (showUsage) - { - result = usage(i18n("Usage: %1PREFS + + + + buttonListView + nameInput + actionInput + newButton + removeButton + klistview.h diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/quickconnectdialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/quickconnectdialog.cpp --- konversation-1.0.1/konversation/src/quickconnectdialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/quickconnectdialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,6 +12,9 @@ email: mail@tuxipuxi.de */ +#include "quickconnectdialog.h" +#include "konversationapplication.h" + #include #include #include @@ -20,8 +23,6 @@ #include #include -#include "quickconnectdialog.h" -#include "konversationapplication.h" QuickConnectDialog::QuickConnectDialog(QWidget *parent) :KDialogBase(parent, "quickconnect", true, i18n("Quick Connect"), @@ -88,16 +89,18 @@ void QuickConnectDialog::slotOk() { - if(!hostNameInput->text().isEmpty() && + if (!hostNameInput->text().isEmpty() && !portInput->text().isEmpty() && !nickInput->text().isEmpty()) { - emit connectClicked(hostNameInput->text().stripWhiteSpace(), - portInput->text(), - "", - nickInput->text(), - passwordInput->text(), - sslCheckBox->isChecked() ? true : false); + + emit connectClicked(Konversation::PromptToReuseConnection, + hostNameInput->text().stripWhiteSpace(), + portInput->text(), + passwordInput->text(), + nickInput->text(), + "", + sslCheckBox->isChecked()); delayedDestruct(); } } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/quickconnectdialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/quickconnectdialog.h --- konversation-1.0.1/konversation/src/quickconnectdialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/quickconnectdialog.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,29 +15,30 @@ #ifndef QUICKCONNECTDIALOG_H #define QUICKCONNECTDIALOG_H +#include "common.h" + #include -/* - @author Michael Goettsche -*/ +class QCheckBox; class KLineEdit; class QuickConnectDialog : public KDialogBase { Q_OBJECT - public: - QuickConnectDialog(QWidget* parent=0); + public: + explicit QuickConnectDialog(QWidget* parent=0); ~QuickConnectDialog(); - signals: - void connectClicked(const QString& hostName, - const QString& port, - const QString& channel, - const QString& nick, - const QString& password, - const bool& useSSL + signals: + void connectClicked(Konversation::ConnectionFlag flag, + const QString& hostName, + const QString& port, + const QString& password, + const QString& nick, + const QString& channel, + bool useSSL ); protected slots: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/rawlog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/rawlog.cpp --- konversation-1.0.1/konversation/src/rawlog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/rawlog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,9 +12,6 @@ email: eisfuchs@tigress.com */ -#include -#include - #include "rawlog.h" #include "channel.h" #include "ircview.h" @@ -22,15 +19,16 @@ #include "server.h" #include "konversationapplication.h" +#include +#include + + RawLog::RawLog(QWidget* parent) : ChatWindow(parent) { setName(i18n("Raw Log")); setType(ChatWindow::RawLog); IRCViewBox* ircBox = new IRCViewBox(this, 0); setTextView(ircBox->ircView()); // Server will be set later in setServer() - - connect(getTextView(), SIGNAL(updateTabNotification(Konversation::TabNotifyType)), - this, SLOT(morphNotification())); } RawLog::~RawLog() @@ -53,7 +51,7 @@ else { getTextView()->setViewBackground(Preferences::color(Preferences::TextViewBackground), - QString::null); + QString()); } if (Preferences::customTextFont()) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/rawlog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/rawlog.h --- konversation-1.0.1/konversation/src/rawlog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/rawlog.h 2008-08-06 16:56:27.000000000 +0100 @@ -17,9 +17,6 @@ #include "chatwindow.h" -/* - Dario Abatianni -*/ class RawLog : public ChatWindow { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/replycodes.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/replycodes.h --- konversation-1.0.1/konversation/src/replycodes.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/replycodes.h 2008-08-06 16:56:27.000000000 +0100 @@ -78,6 +78,7 @@ #define RPL_LIST 322 #define RPL_LISTEND 323 #define RPL_CHANNELMODEIS 324 +#define RPL_CHANNELURLIS 328 #define RPL_CHANNELCREATED 329 #define RPL_WHOISACCOUNT 330 #define RPL_NOTOPIC 331 diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/scriptlauncher.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/scriptlauncher.cpp --- konversation-1.0.1/konversation/src/scriptlauncher.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/scriptlauncher.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -10,6 +10,11 @@ Copyright (C) 2004 Peter Simonsson */ +#include "scriptlauncher.h" +#include "channel.h" +#include "konversationapplication.h" +#include "server.h" + #include #include #include @@ -19,10 +24,6 @@ #include #include -#include "channel.h" -#include "scriptlauncher.h" -#include "konversationapplication.h" -#include "server.h" ScriptLauncher::ScriptLauncher(Server* server) : QObject(server) @@ -47,10 +48,10 @@ // for one user alone in $HOME/.kde/share/apps/ QString scriptPath(kstddir.findResource("data","konversation/scripts/"+parameterList[0])); - process << scriptPath // script path and name - << kapp->dcopClient()->appId() // our dcop port - << m_server->getServerName() // the server we are connected to - << target; // the target where the call came from + process << scriptPath // script path and name + << kapp->dcopClient()->appId() // our dcop port + << QString::number(m_server->connectionId()) // the server we are connected to + << target; // the target where the call came from // send remaining parameters to the script for(unsigned int index=1;index Copyright (C) 2005 Ismail Donmez Copyright (C) 2005-2006 Peter Simonsson - Copyright (C) 2005 Eike Hein + Copyright (C) 2006-2008 Eli J. MacKenzie + Copyright (C) 2005-2008 Eike Hein */ -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "server.h" +#include "ircqueue.h" #include "query.h" #include "channel.h" #include "konversationapplication.h" -#include "dccpanel.h" -#include "dcctransfer.h" +#include "connectionmanager.h" +#include "dcccommon.h" +#include "dcctransferpanel.h" +#include "dcctransferpanelitem.h" #include "dcctransfersend.h" #include "dcctransferrecv.h" #include "dccrecipientdialog.h" @@ -54,93 +40,114 @@ #include "common.h" #include "notificationhandler.h" #include "blowfish.h" +#include "dcctransfermanager.h" +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -Server::Server(ViewContainer* viewContainer, int serverGroupId, bool clearQuickServerList) -{ - quickConnect = false; - m_serverGroup = Preferences::serverGroupById(serverGroupId); +int Server::m_availableConnectionId = 0; - if (clearQuickServerList) - m_serverGroup->clearQuickServerList(); // In case we already did a quick connect to this network +Server::Server(QObject* parent, ConnectionSettings& settings) : QObject(parent) +{ + m_connectionId = m_availableConnectionId; + m_availableConnectionId++; - bot = getIdentity()->getBot(); - botPassword = getIdentity()->getPassword(); + setConnectionSettings(settings); - init(viewContainer, getIdentity()->getNickname(0), ""); -} + m_connectionState = Konversation::SSNeverConnected; -Server::Server(ViewContainer* viewContainer,const QString& hostName,const QString& port, -const QString& channel,const QString& _nick, const QString& password,const bool& useSSL) -{ - quickConnect = true; + for (int i=0;i<=_max_queue();i++) + { + QValueList r=Preferences::queueRate(i); + IRCQueue *q=new IRCQueue(this, staticrates[i]); //FIXME these are supposed to be in the rc + m_queues.append(q); + } - QString nick( _nick ); + m_processingIncoming = false; + m_identifyMsg = false; + m_autoIdentifyLock = false; + m_autoJoin = false; - m_quickServer.setServer(hostName); - m_quickServer.setPort(port.toInt()); - m_quickServer.setPassword(password); - m_quickServer.setSSLEnabled(useSSL); + m_nickIndices.clear(); + m_nickIndices.append(0); - Konversation::ServerGroupSettingsPtr serverGroupOfServer; + m_currentLag = -1; + m_rawLog = 0; + m_channelListPanel = 0; + m_serverISON = 0; + m_away = false; + m_socket = 0; + m_prevISONList = QStringList(); + m_bytesReceived = 0; + m_encodedBytesSent=0; + m_bytesSent=0; + m_linesSent=0; + // TODO fold these into a QMAP, and these need to be reset to RFC values if this server object is reused. + m_serverNickPrefixModes = "ovh"; + m_serverNickPrefixes = "@+%"; + m_channelPrefixes = "#&"; - // If server is in an existing group, use that group (first group if server is in multiple groups) - if (serverGroupOfServer = Preferences::serverGroupByServer(hostName)) - { - m_serverGroup = serverGroupOfServer; - m_serverGroup->clearQuickServerList(); - m_serverGroup->setQuickServerList(m_quickServer); - } - else - { - m_serverGroup = new Konversation::ServerGroupSettings; - m_serverGroup->setIdentityId(Preferences::identityByName("Default")->id()); - m_serverGroup->setName(hostName); - m_serverGroup->addServer(m_quickServer); - } + setName(QString("server_" + settings.name()).ascii()); - // Happens when we are invoked from an irc:/ url - if (nick.isEmpty()) - nick = getIdentity()->getNickname(0); + setNickname(settings.initialNick()); + obtainNickInfo(getNickname()); - init (viewContainer, nick, channel); -} + m_statusView = getViewContainer()->addStatusView(this); -void Server::doPreShellCommand() -{ + if (Preferences::rawLog()) + addRawLog(false); - QString command = getIdentity()->getShellCommand(); - statusView->appendServerMessage(i18n("Info"),"Running preconfigured command..."); + m_inputFilter.setServer(this); + m_outputFilter = new Konversation::OutputFilter(this); + m_scriptLauncher = new ScriptLauncher(this); - connect( &preShellCommand,SIGNAL(processExited(KProcess*)),this,SLOT(preShellCommandExited(KProcess*))); + // don't delete items when they are removed + m_channelList.setAutoDelete(false); + // For /msg query completion + m_completeQueryPosition = 0; - QStringList commandList = QStringList::split(" ",command); + updateAutoJoin(settings.initialChannel()); - for ( QStringList::ConstIterator it = commandList.begin(); it != commandList.end(); ++it ) - { - preShellCommand << *it; - } + if (!getIdentity()->getShellCommand().isEmpty()) + QTimer::singleShot(0, this, SLOT(doPreShellCommand())); + else + QTimer::singleShot(0, this, SLOT(connectToIRCServer())); - if(!preShellCommand.start()) // Non blocking - { - preShellCommandExited(NULL); - } + initTimers(); + + if (getIdentity()->getShellCommand().isEmpty()) + connectSignals(); } Server::~Server() { //send queued messages kdDebug() << "Server::~Server(" << getServerName() << ")" << endl; - // Send out the last messages (usually the /QUIT) - send(); // Delete helper object. delete m_serverISON; m_serverISON = 0; + // clear nicks online emit nicksNowOnline(this,QStringList(),true); + // Make sure no signals get sent to a soon to be dying Server Window if (m_socket) { @@ -148,17 +155,20 @@ m_socket->deleteLater(); } + if (m_statusView) delete m_statusView; + closeRawLog(); closeChannelListPanel(); - channelList.setAutoDelete(true); - channelList.clear(); + m_channelList.setAutoDelete(true); + m_channelList.clear(); - queryList.setAutoDelete(true); - queryList.clear(); + m_queryList.setAutoDelete(true); + m_queryList.clear(); // Delete all the NickInfos and ChannelNick structures. m_allNicks.clear(); + ChannelMembershipMap::ConstIterator it; for ( it = m_joinedChannels.begin(); it != m_joinedChannels.end(); ++it ) @@ -171,233 +181,191 @@ m_queryNicks.clear(); - // notify KonversationApplication that this server is gone - emit deleted(this); + //Delete the queues + for (QValueVector::iterator it=m_queues.begin(); it != m_queues.end(); ++it) + delete *it; + + emit destroyed(m_connectionId); + + kdDebug() << "~Server done" << endl; } -void Server::init(ViewContainer* viewContainer, const QString& nick, const QString& channel) +//... so called to match the ChatWindow derivatives. +bool Server::closeYourself(bool) { - m_processingIncoming = false; - m_identifyMsg = false; - m_currentServerIndex = 0; - m_tryReconnect = true; - autoJoin = false; - tryNickNumber = 0; - reconnectCounter = 0; - currentLag = -1; - rawLog = 0; - channelListPanel = 0; - alreadyConnected = false; - rejoinChannels = false; - connecting = false; - m_serverISON = 0; - m_isAway = false; - m_socket = 0; - m_autoIdentifyLock = false; - keepViewsOpenAfterQuit = false; - reconnectAfterQuit = false; + QTimer::singleShot(0, m_statusView, SLOT(serverSaysClose())); + return true; +} - // TODO fold these into a QMAP, and these need to be reset to RFC values if this server object is reused. - serverNickPrefixModes = "ovh"; - serverNickPrefixes = "@+%"; - channelPrefixes = "#&"; - - timerInterval = 1; - - setName(QString("server_" + m_serverGroup->name()).ascii()); - setViewContainer(viewContainer); - statusView = getViewContainer()->addStatusView(this); - statusView->setNotificationsEnabled(m_serverGroup->enableNotifications()); - setNickname(nick); - obtainNickInfo(getNickname()); +void Server::doPreShellCommand() +{ - if(Preferences::rawLog()) - addRawLog(false); + QString command = getIdentity()->getShellCommand(); + getStatusView()->appendServerMessage(i18n("Info"),"Running preconfigured command..."); - inputFilter.setServer(this); - outputFilter = new Konversation::OutputFilter(this); - m_scriptLauncher = new ScriptLauncher(this); + connect(&m_preShellCommand,SIGNAL(processExited(KProcess*)), this, SLOT(preShellCommandExited(KProcess*))); - // don't delete items when they are removed - channelList.setAutoDelete(false); - // For /msg query completion - completeQueryPosition = 0; + QStringList commandList = QStringList::split(" ",command); - updateAutoJoin(channel); + for (QStringList::ConstIterator it = commandList.begin(); it != commandList.end(); ++it) + m_preShellCommand << *it; - if(!getIdentity()->getShellCommand().isEmpty()) - doPreShellCommand(); - else - connectToIRCServer(); + if (!m_preShellCommand.start()) preShellCommandExited(NULL); +} - initTimers(); +void Server::_fetchRates() +{ + for (int i=0;i<=_max_queue();i++) + { + QValueList r=Preferences::queueRate(i); + staticrates[i]=IRCQueue::EmptyingRate(r[0], r[1]*1000,IRCQueue::EmptyingRate::RateType(r[2])); + } +} - if(getIdentity()->getShellCommand().isEmpty()) - connectSignals(); +void Server::_stashRates() +{ + for (int i=0;i<=_max_queue();i++) + { + QValueList r; + r.append(staticrates[i].m_rate); + r.append(staticrates[i].m_interval/1000); + r.append(int(staticrates[i].m_type)); + Preferences::setQueueRate(i, r); + } +} - emit serverOnline(false); - emit connectionChangedState(this, SSDisconnected); +void Server::_resetRates() +{ + for (int i=0;i<=_max_queue();i++) + { + Preferences::self()->queueRateItem(i)->setDefault(); + QValueList r=Preferences::queueRate(i); + staticrates[i]=IRCQueue::EmptyingRate(r[0], r[1]*1000,IRCQueue::EmptyingRate::RateType(r[2])); + } } void Server::initTimers() { - notifyTimer.setName("notify_timer"); - incomingTimer.setName("incoming_timer"); - outgoingTimer.setName("outgoing_timer"); + m_notifyTimer.setName("notify_timer"); + m_incomingTimer.setName("incoming_timer"); } void Server::connectSignals() { - // Timers - connect(&incomingTimer, SIGNAL(timeout()), this, SLOT(processIncomingData())); - connect(&outgoingTimer, SIGNAL(timeout()), this, SLOT(send())); - connect(&unlockTimer, SIGNAL(timeout()), this, SLOT(unlockSending())); - connect(¬ifyTimer, SIGNAL(timeout()), this, SLOT(notifyTimeout())); + connect(&m_incomingTimer, SIGNAL(timeout()), this, SLOT(processIncomingData())); + connect(&m_notifyTimer, SIGNAL(timeout()), this, SLOT(notifyTimeout())); connect(&m_pingResponseTimer, SIGNAL(timeout()), this, SLOT(updateLongPongLag())); // OutputFilter - connect(outputFilter, SIGNAL(requestDccSend()), this,SLOT(requestDccSend())); - connect(outputFilter, SIGNAL(requestDccSend(const QString&)), this, SLOT(requestDccSend(const QString&))); - connect(outputFilter, SIGNAL(multiServerCommand(const QString&, const QString&)), + connect(getOutputFilter(), SIGNAL(requestDccSend()), this,SLOT(requestDccSend())); + connect(getOutputFilter(), SIGNAL(requestDccSend(const QString&)), this, SLOT(requestDccSend(const QString&))); + connect(getOutputFilter(), SIGNAL(multiServerCommand(const QString&, const QString&)), this, SLOT(sendMultiServerCommand(const QString&, const QString&))); - connect(outputFilter, SIGNAL(reconnectServer()), this, SLOT(reconnect())); - connect(outputFilter, SIGNAL(disconnectServer()), this, SLOT(disconnect())); - connect(outputFilter, SIGNAL(openDccSend(const QString &, KURL)), this, SLOT(addDccSend(const QString &, KURL))); - connect(outputFilter, SIGNAL(requestDccChat(const QString &)), this, SLOT(requestDccChat(const QString &))); - connect(outputFilter, SIGNAL(connectToServer(const QString&, const QString&, const QString&)), - this, SLOT(connectToNewServer(const QString&, const QString&, const QString&))); - connect(outputFilter, SIGNAL(connectToServerGroup(const QString&)), - this, SLOT(connectToServerGroup(const QString&))); - connect(outputFilter, SIGNAL(sendToAllChannels(const QString&)), this, SLOT(sendToAllChannels(const QString&))); - connect(outputFilter, SIGNAL(banUsers(const QStringList&,const QString&,const QString&)), + connect(getOutputFilter(), SIGNAL(reconnectServer()), this, SLOT(reconnect())); + connect(getOutputFilter(), SIGNAL(disconnectServer()), this, SLOT(disconnect())); + connect(getOutputFilter(), SIGNAL(openDccSend(const QString &, KURL)), this, SLOT(addDccSend(const QString &, KURL))); + connect(getOutputFilter(), SIGNAL(openDccChat(const QString &)), this, SLOT(openDccChat(const QString &))); + connect(getOutputFilter(), SIGNAL(sendToAllChannels(const QString&)), this, SLOT(sendToAllChannels(const QString&))); + connect(getOutputFilter(), SIGNAL(banUsers(const QStringList&,const QString&,const QString&)), this, SLOT(requestBan(const QStringList&,const QString&,const QString&))); - connect(outputFilter, SIGNAL(unbanUsers(const QString&,const QString&)), + connect(getOutputFilter(), SIGNAL(unbanUsers(const QString&,const QString&)), this, SLOT(requestUnban(const QString&,const QString&))); - connect(outputFilter, SIGNAL(openRawLog(bool)), this, SLOT(addRawLog(bool))); - connect(outputFilter, SIGNAL(closeRawLog()), this, SLOT(closeRawLog())); + connect(getOutputFilter(), SIGNAL(openRawLog(bool)), this, SLOT(addRawLog(bool))); + connect(getOutputFilter(), SIGNAL(closeRawLog()), this, SLOT(closeRawLog())); + connect(getOutputFilter(), SIGNAL(encodingChanged()), this, SLOT(updateEncoding())); + + KonversationApplication* konvApp = static_cast(kapp); + connect(getOutputFilter(), SIGNAL(connectTo(Konversation::ConnectionFlag, const QString&, + const QString&, const QString&, const QString&, const QString&, bool)), + konvApp->getConnectionManager(), SLOT(connectTo(Konversation::ConnectionFlag, + const QString&, const QString&, const QString&, const QString&, const QString&, bool))); + + connect(konvApp->getDccTransferManager(), SIGNAL(newTransferQueued(DccTransfer*)), + this, SLOT(slotNewDccTransferItemQueued(DccTransfer*))); + + connect(konvApp, SIGNAL(appearanceChanged()), this, SLOT(startNotifyTimer())); // ViewContainer connect(this, SIGNAL(showView(ChatWindow*)), getViewContainer(), SLOT(showView(ChatWindow*))); connect(this, SIGNAL(addDccPanel()), getViewContainer(), SLOT(addDccPanel())); - connect(this, SIGNAL(addDccChat(const QString&,const QString&,const QString&,const QStringList&,bool)), - getViewContainer(), SLOT(addDccChat(const QString&,const QString&,const QString&,const QStringList&,bool)) ); + connect(this, SIGNAL(addDccChat(const QString&,const QString&,const QStringList&,bool)), + getViewContainer(), SLOT(addDccChat(const QString&,const QString&,const QStringList&,bool)) ); connect(this, SIGNAL(serverLag(Server*, int)), getViewContainer(), SIGNAL(updateStatusBarLagLabel(Server*, int))); connect(this, SIGNAL(tooLongLag(Server*, int)), getViewContainer(), SIGNAL(setStatusBarLagLabelTooLongLag(Server*, int))); connect(this, SIGNAL(resetLag()), getViewContainer(), SIGNAL(resetStatusBarLagLabel())); - connect(outputFilter, SIGNAL(showView(ChatWindow*)), getViewContainer(), SLOT(showView(ChatWindow*))); - connect(outputFilter, SIGNAL(openKonsolePanel()), getViewContainer(), SLOT(addKonsolePanel())); - connect(outputFilter, SIGNAL(openChannelList(const QString&, bool)), getViewContainer(), SLOT(openChannelList(const QString&, bool))); - connect(outputFilter, SIGNAL(closeDccPanel()), getViewContainer(), SLOT(closeDccPanel())); - connect(outputFilter, SIGNAL(addDccPanel()), getViewContainer(), SLOT(addDccPanel())); - connect(&inputFilter, SIGNAL(addDccChat(const QString&,const QString&,const QString&,const QStringList&,bool)), - getViewContainer(), SLOT(addDccChat(const QString&,const QString&,const QString&,const QStringList&,bool)) ); + connect(getOutputFilter(), SIGNAL(showView(ChatWindow*)), getViewContainer(), SLOT(showView(ChatWindow*))); + connect(getOutputFilter(), SIGNAL(openKonsolePanel()), getViewContainer(), SLOT(addKonsolePanel())); + connect(getOutputFilter(), SIGNAL(openChannelList(const QString&, bool)), getViewContainer(), SLOT(openChannelList(const QString&, bool))); + connect(getOutputFilter(), SIGNAL(closeDccPanel()), getViewContainer(), SLOT(closeDccPanel())); + connect(getOutputFilter(), SIGNAL(addDccPanel()), getViewContainer(), SLOT(addDccPanel())); + connect(&m_inputFilter, SIGNAL(addDccChat(const QString&,const QString&,const QStringList&,bool)), + getViewContainer(), SLOT(addDccChat(const QString&,const QString&,const QStringList&,bool)) ); // Inputfilter - connect(&inputFilter, SIGNAL(welcome(const QString&)), this, SLOT(connectionEstablished(const QString&))); - connect(&inputFilter, SIGNAL(notifyResponse(const QString&)), this, SLOT(notifyResponse(const QString&))); - connect(&inputFilter, SIGNAL(addDccGet(const QString&, const QStringList&)), + connect(&m_inputFilter, SIGNAL(welcome(const QString&)), this, SLOT(connectionEstablished(const QString&))); + connect(&m_inputFilter, SIGNAL(notifyResponse(const QString&)), this, SLOT(notifyResponse(const QString&))); + connect(&m_inputFilter, SIGNAL(startReverseDccSendTransfer(const QString&,const QStringList&)), + this, SLOT(startReverseDccSendTransfer(const QString&,const QStringList&))); + connect(&m_inputFilter, SIGNAL(addDccGet(const QString&, const QStringList&)), this, SLOT(addDccGet(const QString&, const QStringList&))); - connect(&inputFilter, SIGNAL(resumeDccGetTransfer(const QString&, const QStringList&)), + connect(&m_inputFilter, SIGNAL(resumeDccGetTransfer(const QString&, const QStringList&)), this, SLOT(resumeDccGetTransfer(const QString&, const QStringList&))); - connect(&inputFilter, SIGNAL(resumeDccSendTransfer(const QString&, const QStringList&)), + connect(&m_inputFilter, SIGNAL(resumeDccSendTransfer(const QString&, const QStringList&)), this, SLOT(resumeDccSendTransfer(const QString&, const QStringList&))); - connect(&inputFilter, SIGNAL(userhost(const QString&,const QString&,bool,bool)), + connect(&m_inputFilter, SIGNAL(userhost(const QString&,const QString&,bool,bool)), this, SLOT(userhost(const QString&,const QString&,bool,bool)) ); - connect(&inputFilter, SIGNAL(topicAuthor(const QString&,const QString&)), - this, SLOT(setTopicAuthor(const QString&,const QString&)) ); - connect(&inputFilter, SIGNAL(endOfWho(const QString&)), + connect(&m_inputFilter, SIGNAL(topicAuthor(const QString&,const QString&,QDateTime)), + this, SLOT(setTopicAuthor(const QString&,const QString&,QDateTime)) ); + connect(&m_inputFilter, SIGNAL(endOfWho(const QString&)), this, SLOT(endOfWho(const QString&)) ); - connect(&inputFilter, SIGNAL(invitation(const QString&,const QString&)), + connect(&m_inputFilter, SIGNAL(invitation(const QString&,const QString&)), this,SLOT(invitation(const QString&,const QString&)) ); - connect(&inputFilter, SIGNAL(addToChannelList(const QString&, int, const QString& )), + connect(&m_inputFilter, SIGNAL(addToChannelList(const QString&, int, const QString& )), this, SLOT(addToChannelList(const QString&, int, const QString& ))); - connect(&inputFilter, SIGNAL(away()), this, SLOT(away())); - connect(&inputFilter, SIGNAL(unAway()), this, SLOT(unAway())); // Status View - connect(this, SIGNAL(serverOnline(bool)), statusView, SLOT(serverOnline(bool))); + connect(this, SIGNAL(serverOnline(bool)), getStatusView(), SLOT(serverOnline(bool))); // Scripts - connect(outputFilter, SIGNAL(launchScript(const QString&, const QString&)), + connect(getOutputFilter(), SIGNAL(launchScript(const QString&, const QString&)), m_scriptLauncher, SLOT(launchScript(const QString&, const QString&))); connect(m_scriptLauncher, SIGNAL(scriptNotFound(const QString&)), this, SLOT(scriptNotFound(const QString&))); connect(m_scriptLauncher, SIGNAL(scriptExecutionError(const QString&)), this, SLOT(scriptExecutionError(const QString&))); + // Stats + connect(this, SIGNAL(sentStat(int, int)), SLOT(collectStats(int, int))); } -QString Server::getServerName() const -{ - return m_serverGroup->serverByIndex(m_currentServerIndex).server(); -} - -int Server::getPort() const -{ - return m_serverGroup->serverByIndex(m_currentServerIndex).port(); -} - -QString Server::getServerGroup() const +int Server::getPort() { - return m_serverGroup->name(); + return getConnectionSettings().server().port(); } int Server::getLag() const { - return currentLag; + return m_currentLag; } bool Server::getAutoJoin() const { - return autoJoin; + return m_autoJoin; } void Server::setAutoJoin(bool on) { - autoJoin = on; -} - -QString Server::getAutoJoinChannel() const -{ - return autoJoinChannel; -} - -void Server::setAutoJoinChannel(const QString &channel) -{ - autoJoinChannel = channel; -} - -QString Server::getAutoJoinChannelKey() const -{ - return autoJoinChannelKey; -} - -void Server::setAutoJoinChannelKey(const QString &key) -{ - autoJoinChannelKey = key; -} - -bool Server::isConnected() const -{ - if (!m_socket) - return false; - - return (m_socket->state() == KNetwork::KClientSocketBase::Connected); -} - -bool Server::isConnecting() const -{ - return connecting; + m_autoJoin = on; } void Server::preShellCommandExited(KProcess* proc) { if (proc && proc->normalExit()) - statusView->appendServerMessage(i18n("Info"),"Process executed successfully!"); + getStatusView()->appendServerMessage(i18n("Info"),"Process executed successfully!"); else - statusView->appendServerMessage(i18n("Warning"),"There was a problem while executing the command!"); + getStatusView()->appendServerMessage(i18n("Warning"),"There was a problem while executing the command!"); connectToIRCServer(); connectSignals(); @@ -405,77 +373,71 @@ void Server::connectToIRCServer() { - deliberateQuit = false; - keepViewsOpenAfterQuit = false; - reconnectAfterQuit = false; - m_autoIdentifyLock = false; - - connecting = true; - - ownIpByUserhost = QString(); - - outputBuffer.clear(); + if (!isConnected()) + { + updateConnectionState(Konversation::SSConnecting); - if(m_socket) - m_socket->blockSignals(false); + m_autoIdentifyLock = false; + m_ownIpByUserhost = QString(); - // prevent sending queue until server has sent something or the timeout is through - lockSending(); + resetQueues(); - if (!isConnected()) - { // This is needed to support server groups with mixed SSL and nonSSL servers delete m_socket; - tryNickNumber = 0; + m_socket = 0; + resetNickSelection(); // connect() will do a async lookup too - if(!m_serverGroup->serverByIndex(m_currentServerIndex).SSLEnabled()) + if(!getConnectionSettings().server().SSLEnabled()) { - m_socket = new KNetwork::KBufferedSocket(QString::null, QString::null, 0L, "serverSocket"); - connect(m_socket,SIGNAL (connected(const KResolverEntry&)),this,SLOT (ircServerConnectionSuccess())); + m_socket = new KNetwork::KBufferedSocket(QString(), QString(), 0L, "serverSocket"); + connect(m_socket, SIGNAL(connected(const KResolverEntry&)), SLOT (ircServerConnectionSuccess())); } else { m_socket = new SSLSocket(getViewContainer()->getWindow(), 0L, "serverSSLSocket"); - connect(m_socket,SIGNAL (sslInitDone()),this,SLOT (ircServerConnectionSuccess())); - connect(m_socket,SIGNAL (sslFailure(QString)),this,SIGNAL(sslInitFailure())); - connect(m_socket,SIGNAL (sslFailure(QString)),this,SLOT(sslError(QString))); + connect(m_socket, SIGNAL(sslInitDone()), SLOT(ircServerConnectionSuccess())); + connect(m_socket, SIGNAL(sslFailure(const QString&)), SIGNAL(sslInitFailure())); + connect(m_socket, SIGNAL(sslFailure(const QString&)), SLOT(sslError(const QString&))); } - connect(m_socket,SIGNAL (hostFound()),this,SLOT(lookupFinished())); - connect(m_socket,SIGNAL (gotError(int)),this,SLOT (broken(int)) ); - connect(m_socket,SIGNAL (readyRead()),this,SLOT (incoming()) ); - connect(m_socket,SIGNAL (readyWrite()),this,SLOT (send()) ); - connect(m_socket,SIGNAL (closed()),this,SLOT(closed())); + m_socket->enableWrite(false); + + connect(m_socket, SIGNAL(hostFound()), SLOT(lookupFinished())); + connect(m_socket, SIGNAL(gotError(int)), SLOT(broken(int)) ); + connect(m_socket, SIGNAL(readyRead()), SLOT(incoming())); + connect(m_socket, SIGNAL(closed()), SLOT(closed())); - m_socket->connect(m_serverGroup->serverByIndex(m_currentServerIndex).server(), - QString::number(m_serverGroup->serverByIndex(m_currentServerIndex).port())); + m_socket->connect(getConnectionSettings().server().host(), QString::number(getConnectionSettings().server().port())); // set up the connection details - setPrefixes(serverNickPrefixModes, serverNickPrefixes); - statusView->appendServerMessage(i18n("Info"),i18n("Looking for server %1:%2...") - .arg(m_serverGroup->serverByIndex(m_currentServerIndex).server()) - .arg(m_serverGroup->serverByIndex(m_currentServerIndex).port())); + setPrefixes(m_serverNickPrefixModes, m_serverNickPrefixes); + getStatusView()->appendServerMessage(i18n("Info"),i18n("Looking for server %1:%2...") + .arg(getConnectionSettings().server().host()) + .arg(getConnectionSettings().server().port())); // reset InputFilter (auto request info, /WHO request info) - inputFilter.reset(); - emit connectionChangedState(this, SSConnecting); + m_inputFilter.reset(); } + else + kdDebug() << "connectToIRCServer() called while already connected: This should never happen." << endl; } void Server::showSSLDialog() { - static_cast(m_socket)->showInfoDialog(); + SSLSocket* sslsocket = dynamic_cast(m_socket); + + if (sslsocket) sslsocket->showInfoDialog(); } // set available channel types according to 005 RPL_ISUPPORT void Server::setChannelTypes(const QString &pre) { - channelPrefixes = pre; + m_channelPrefixes = pre; } QString Server::getChannelTypes() const { - return channelPrefixes; + return m_channelPrefixes; } // set user mode prefixes according to non-standard 005-Reply (see inputfilter.cpp) @@ -483,8 +445,8 @@ { // NOTE: serverModes is QString::null, if server did not supply the // modes which relates to the network's nick-prefixes - serverNickPrefixModes = modes; - serverNickPrefixes = prefixes; + m_serverNickPrefixModes = modes; + m_serverNickPrefixes = prefixes; } // return a nickname without possible mode character at the beginning @@ -499,12 +461,9 @@ int modeIndex; - if(nickname.isEmpty()) - { - return; - } + if (nickname.isEmpty()) return; - while((modeIndex = serverNickPrefixes.find(nickname[0])) != -1) + while ((modeIndex = m_serverNickPrefixes.find(nickname[0])) != -1) { if(nickname.isEmpty()) return; @@ -512,9 +471,9 @@ // cut off the prefix bool recognisedMode = false; // determine, whether status is like op or like voice - while((modeIndex)serverByIndex(m_currentServerIndex).SSLEnabled() && m_socket->status()) + if(m_socket->status()) { // inform user about the error - statusView->appendServerMessage(i18n("Error"),i18n("Server %1 not found. %2") - .arg(m_serverGroup->serverByIndex(m_currentServerIndex).server()) + getStatusView()->appendServerMessage(i18n("Error"),i18n("Server %1 not found: %2") + .arg(getConnectionSettings().server().host()) .arg(m_socket->errorString(m_socket->error()))); m_socket->resetStatus(); - // prevent retrying to connect - m_tryReconnect = false; + // broken connection broken(m_socket->error()); } else - { - statusView->appendServerMessage(i18n("Info"),i18n("Server found, connecting...")); - } + getStatusView()->appendServerMessage(i18n("Info"),i18n("Server found, connecting...")); } void Server::ircServerConnectionSuccess() { - reconnectCounter = 0; - Konversation::ServerSettings serverSettings = m_serverGroup->serverByIndex(m_currentServerIndex); + getConnectionSettings().setReconnectCount(0); - connect(this, SIGNAL(nicknameChanged(const QString&)), statusView, SLOT(setNickname(const QString&))); - statusView->appendServerMessage(i18n("Info"),i18n("Connected; logging in...")); + Konversation::ServerSettings serverSettings = getConnectionSettings().server(); + + connect(this, SIGNAL(nicknameChanged(const QString&)), getStatusView(), SLOT(setNickname(const QString&))); + getStatusView()->appendServerMessage(i18n("Info"),i18n("Connected; logging in...")); QString connectString = "USER " + getIdentity()->getIdent() + " 8 * :" + // 8 = +i; 4 = +w getIdentity()->getRealName(); - if(!serverSettings.password().isEmpty()) - queueAt(0, "PASS " + serverSettings.password()); - - queueAt(1,"NICK "+getNickname()); - queueAt(2,connectString); + QStringList ql; + if (!serverSettings.password().isEmpty()) + ql << "PASS " + serverSettings.password(); + + ql << "NICK "+getNickname(); + ql << connectString; + queueList(ql, HighPriority); emit nicknameChanged(getNickname()); m_socket->enableRead(true); - - // wait at most 2 seconds for server to send something before sending the queue ourselves - unlockTimer.start(2000); - - connecting = false; } void Server::broken(int state) { + kdDebug() << "Connection broken (Socket fd " << m_socket->socketDevice()->socket() << ") " << state << "!" << endl; + m_socket->enableRead(false); - m_socket->enableWrite(false); + m_socket->enableWrite(false); //FIXME if we rely on this signal, it should be turned back on somewhere... m_socket->blockSignals(true); - alreadyConnected = false; - connecting = false; - m_autoIdentifyLock = false; - outputBuffer.clear(); + resetQueues(); - notifyTimer.stop(); + m_notifyTimer.stop(); m_pingResponseTimer.stop(); - inputFilter.setLagMeasuring(false); - currentLag = -1; + m_inputFilter.setLagMeasuring(false); + m_currentLag = -1; // HACK Only show one nick change dialog at connection time - if(getStatusView()) + if (getStatusView()) { KDialogBase* nickChangeDialog = dynamic_cast( getStatusView()->child("NickChangeDialog", "KInputDialog")); - if(nickChangeDialog) { - nickChangeDialog->cancel(); - } + if (nickChangeDialog) nickChangeDialog->cancel(); } - emit connectionChangedState(this, SSDisconnected); - emit resetLag(); - emit serverOnline(false); emit nicksNowOnline(this,QStringList(),true); - kdDebug() << "Connection broken (Socket fd " << m_socket->socketDevice()->socket() << ") " << state << "!" << endl; - + updateAutoJoin(); - if (!deliberateQuit) + if (getConnectionState() != Konversation::SSDeliberatelyDisconnected) { - static_cast(kapp)->notificationHandler()->connectionFailure(statusView, m_serverGroup->serverByIndex(m_currentServerIndex).server()); - - ++reconnectCounter; - - if (Preferences::autoReconnect() && reconnectCounter <= Preferences::reconnectCount()) - { - updateAutoJoin(); - - QString error = i18n("Connection to Server %1 lost: %2. Trying to reconnect.") - .arg(m_serverGroup->serverByIndex(m_currentServerIndex).server()) - .arg(KNetwork::KSocketBase::errorString((KNetwork::KSocketBase::SocketError)state)); - - statusView->appendServerMessage(i18n("Error"), error); - - QTimer::singleShot(5000, this, SLOT(connectToIRCServer())); - rejoinChannels = true; - } - else if (!Preferences::autoReconnect() || reconnectCounter > Preferences::reconnectCount()) - { - updateAutoJoin(); - - QString error = i18n("Connection to Server %1 failed: %2.") - .arg(m_serverGroup->serverByIndex(m_currentServerIndex).server()) - .arg(KNetwork::KSocketBase::errorString((KNetwork::KSocketBase::SocketError)state)); - - statusView->appendServerMessage(i18n("Error"),error); - reconnectCounter = 0; - - // If this iteration has occurred before we ever were connected, - // the channel list will be empty and we want to do autojoin. - // If the channel list is not empty, however, rejoin the old - // channels. - if (channelList.isEmpty()) - rejoinChannels = false; - else - rejoinChannels = true; + static_cast(kapp)->notificationHandler()->connectionFailure(getStatusView(), getServerName()); - // Broke on a temp. server, so remove it from serverList; otherwise increment the index - if (!m_serverGroup->quickServerList().isEmpty()) - { - m_quickServer = m_serverGroup->quickServerList().first(); - m_serverGroup->clearQuickServerList(); - } - else - { - m_currentServerIndex++; - } + QString error = i18n("Connection to Server %1 lost: %2.") + .arg(getConnectionSettings().server().host()) + .arg(KNetwork::KSocketBase::errorString((KNetwork::KSocketBase::SocketError)state)); - // The next server in the list is actually identical to our original quickserver, so skip it - if (m_serverGroup->serverByIndex(m_currentServerIndex)==m_quickServer) - { - m_currentServerIndex++; - } + getStatusView()->appendServerMessage(i18n("Error"), error); - if(m_currentServerIndex < m_serverGroup->serverList().count()) - { - error = i18n("Trying server %1 instead.") - .arg(m_serverGroup->serverByIndex(m_currentServerIndex).server()); - statusView->appendServerMessage(i18n("Error"),error ); - - connectToIRCServer(); - } - else - { - if (Preferences::autoReconnect()) - { - error = i18n("Waiting for 2 minutes before another reconnection attempt..."); - statusView->appendServerMessage(i18n("Info"),error); - m_currentServerIndex = 0; - QTimer::singleShot(2*60*1000, this, SLOT(connectToIRCServer())); - } - } - } - else - { - QString error = i18n("Connection to Server %1 failed: %2.") - .arg(m_serverGroup->serverByIndex(m_currentServerIndex).server()); - statusView->appendServerMessage(i18n("Error"),error); - } - } // If we quit the connection with the server - else - { - if (keepViewsOpenAfterQuit) - { - keepViewsOpenAfterQuit = false; - - statusView->appendServerMessage(i18n("Info"),i18n("Disconnected from server.")); - - if (reconnectAfterQuit) - { - reconnectAfterQuit = false; - - updateAutoJoin(); - rejoinChannels = true; - reconnectCounter = 0; - QTimer::singleShot(3000, this, SLOT(connectToIRCServer())); - - } - } - else - { - m_serverGroup->clearQuickServerList(); - getViewContainer()->serverQuit(this); - } + updateConnectionState(Konversation::SSInvoluntarilyDisconnected); } } void Server::sslError(const QString& reason) { QString error = i18n("Could not connect to %1:%2 using SSL encryption.Maybe the server does not support SSL, or perhaps you have the wrong port? %3") - .arg(m_serverGroup->serverByIndex(m_currentServerIndex).server()) - .arg(m_serverGroup->serverByIndex(m_currentServerIndex).port()) + .arg(getConnectionSettings().server().host()) + .arg(getConnectionSettings().server().port()) .arg(reason); - statusView->appendServerMessage(i18n("SSL Connection Error"),error); - m_tryReconnect = false; + getStatusView()->appendServerMessage(i18n("SSL Connection Error"),error); + updateConnectionState(Konversation::SSDeliberatelyDisconnected); } // Will be called from InputFilter as soon as the Welcome message was received @@ -783,84 +635,79 @@ if (!ownHost.isEmpty()) KNetwork::KResolver::resolveAsync(this,SLOT(gotOwnResolvedHostByWelcome(KResolverResults)),ownHost,"0"); - emit serverOnline(true); - emit connectionChangedState(this, SSConnected); + updateConnectionState(Konversation::SSConnected); - if(!alreadyConnected) - { - alreadyConnected=true; - // Make a helper object to build ISON (notify) list and map offline nicks to addressbook. - // TODO: Give the object a kick to get it started? - m_serverISON = new ServerISON(this); - // get first notify very early - startNotifyTimer(1000); - // Register with services - registerWithServices(); - // get own ip by userhost - requestUserhost(nickname); - - // Start the PINGPONG match - QTimer::singleShot(1000 /*1 sec*/, this, SLOT(sendPing())); - - // Recreate away state if we were set away prior to a reconnect. - if (isAway()) - { - // Correct server's beliefs about its away state. - m_isAway = false; - QString awayReason = m_awayReason.isEmpty() ? i18n("Gone away for now.") : m_awayReason; - QString command(Preferences::commandChar() + "AWAY " + awayReason); - Konversation::OutputFilterResult result = outputFilter->parse(getNickname(),command, QString::null); - queue(result.toServer); - } - - if (rejoinChannels) - { - rejoinChannels = false; - autoRejoinChannels(); - } - } - else - { - kdDebug() << "alreadyConnected == true! How did that happen?" << endl; + // Make a helper object to build ISON (notify) list and map offline nicks to addressbook. + // TODO: Give the object a kick to get it started? + m_serverISON = new ServerISON(this); + // get first notify very early + startNotifyTimer(1000); + // Register with services + registerWithServices(); + // get own ip by userhost + requestUserhost(getNickname()); + + // Start the PINGPONG match + QTimer::singleShot(1000 /*1 sec*/, this, SLOT(sendPing())); + + // Recreate away state if we were set away prior to a reconnect. + if (m_away) + { + // Correct server's beliefs about its away state. + m_away = false; + requestAway(m_awayReason); } } void Server::registerWithServices() { - if(!botPassword.isEmpty() && !bot.isEmpty() && !m_autoIdentifyLock) + if (getIdentity() && !getIdentity()->getBot().isEmpty() + && !getIdentity()->getPassword().isEmpty() + && !m_autoIdentifyLock) { - queue("PRIVMSG "+bot+" :identify "+botPassword); + queue("PRIVMSG "+getIdentity()->getBot()+" :identify "+getIdentity()->getPassword(), HighPriority); - // Set lock to prevent a second auto-identify attempt - // Lock is unset if we nickchange m_autoIdentifyLock = true; } } +//FIXME operator[] inserts an empty T& so each destination might just as well have its own key storage QCString Server::getKeyForRecipient(const QString& recipient) const { - return keyMap[recipient]; + return m_keyMap[recipient]; } void Server::setKeyForRecipient(const QString& recipient, const QCString& key) { - keyMap[recipient] = key; + m_keyMap[recipient] = key; } void Server::gotOwnResolvedHostByWelcome(KResolverResults res) { - if ( res.error() == KResolver::NoError && !res.isEmpty() ) - ownIpByWelcome = res.first().address().nodeName(); + if (res.error() == KResolver::NoError && !res.isEmpty()) + m_ownIpByWelcome = res.first().address().nodeName(); else kdDebug() << "Server::gotOwnResolvedHostByWelcome(): Got error: " << ( int )res.error() << endl; } void Server::quitServer() { + // Make clear this is deliberate even if the QUIT never actually goes through the queue + // (i.e. this is not redundant with _send_internal()'s updateConnectionState() call for + // a QUIT). + updateConnectionState(Konversation::SSDeliberatelyDisconnected); + QString command(Preferences::commandChar()+"QUIT"); - Konversation::OutputFilterResult result = outputFilter->parse(getNickname(),command, QString::null); - queue(result.toServer); - if (m_socket) m_socket->enableRead(false); + Konversation::OutputFilterResult result = getOutputFilter()->parse(getNickname(),command, QString()); + queue(result.toServer, HighPriority); + + m_socket->enableRead(false); + + flushQueues(); + + m_socket->close(); + + getStatusView()->appendServerMessage(i18n("Info"), i18n("Disconnected from %1.").arg(getConnectionSettings().server().host())); } void Server::notifyAction(const QString& nick) @@ -868,16 +715,16 @@ // parse wildcards (toParse,nickname,channelName,nickList,parameter) QString out = parseWildcards(Preferences::notifyDoubleClickAction(), getNickname(), - QString::null, - QString::null, + QString(), + QString(), nick, - QString::null); + QString()); // Send all strings, one after another QStringList outList = QStringList::split('\n',out); - for(unsigned int index=0; indexparse(getNickname(),outList[index],QString::null); + Konversation::OutputFilterResult result = getOutputFilter()->parse(getNickname(),outList[index],QString()); queue(result.toServer); } // endfor } @@ -885,46 +732,35 @@ void Server::notifyResponse(const QString& nicksOnline) { bool nicksOnlineChanged = false; - // Create a case correct nick list from the notification reply - QStringList nickList = QStringList::split(' ',nicksOnline); + QStringList actualList = QStringList::split(' ',nicksOnline); + QString lcActual = ' ' + nicksOnline + ' '; + QString lcPrevISON = ' ' + (m_prevISONList.join(" ")) + ' '; QStringList::iterator it; - QStringList::iterator itEnd = nickList.end(); - // Any new watched nicks online? - for(it = nickList.begin(); it != itEnd; ++it) + //Are any nicks gone offline + for (it = m_prevISONList.begin(); it != m_prevISONList.end(); ++it) { - QString nickname = (*it); - - if (!isNickOnline(nickname)) + if (lcActual.find(' ' + (*it) + ' ', 0, false) == -1) { - setWatchedNickOnline(nickname); + setNickOffline(*it); nicksOnlineChanged = true; } } - // Create a lower case nick list from the notification reply - QStringList nickLowerList = QStringList::split(' ',nicksOnline.lower()); - // Get ISON list from preferences and addressbook. - QString watchlist = getISONListString(); - // Create a case correct nick list from the watch list. - QStringList watchList = QStringList::split(' ',watchlist); - itEnd = watchList.end(); - - // Any watched nicks now offline? - for(it = watchList.begin(); it != itEnd; ++it) + //Are any nicks gone online + for (it = actualList.begin(); it != actualList.end(); ++it) { - QString lcNickName = (*it).lower(); - if (nickLowerList.find(lcNickName) == nickLowerList.end()) - { - QString nickname = (*it); - if (setNickOffline(nickname)) - nicksOnlineChanged = true; + if (lcPrevISON.find(' ' + (*it) + ' ', 0, false) == -1) { + setWatchedNickOnline(*it); + nicksOnlineChanged = true; } } - // Note: The list emitted in this signal does not include nicks in joined channels. - emit nicksNowOnline(this, nickList, nicksOnlineChanged); + // Note: The list emitted in this signal *does* include nicks in joined channels. + emit nicksNowOnline(this, actualList, nicksOnlineChanged); + + m_prevISONList = actualList; // Next round startNotifyTimer(); @@ -933,35 +769,33 @@ void Server::startNotifyTimer(int msec) { // make sure the timer gets started properly in case we have reconnected - notifyTimer.stop(); + m_notifyTimer.stop(); - if(msec == 0) - msec = Preferences::notifyDelay()*1000; + if (msec == 0) msec = Preferences::notifyDelay()*1000; // start the timer in one shot mode - notifyTimer.start(msec, true); + if (Preferences::useNotify()) + m_notifyTimer.start(msec, true); } void Server::notifyTimeout() { // Notify delay time is over, send ISON request if desired - if(Preferences::useNotify()) + if (Preferences::useNotify()) { // But only if there actually are nicks in the notify list QString list = getISONListString(); - if(!list.isEmpty()) - { - queue("ISON "+list); - } + if (!list.isEmpty()) queue("ISON "+list, LowPriority); + } } void Server::autoCommandsAndChannels() { - if (!m_serverGroup->connectCommands().isEmpty()) + if (getServerGroup() && !getServerGroup()->connectCommands().isEmpty()) { - QString connectCommands = m_serverGroup->connectCommands(); + QString connectCommands = getServerGroup()->connectCommands(); if (!getNickname().isEmpty()) connectCommands.replace("%nick", getNickname()); @@ -969,39 +803,63 @@ QStringList connectCommandsList = QStringList::split(";", connectCommands); QStringList::iterator iter; - for(iter = connectCommandsList.begin(); iter != connectCommandsList.end(); ++iter) + for (iter = connectCommandsList.begin(); iter != connectCommandsList.end(); ++iter) { QString output(*iter); output = output.simplifyWhiteSpace(); - Konversation::OutputFilterResult result = outputFilter->parse(getNickname(),output,QString::null); + getOutputFilter()->replaceAliases(output); + Konversation::OutputFilterResult result = getOutputFilter()->parse(getNickname(),output,QString()); queue(result.toServer); } } - if (getAutoJoin() && !rejoinChannels) - queue(getAutoJoinCommand()); + if (getAutoJoin()) + { + for ( QStringList::Iterator it = m_autoJoinCommands.begin(); it != m_autoJoinCommands.end(); ++it ) + queue((*it)); + } } -QString Server::getAutoJoinCommand() const +/** Create a set of indices into the nickname list of the current identity based on the current nickname. + * + * The index list is only used if the current nickname is not available. If the nickname is in the identity, + * we do not want to retry it. If the nickname is not in the identity, it is considered to be at position -1. + */ +void Server::resetNickSelection() { - // Multichannel joins - QStringList channels = QStringList::split(' ',autoJoinChannel); - QStringList keys = QStringList::split(' ',autoJoinChannelKey); - - QString autoString("JOIN "+channels.join(",")+' '+keys.join(",")); - - return autoString; + m_nickIndices.clear(); + //for equivalence testing in case the identity gets changed underneath us + m_referenceNicklist = getIdentity()->getNicknameList(); + //where in this identities nicklist will we have started? + int start = m_referenceNicklist.findIndex(getNickname()); + int len = m_referenceNicklist.count(); + + //we first use this list of indices *after* we've already tried the current nick, which we don't want + //to retry if we wrapped, so exclude its index here + //if it wasn't in the list, we get -1 back, so then we *want* to include 0 + for (int i=start+1; igetNickname(++tryNickNumber); + //if the identity changed underneath us (likely impossible), start over + if (m_referenceNicklist != getIdentity()->getNicknameList()) + resetNickSelection(); + + QString newNick = getIdentity()->getNickname(m_nickIndices.front()); + m_nickIndices.pop_front(); if (newNick.isNull()) { - QString inputText = i18n("No nicknames from the \"%1\" identity were accepted by the connection \"%2\".\nPlease enter a new one or press Cancel to disconnect:").arg(getIdentity()->getName()).arg(getServerGroup()); + QString inputText = i18n("No nicknames from the \"%1\" identity were accepted by the connection \"%2\".\nPlease enter a new one or press Cancel to disconnect:").arg(getIdentity()->getName()).arg(getDisplayName()); newNick = KInputDialog::getText(i18n("Nickname error"), inputText, - QString::null, 0, getStatusView(), "NickChangeDialog"); + QString(), 0, getStatusView(), "NickChangeDialog"); } return newNick; @@ -1009,41 +867,28 @@ void Server::processIncomingData() { - incomingTimer.stop(); + m_incomingTimer.stop(); - if(!inputBuffer.isEmpty() && !m_processingIncoming) + if (!m_inputBuffer.isEmpty() && !m_processingIncoming) { m_processingIncoming = true; - QString front(inputBuffer.front()); - inputBuffer.pop_front(); - if(rawLog) + QString front(m_inputBuffer.front()); + m_inputBuffer.pop_front(); + if (m_rawLog) { QString toRaw = front; - rawLog->appendRaw(">> " + toRaw.replace("&","&").replace("<","<").replace(">",">")); + m_rawLog->appendRaw(">> " + toRaw.replace("&","&").replace("<","<").replace(">",">").replace(QRegExp("\\s"), " ")); } - inputFilter.parseLine(front); + m_inputFilter.parseLine(front); m_processingIncoming = false; - if(!inputBuffer.isEmpty()) - { - incomingTimer.start(0); - } + if (!m_inputBuffer.isEmpty()) m_incomingTimer.start(0); } } -void Server::unlockSending() -{ - sendUnlocked=true; -} - -void Server::lockSending() -{ - sendUnlocked=false; -} - void Server::incoming() { - if(m_serverGroup->serverByIndex(m_currentServerIndex).SSLEnabled()) + if (getConnectionSettings().server().SSLEnabled()) emit sslConnected(this); // We read all available bytes here because readyRead() signal will be emitted when there is new data @@ -1056,12 +901,12 @@ // Read at max "max_bytes" bytes into "buffer" len = m_socket->readBlock(buffer.data(),max_bytes); - if( len <=0 && m_serverGroup->serverByIndex(m_currentServerIndex).SSLEnabled() ) + if (len <= 0 && getConnectionSettings().server().SSLEnabled()) return; - if( len <= 0 ) // Zero means buffer is empty which shouldn't happen because readyRead signal is emitted + if (len <= 0) // Zero means buffer is empty which shouldn't happen because readyRead signal is emitted { - statusView->appendServerMessage(i18n("Error"), + getStatusView()->appendServerMessage(i18n("Error"), i18n("There was an error reading the data from the server: %1"). arg(m_socket->errorString())); @@ -1071,7 +916,7 @@ buffer[len] = 0; - QCString qcsBuffer = inputBufferIncomplete + QCString(buffer); + QCString qcsBuffer = m_inputBufferIncomplete + QCString(buffer); // split buffer to lines QValueList qcsBufferLines; @@ -1080,7 +925,7 @@ qcsBufferLines << qcsBuffer.mid(lastLFposition+1, nextLFposition-lastLFposition-1); // remember the incomplete line (split by packets) - inputBufferIncomplete = qcsBuffer.right(qcsBuffer.length()-lastLFposition-1); + m_inputBufferIncomplete = qcsBuffer.right(qcsBuffer.length()-lastLFposition-1); while(!qcsBufferLines.isEmpty()) { @@ -1143,11 +988,10 @@ } } // END pre-parse to know where the message belongs to - // Decrypt if necessary if(command == "privmsg") Konversation::decrypt(channelKey,front,this); - else if(command == "332") + else if(command == "332" || command == "topic") { Konversation::decryptTopic(channelKey,front,this); } @@ -1155,14 +999,14 @@ bool isUtf8 = Konversation::isUtf8(front); if( isUtf8 ) - inputBuffer << QString::fromUtf8(front); + m_inputBuffer << QString::fromUtf8(front); else { // check setting QString channelEncoding; if( !channelKey.isEmpty() ) { - channelEncoding = Preferences::channelEncoding(getServerGroup(), channelKey); + channelEncoding = Preferences::channelEncoding(getDisplayName(), channelKey); } // END set channel encoding if specified @@ -1174,73 +1018,14 @@ if ( !isUtf8 && codec->mibEnum() == 106 ) codec = QTextCodec::codecForMib( 4 /* iso-8859-1 */ ); - inputBuffer << codec->toUnicode(front); + m_inputBuffer << codec->toUnicode(front); } qcsBufferLines.pop_front(); + m_bytesReceived+=m_inputBuffer.back().length(); } - // refresh lock timer if it was still locked - if( !sendUnlocked ) - unlockSending(); - - if( !incomingTimer.isActive() && !m_processingIncoming ) - incomingTimer.start(0); -} - -void Server::queue(const QString& buffer) -{ - // Only queue lines if we are connected - if(!buffer.isEmpty()) - { - outputBuffer.append(buffer); - - timerInterval*=2; - - if(!outgoingTimer.isActive()) - { - outgoingTimer.start(1); - } - } -} - -void Server::queueAt(uint pos,const QString& buffer) -{ - if(buffer.isEmpty()) - return; - - if(pos < outputBuffer.count()) - { - outputBuffer.insert(outputBuffer.at(pos),buffer); - - timerInterval*=2; - } - else - { - queue(buffer); - } - - if(!outgoingTimer.isActive()) - { - outgoingTimer.start(1); - } -} - -void Server::queueList(const QStringList& buffer) -{ - // Only queue lines if we are connected - if(!buffer.isEmpty()) - { - for(unsigned int i=0;igetHostmask().length(); + NickInfo* info = getNickInfo(getNickname()); + int hostMaskLength = 0; + + if(info) + hostMaskLength = info->getHostmask().length(); //:Sho_!i=ehs1@konversation/developer/hein PRIVMSG #konversation :and then back to it //$nickname$hostmask$command$destination$message - int x= 512 - 8 - (nickname.length() + hostMaskLength + command.length() + dest.length()); + int x= 512 - 8 - (m_nickname.length() + hostMaskLength + command.length() + dest.length()); return x; } -void Server::send() +//Commands greater than 1 have localizeable text: 0 1 2 3 4 5 6 +static QStringList outcmds=QStringList::split(QChar(' '),"WHO QUIT PRIVMSG NOTICE KICK PART TOPIC"); + +int Server::_send_internal(QString outputLine) { - // Check if we are still online - if(!isConnected() || outputBuffer.isEmpty()) + QStringList outputLineSplit=QStringList::split(" ", outputLine); + //Lets cache the uppercase command so we don't miss or reiterate too much + int outboundCommand=outcmds.findIndex(outputLineSplit[0].upper()); + + if (outputLine.at(outputLine.length()-1) == '\n') { - return; + kdDebug() << "found \\n on " << outboundCommand << endl; + outputLine.setLength(outputLine.length()-1); } - if(!outputBuffer.isEmpty() && sendUnlocked) + // remember the first arg of /WHO to identify responses + if (outboundCommand == 0) //"WHO" { - // NOTE: It's important to add the linefeed here, so the encoding process does not trash it - // for some servers. - QString outputLine=outputBuffer[0]+'\n'; - QStringList outputLineSplit=QStringList::split(" ",outputBuffer[0]); - outputBuffer.pop_front(); + if (outputLineSplit.count() >= 2) + m_inputFilter.addWhoRequest(outputLineSplit[1]); + else // no argument (servers recognize it as "*") + m_inputFilter.addWhoRequest("*"); + } + else if (outboundCommand == 1) //"QUIT" + updateConnectionState(Konversation::SSDeliberatelyDisconnected); - //Lets cache the uppercase command so we don't miss or reiterate too much - QString outboundCommand(outputLineSplit[0].upper()); + // set channel encoding if specified + QString channelCodecName; - // remember the first arg of /WHO to identify responses - if(!outputLineSplit.isEmpty() && outboundCommand=="WHO") - { - if(outputLineSplit.count()>=2) - inputFilter.addWhoRequest(outputLineSplit[1]); - else // no argument (servers recognize it as "*") - inputFilter.addWhoRequest("*"); - } - // Don't reconnect if we WANT to quit - else if(outboundCommand=="QUIT") - { - deliberateQuit = true; - } + //[ PRIVMSG | NOTICE | KICK | PART | TOPIC ] target :message + if (outputLineSplit.count() > 2 && outboundCommand > 1) + channelCodecName=Preferences::channelEncoding(getDisplayName(), outputLineSplit[1]); - // wrap server socket into a stream - QTextStream serverStream; + QTextCodec* codec; + if (channelCodecName.isEmpty()) + codec = getIdentity()->getCodec(); + else + codec = Konversation::IRCCharsets::self()->codecForName(channelCodecName); - serverStream.setDevice(m_socket); + // Some codecs don't work with a negative value. This is a bug in Qt 3. + // ex.: JIS7, eucJP, SJIS + //int outlen=-1; + int outlen=outputLine.length(); - // set channel encoding if specified - QString channelCodecName; + //leaving this done twice for now, i'm uncertain of the implications of not encoding other commands + QCString encoded=codec->fromUnicode(outputLine, outlen); - if(outputLineSplit.count()>2) //"for safe" <-- so no encoding if no data + QString blowfishKey=getKeyForRecipient(outputLineSplit[1]); + if (!blowfishKey.isEmpty() && outboundCommand >1) + { + int colon = outputLine.find(':'); + if (colon > -1) { - if(outboundCommand=="PRIVMSG" //PRIVMSG target :message - || outboundCommand=="NOTICE" //NOTICE target :message - || outboundCommand=="KICK" //KICK target :message - || outboundCommand=="PART" //PART target :message - || outboundCommand=="TOPIC" //TOPIC target :message - ) - { //KV << outboundCommand << " queued" <fromUnicode(pay, len); + //apparently channel name isn't a protocol element... + len=outputLineSplit[1].length(); + QCString dest=codec->fromUnicode(outputLineSplit[1], len); + + if (outboundCommand == 2 || outboundCommand == 6) // outboundCommand == 3 + { + bool doit = true; + if (outboundCommand == 2) + { + //if its a privmsg and a ctcp but not an action, don't encrypt + //not interpreting `payload` in case encoding bollixed it + if (outputLineSplit[2].startsWith(":\x01") && outputLineSplit[2] != ":\x01""ACTION") + doit = false; + } + if (doit) + { + Konversation::encrypt(blowfishKey, payload); + encoded = outputLineSplit[0].ascii(); + //two lines because the compiler insists on using the wrong operator+ + encoded += ' ' + dest + " :" + payload; + } } } + } + encoded += '\n'; + Q_LONG sout = m_socket->writeBlock(encoded, encoded.length()); - // init stream props - serverStream.setEncoding(QTextStream::Locale); - QTextCodec* codec = getIdentity()->getCodec(); + if (m_rawLog) + m_rawLog->appendRaw("<< " + outputLine.replace("&","&").replace("<","<").replace(">",">")); - if(!channelCodecName.isEmpty()) - { - codec = Konversation::IRCCharsets::self()->codecForName(channelCodecName); - } + return sout; +} - // convert encoded data to IRC ascii only when we don't have the same codec locally - if(QString(QTextCodec::codecForLocale()->name()).lower() != QString(codec->name()).lower()) - { - serverStream.setCodec(codec); - } +void Server::toServer(QString&s, IRCQueue* q) +{ - // Blowfish - if(outboundCommand=="PRIVMSG" || outboundCommand=="TOPIC") - { - Konversation::encrypt(outputLineSplit[1],outputLine,this); - } + int sizesent = _send_internal(s); + emit sentStat(s.length(), sizesent, q); //tell the queues what we sent + //tell everyone else + emit sentStat(s.length(), sizesent); +} - serverStream << outputLine; - if(rawLog) rawLog->appendRaw("<< " + outputLine.replace("&","&").replace("<","<").replace(">",">")); +void Server::collectStats(int bytes, int encodedBytes) +{ + m_bytesSent += bytes; + m_encodedBytesSent += encodedBytes; + m_linesSent++; +} - // detach server stream - serverStream.unsetDevice(); - } +bool Server::validQueue(QueuePriority priority) +{ + if (priority >=0 && priority <= _max_queue()) + return true; + return false; +} - if(outputBuffer.isEmpty()) { - outgoingTimer.stop(); - timerInterval = 1; +bool Server::queue(const QString& line, QueuePriority priority) +{ + if (!line.isEmpty() && validQueue(priority)) + { + IRCQueue& out=*m_queues[priority]; + out.enqueue(line); + return true; } + return false; +} + +bool Server::queueList(const QStringList& buffer, QueuePriority priority) +{ + if (buffer.isEmpty() || !validQueue(priority)) + return false; - // Flood-Protection - if(timerInterval > 1) + IRCQueue& out=*(m_queues[priority]); + + for(unsigned int i=0;i 40) - { - time = 4000; - } - else +void Server::resetQueues() +{ + for (int i=0;i<=_max_queue();i++) + m_queues[i]->reset(); +} + +//this could flood you off, but you're leaving anyway... +void Server::flushQueues() +{ + int cue; + do + { + cue=-1; + int wait=0; + for (int i=1;i<=_max_queue();i++) //slow queue can rot { - time = 1; + IRCQueue *queue=m_queues[i]; + //higher queue indices have higher priorty, higher queue priority wins tie + if (!queue->isEmpty() && queue->currentWait()>=wait) + { + cue=i; + wait=queue->currentWait(); + } } - - outgoingTimer.changeInterval(time); - } + if (cue>-1) + m_queues[cue]->sendNow(); + } while (cue>-1); } void Server::closed() @@ -1421,16 +1275,6 @@ queue("NOTICE "+receiver+" :"+'\x01'+text+'\x01'); } -QString Server::getNumericalIp(bool followDccSetting) -{ - QHostAddress ip; - QString sip = getIp(followDccSetting); - if(sip.isEmpty()) return sip; - ip.setAddress(sip); - - return QString::number(ip.ip4Addr()); -} - // Given a nickname, returns NickInfo object. 0 if not found. NickInfoPtr Server::getNickInfo(const QString& nickname) { @@ -1500,9 +1344,8 @@ // 0 if not found. ChannelNickPtr Server::getChannelNick(const QString& channelName, const QString& nickname) { - QString lcChannelName = channelName.lower(); QString lcNickname = nickname.lower(); - const ChannelNickMap *channelNickMap = getChannelMembers(lcChannelName); + const ChannelNickMap *channelNickMap = getChannelMembers(channelName); if (channelNickMap) { if (channelNickMap->contains(lcNickname)) @@ -1580,85 +1423,55 @@ return (nickInfo != 0); } -QString Server::getIp(bool followDccSetting) +QString Server::getOwnIpByNetworkInterface() { - QString ip; - - if(followDccSetting) - { - int methodId = Preferences::dccMethodToGetOwnIp(); - - if(methodId == 1) // Reply from IRC server - { - if(!ownIpByWelcome.isEmpty()) - { - kdDebug() << "Server::getIp(): using RPL_WELCOME" << endl; - ip = ownIpByWelcome; - } - else if(!ownIpByUserhost.isEmpty()) - { - kdDebug() << "Server::getIp(): using RPL_USERHOST" << endl; - ip = ownIpByUserhost; - } - } - // user specifies - else if(methodId == 2 && !Preferences::dccSpecificOwnIp().isEmpty()) - { - KNetwork::KResolverResults res = KNetwork::KResolver::resolve(Preferences::dccSpecificOwnIp(), ""); - if(res.error() == KResolver::NoError && res.size() > 0) - { - kdDebug() << "Server::getIp(): using IP specified by user" << endl; - ip = res.first().address().nodeName(); - } - } - } - - if(ip.isEmpty()) - { - kdDebug() << "Server::getIp(): using the network interface" << endl; - - // Return our ip using serverSocket - ip = m_socket->localAddress().nodeName(); - } + return m_socket->localAddress().nodeName(); +} - kdDebug() << "Server::getIp(): returned: " << ip << endl; - return ip; +QString Server::getOwnIpByServerMessage() +{ + if(!m_ownIpByWelcome.isEmpty()) + return m_ownIpByWelcome; + else if(!m_ownIpByUserhost.isEmpty()) + return m_ownIpByUserhost; + else + return QString(); } -class Query *Server::addQuery(const NickInfoPtr & nickInfo, bool weinitiated) +class Query* Server::addQuery(const NickInfoPtr & nickInfo, bool weinitiated) { QString nickname = nickInfo->getNickname(); // Only create new query object if there isn't already one with the same name class Query* query=getQueryByName(nickname); - if(!query) + + if (!query) { QString lcNickname = nickname.lower(); - query=getViewContainer()->addQuery(this,nickInfo, weinitiated); - query->setIdentity(getIdentity()); + query = getViewContainer()->addQuery(this, nickInfo, weinitiated); - connect(query,SIGNAL (sendFile(const QString&)),this,SLOT (requestDccSend(const QString &)) ); - connect(this,SIGNAL (serverOnline(bool)),query,SLOT (serverOnline(bool)) ); + connect(query, SIGNAL(sendFile(const QString&)),this, SLOT(requestDccSend(const QString&))); + connect(this, SIGNAL(serverOnline(bool)), query, SLOT(serverOnline(bool))); // Append query to internal list - queryList.append(query); + m_queryList.append(query); m_queryNicks.insert(lcNickname, nickInfo); - if(!weinitiated) - { + if (!weinitiated) static_cast(kapp)->notificationHandler()->query(query, nickname); - } } // try to get hostmask if there's none yet - if(query->getNickInfo()->getHostmask().isEmpty()) requestUserhost(nickname); + if (query->getNickInfo()->getHostmask().isEmpty()) requestUserhost(nickname); + Q_ASSERT(query); + return query; } void Server::closeQuery(const QString &name) { - class Query* query=getQueryByName(name); + class Query* query = getQueryByName(name); removeQuery(query); // Update NickInfo. If no longer on any lists, delete it altogether, but @@ -1666,7 +1479,7 @@ // is deleted altogether in that case. QString lcNickname = name.lower(); m_queryNicks.remove(lcNickname); - if (!isWatchedNick(nickname)) deleteNickIfUnlisted(nickname); + if (!isWatchedNick(name)) deleteNickIfUnlisted(name); } void Server::closeChannel(const QString& name) @@ -1676,7 +1489,7 @@ if(channelToClose) { - Konversation::OutputFilterResult result = outputFilter->parse(getNickname(), + Konversation::OutputFilterResult result = getOutputFilter()->parse(getNickname(), Preferences::commandChar() + "PART", name); queue(result.toServer); } @@ -1684,41 +1497,41 @@ void Server::requestChannelList() { - inputFilter.setAutomaticRequest("LIST", QString::null, true); - queue("LIST"); + m_inputFilter.setAutomaticRequest("LIST", QString(), true); + queue(QString("LIST")); } void Server::requestWhois(const QString& nickname) { - inputFilter.setAutomaticRequest("WHOIS", nickname, true); - queue("WHOIS "+nickname); + m_inputFilter.setAutomaticRequest("WHOIS", nickname, true); + queue("WHOIS "+nickname, LowPriority); } void Server::requestWho(const QString& channel) { - inputFilter.setAutomaticRequest("WHO", channel, true); - queue("WHO "+channel); + m_inputFilter.setAutomaticRequest("WHO", channel, true); + queue("WHO "+channel, LowPriority); } void Server::requestUserhost(const QString& nicks) { QStringList nicksList = QStringList::split(" ", nicks); for(QStringList::ConstIterator it=nicksList.begin() ; it!=nicksList.end() ; ++it) - inputFilter.setAutomaticRequest("USERHOST", *it, true); - queue("USERHOST "+nicks); + m_inputFilter.setAutomaticRequest("USERHOST", *it, true); + queue("USERHOST "+nicks, LowPriority); } void Server::requestTopic(const QString& channel) { - inputFilter.setAutomaticRequest("TOPIC", channel, true); - queue("TOPIC "+channel); + m_inputFilter.setAutomaticRequest("TOPIC", channel, true); + queue("TOPIC "+channel, LowPriority); } void Server::resolveUserhost(const QString& nickname) { - inputFilter.setAutomaticRequest("WHOIS", nickname, true); - inputFilter.setAutomaticRequest("DNS", nickname, true); - queue("WHOIS "+nickname); + m_inputFilter.setAutomaticRequest("WHOIS", nickname, true); + m_inputFilter.setAutomaticRequest("DNS", nickname, true); + queue("WHOIS "+nickname, LowPriority); //FIXME when is this really used? } void Server::requestBan(const QStringList& users,const QString& channel,const QString& a_option) @@ -1740,11 +1553,11 @@ // if we found the nick try to find their hostmask if(targetNick) { - QString hostmask=targetNick->getHostmask(); + QString hostmask=targetNick->getChannelNick()->getHostmask(); // if we found the hostmask, add it to the ban mask if(!hostmask.isEmpty()) { - mask=targetNick->getNickname()+'!'+hostmask; + mask=targetNick->getChannelNick()->getNickname()+'!'+hostmask; // adapt ban mask to the option given if(option=="host") @@ -1759,20 +1572,20 @@ } } - Konversation::OutputFilterResult result = outputFilter->execBan(mask,channel); + Konversation::OutputFilterResult result = getOutputFilter()->execBan(mask,channel); queue(result.toServer); } } void Server::requestUnban(const QString& mask,const QString& channel) { - Konversation::OutputFilterResult result = outputFilter->execUnban(mask,channel); + Konversation::OutputFilterResult result = getOutputFilter()->execUnban(mask,channel); queue(result.toServer); } void Server::requestDccSend() { - requestDccSend(QString::null); + requestDccSend(QString()); } void Server::sendURIs(const QStrList& uris, const QString& nick) @@ -1788,27 +1601,27 @@ if(recipient.isEmpty()) { QStringList nickList; - Channel* lookChannel=channelList.first(); + Channel* lookChannel=m_channelList.first(); // fill nickList with all nicks we know about - while(lookChannel) + while (lookChannel) { QPtrList nicks=lookChannel->getNickList(); Nick* lookNick=nicks.first(); while(lookNick) { - if(!nickList.contains(lookNick->getNickname())) nickList.append(lookNick->getNickname()); + if(!nickList.contains(lookNick->getChannelNick()->getNickname())) nickList.append(lookNick->getChannelNick()->getNickname()); lookNick=nicks.next(); } - lookChannel=channelList.next(); + lookChannel=m_channelList.next(); } // add Queries as well, but don't insert duplicates - class Query* lookQuery=queryList.first(); + class Query* lookQuery=m_queryList.first(); while(lookQuery) { if(!nickList.contains(lookQuery->getName())) nickList.append(lookQuery->getName()); - lookQuery=queryList.next(); + lookQuery=m_queryList.next(); } recipient=DccRecipientDialog::getNickname(getViewContainer()->getWindow(),nickList); @@ -1817,91 +1630,124 @@ if(!recipient.isEmpty()) { KURL::List fileURLs=KFileDialog::getOpenURLs( - lastDccDir, - QString::null, + ":lastDccDir", + QString(), getViewContainer()->getWindow(), i18n("Select File(s) to Send to %1").arg(recipient) ); KURL::List::iterator it; for ( it = fileURLs.begin() ; it != fileURLs.end() ; ++it ) { - lastDccDir = (*it).directory(); addDccSend( recipient, *it ); } } } +void Server::slotNewDccTransferItemQueued(DccTransfer* transfer) +{ + if (transfer->getConnectionId() == connectionId() ) + { + kdDebug() << "Server::slotNewDccTranfserItemQueued(): connecting slots for " << transfer->getFileName() << " [" << transfer->getType() << "]" << endl; + if ( transfer->getType() == DccTransfer::Receive ) + { + connect( transfer, SIGNAL( done( DccTransfer* ) ), this, SLOT( dccGetDone( DccTransfer* ) ) ); + connect( transfer, SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, SLOT( dccStatusChanged( DccTransfer*, int, int ) ) ); + } + else + { + connect( transfer, SIGNAL( done( DccTransfer* ) ), this, SLOT( dccSendDone( DccTransfer* ) ) ); + connect( transfer, SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, SLOT( dccStatusChanged( DccTransfer*, int, int ) ) ); + } + } +} + void Server::addDccSend(const QString &recipient,KURL fileURL, const QString &altFileName, uint fileSize) { - emit addDccPanel(); + if (!fileURL.isValid()) return; - QString ownIp = getIp(true); + emit addDccPanel(); // We already checked that the file exists in output filter / requestDccSend() resp. - DccTransferSend* newDcc = new DccTransferSend( getViewContainer()->getDccPanel(), - recipient, - fileURL, // url of the sending file - ownIp, - altFileName, - fileSize ); - - connect(newDcc,SIGNAL (sendReady(const QString&,const QString&,const QString&,const QString&,unsigned long)), - this,SLOT (dccSendRequest(const QString&,const QString&,const QString&,const QString&,unsigned long)) ); - connect(newDcc,SIGNAL (done(const DccTransfer*)),this,SLOT (dccSendDone(const DccTransfer*)) ); - connect(newDcc,SIGNAL (statusChanged(const DccTransfer*,int,int)), this, - SLOT(dccStatusChanged(const DccTransfer*,int,int)) ); + DccTransferSend* newDcc = KonversationApplication::instance()->getDccTransferManager()->newUpload(); - newDcc->start(); + newDcc->setConnectionId( connectionId() ); - appendMessageToFrontmost( i18n( "DCC" ), - i18n( "Asking %1 to accept upload of \"%2\" (%3)..." ) - .arg( newDcc->getPartnerNick(), - newDcc->getFileName(), - ( newDcc->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( newDcc->getFileSize() ) ) ); + newDcc->setPartnerNick( recipient ); + newDcc->setFileURL( fileURL ); + if ( !altFileName.isEmpty() ) + newDcc->setFileName( altFileName ); + if ( fileSize != 0 ) + newDcc->setFileSize( fileSize ); + + if ( newDcc->queue() ) + newDcc->start(); } void Server::addDccGet(const QString &sourceNick, const QStringList &dccArguments) { emit addDccPanel(); - QHostAddress ip; + DccTransferRecv* newDcc = KonversationApplication::instance()->getDccTransferManager()->newDownload(); - ip.setAddress(dccArguments[1].toULong()); + newDcc->setConnectionId( connectionId() ); - DccTransferRecv* newDcc=new DccTransferRecv(getViewContainer()->getDccPanel(), - sourceNick, - KURL(Preferences::dccPath()), - dccArguments[0], // name - // size - dccArguments[3].isEmpty() ? 0 : dccArguments[3].toULong(), - ip.toString(), // ip - dccArguments[2] ); // port - - connect(newDcc,SIGNAL (resumeRequest(const QString&,const QString&,const QString&,KIO::filesize_t)),this, - SLOT (dccResumeGetRequest(const QString&,const QString&,const QString&,KIO::filesize_t)) ); - connect(newDcc,SIGNAL (done(const DccTransfer*)), - this,SLOT (dccGetDone(const DccTransfer*)) ); - connect(newDcc,SIGNAL (statusChanged(const DccTransfer*,int,int)), this, - SLOT(dccStatusChanged(const DccTransfer*,int,int)) ); + newDcc->setPartnerNick( sourceNick ); + newDcc->setPartnerIp( DccCommon::numericalIpToTextIp( dccArguments[1] ) ); + newDcc->setPartnerPort( dccArguments[2] ); + if ( dccArguments[2] == "0" && dccArguments.count() == 5) // Reverse DCC + newDcc->setReverse( true, dccArguments[4] ); - appendMessageToFrontmost( i18n( "DCC" ), - i18n( "%1 offers to send you \"%2\" (%3)..." ) - .arg( newDcc->getPartnerNick(), - newDcc->getFileName(), - ( newDcc->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( newDcc->getFileSize() ) ) ); + newDcc->setFileName( dccArguments[0] ); + newDcc->setFileSize( dccArguments[3].isEmpty() ? 0 : dccArguments[3].toULong() ); - if(Preferences::dccAutoGet()) newDcc->start(); + if ( newDcc->queue() ) + { + QString showfile = newDcc->getFileName(); + + if(showfile.startsWith("\"") && showfile.endsWith("\"")) + showfile = showfile.mid(1, showfile.length() - 2); + + appendMessageToFrontmost( i18n( "DCC" ), + i18n( "%1 offers to send you \"%2\" (%3)..." ) + .arg( newDcc->getPartnerNick(), + showfile, + ( newDcc->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( newDcc->getFileSize() ) ) ); + + if(Preferences::dccAutoGet()) + newDcc->start(); + } } -void Server::requestDccChat(const QString& nickname) +void Server::openDccChat(const QString& nickname) { - emit addDccChat(getNickname(),nickname,getNumericalIp(true),QStringList(),true); + emit addDccChat(getNickname(),nickname,QStringList(),true); +} + +void Server::requestDccChat(const QString& partnerNick, const QString& numericalOwnIp, const QString& ownPort) +{ + queue(QString("PRIVMSG %1 :\001DCC CHAT chat %2 %3\001").arg(partnerNick).arg(numericalOwnIp).arg(ownPort)); +} + +void Server::dccSendRequest(const QString &partner, const QString &fileName, const QString &address, const QString &port, unsigned long size) +{ + Konversation::OutputFilterResult result = getOutputFilter()->sendRequest(partner,fileName,address,port,size); + queue(result.toServer); + + QString showfile = fileName; + + if(showfile.startsWith("\"") && showfile.endsWith("\"")) + showfile = showfile.mid(1, showfile.length() - 2); + + appendMessageToFrontmost( i18n( "DCC" ), + i18n( "Asking %1 to accept upload of \"%2\" (%3)..." ) + .arg( partner, + showfile, + ( size == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( size ) ) ); } -void Server::dccSendRequest(const QString &partner, const QString &fileName, const QString &address, const QString &port, unsigned long size) +void Server::dccPassiveSendRequest(const QString& recipient,const QString& fileName,const QString& address,unsigned long size,const QString& token) { - kdDebug() << "dccSendRequest sent" << endl; - Konversation::OutputFilterResult result = outputFilter->sendRequest(partner,fileName,address,port,size); + Konversation::OutputFilterResult result = getOutputFilter()->passiveSendRequest(recipient,fileName,address,size,token); queue(result.toServer); } @@ -1910,118 +1756,184 @@ Konversation::OutputFilterResult result; if (fileName.contains(" ") > 0) - result = outputFilter->resumeRequest(sender,"\""+fileName+"\"",port,startAt); + result = getOutputFilter()->resumeRequest(sender,"\""+fileName+"\"",port,startAt); else - result = outputFilter->resumeRequest(sender,fileName,port,startAt); + result = getOutputFilter()->resumeRequest(sender,fileName,port,startAt); + + queue(result.toServer); +} +void Server::dccReverseSendAck(const QString& partnerNick,const QString& fileName,const QString& ownAddress,const QString& ownPort,unsigned long size,const QString& reverseToken) +{ + Konversation::OutputFilterResult result = getOutputFilter()->acceptPassiveSendRequest(partnerNick,fileName,ownAddress,ownPort,size,reverseToken); queue(result.toServer); } +void Server::startReverseDccSendTransfer(const QString& sourceNick,const QStringList& dccArguments) +{ + DccTransferManager* dtm = KonversationApplication::instance()->getDccTransferManager(); + + if ( dtm->startReverseSending( connectionId(), sourceNick, + dccArguments[0], // filename + DccCommon::numericalIpToTextIp( dccArguments[1] ), // partner IP + dccArguments[2], // partner port + dccArguments[3].toInt(), // filesize + dccArguments[4] // Reverse DCC token + ) == 0 ) + { + QString showfile = dccArguments[0]; + + if(showfile.startsWith("\"") && showfile.endsWith("\"")) + showfile = showfile.mid(1, showfile.length() - 2); + + // DTM could not find a matched item + appendMessageToFrontmost( i18n( "Error" ), + i18n( "%1 = file name, %2 = nickname", + "Received invalid passive DCC send acceptance message for \"%1\" from %2." ) + .arg( showfile, + sourceNick ) ); + + } + +} + void Server::resumeDccGetTransfer(const QString &sourceNick, const QStringList &dccArguments) { - // Check if there actually is a transfer going on on that port - DccTransferRecv* dccTransfer=static_cast(getViewContainer()->getDccPanel()->getTransferByPort(dccArguments[1],DccTransfer::Receive,true)); - if(!dccTransfer) - // Check if there actually is a transfer going on with that name, could be behind a NAT - // so the port number may get changed - // mIRC substitutes this with "file.ext", so we have a problem here with mIRCs behind a NAT - dccTransfer=static_cast(getViewContainer()->getDccPanel()->getTransferByName(dccArguments[0],DccTransfer::Receive,true)); + DccTransferManager* dtm = KonversationApplication::instance()->getDccTransferManager(); + + QString fileName( dccArguments[0] ); + QString ownPort( dccArguments[1] ); + unsigned long position = dccArguments[2].toULong(); + + DccTransferRecv* dccTransfer = dtm->resumeDownload( connectionId(), sourceNick, fileName, ownPort, position ); + + QString showfile = fileName; + + if(showfile.startsWith("\"") && showfile.endsWith("\"")) + showfile = showfile.mid(1, showfile.length() - 2); - if(dccTransfer) + if ( dccTransfer ) { - // overcome mIRCs brain-dead "file.ext" substitution appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 = nickname of sender, %3 = percentage of file size, %4 = file size", "Resuming download of \"%1\" from %2 starting at %3% of %4..." ) - .arg( dccTransfer->getFileName(), + .arg( showfile, sourceNick, QString::number( dccTransfer->getProgress() ), ( dccTransfer->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( dccTransfer->getFileSize() ) ) ); - dccTransfer->startResume(dccArguments[2].toULong()); } else { - appendMessageToFrontmost(i18n("Error"),i18n("No DCC download running on port %1.").arg(dccArguments[1])); + appendMessageToFrontmost( i18n( "Error" ), + i18n( "%1 = file name, %2 = nickname", + "Received invalid resume acceptance message for \"%1\" from %2." ) + .arg( showfile, + sourceNick ) ); } } -void Server::resumeDccSendTransfer(const QString &recipient, const QStringList &dccArguments) +void Server::resumeDccSendTransfer(const QString &sourceNick, const QStringList &dccArguments) { - // Check if there actually is a transfer going on on that port - DccTransferSend* dccTransfer=static_cast(getViewContainer()->getDccPanel()->getTransferByPort(dccArguments[1],DccTransfer::Send)); - if(!dccTransfer) - // Check if there actually is a transfer going on with that name, could be behind a NAT - // so the port number may get changed - // mIRC substitutes this with "file.ext", so we have a problem here with mIRCs behind a NAT - dccTransfer=static_cast(getViewContainer()->getDccPanel()->getTransferByName(dccArguments[0],DccTransfer::Send)); + DccTransferManager* dtm = KonversationApplication::instance()->getDccTransferManager(); - if(dccTransfer && dccTransfer->getStatus() == DccTransfer::WaitingRemote) + QString fileName( dccArguments[0] ); + QString ownPort( dccArguments[1] ); + unsigned long position = dccArguments[2].toULong(); + + DccTransferSend* dccTransfer = dtm->resumeUpload( connectionId(), sourceNick, fileName, ownPort, position ); + + QString showfile = fileName; + + if(showfile.startsWith("\"") && showfile.endsWith("\"")) + showfile = showfile.mid(1, showfile.length() - 2); + + if ( dccTransfer ) { - QString fileName=dccTransfer->getFileName(); - if(dccTransfer->setResume(dccArguments[2].toULong())) - { - appendMessageToFrontmost( i18n( "DCC" ), - i18n( "%1 = file name, %2 = nickname of recipient, %3 = percentage of file size, %4 = file size", - "Resuming upload of \"%1\" to %2 starting at %3% of %4...") - .arg( fileName, - recipient, - QString::number(dccTransfer->getProgress()), - ( dccTransfer->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( dccTransfer->getFileSize() ) ) ); - Konversation::OutputFilterResult result = outputFilter->acceptRequest(recipient, - fileName, dccArguments[1], dccArguments[2].toUInt()); - queue(result.toServer); - //appendMessageToFrontmost(result.typeString, result.output); - } - else - { - appendMessageToFrontmost(i18n("Error"),i18n("%1 = file name, %2 = nickname", - "Received invalid resume request for \"%1\" from %2.").arg(fileName, recipient)); - } + appendMessageToFrontmost( i18n( "DCC" ), + i18n( "%1 = file name, %2 = nickname of recipient, %3 = percentage of file size, %4 = file size", + "Resuming upload of \"%1\" to %2 starting at %3% of %4...") + .arg( showfile, + sourceNick, + QString::number(dccTransfer->getProgress()), + ( dccTransfer->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( dccTransfer->getFileSize() ) ) ); + + // FIXME: this operation should be done by DccTransferManager + Konversation::OutputFilterResult result = getOutputFilter()->acceptResumeRequest( sourceNick, fileName, ownPort, position ); + queue( result.toServer ); + } else { - appendMessageToFrontmost(i18n("Error"),i18n("No DCC upload running on port %1.").arg(dccArguments[1])); + appendMessageToFrontmost( i18n( "Error" ), + i18n( "%1 = file name, %2 = nickname", + "Received invalid resume request for \"%1\" from %2." ) + .arg( showfile, + sourceNick ) ); } } -void Server::dccGetDone(const DccTransfer* item) +void Server::dccGetDone(DccTransfer* item) { + if (!item) + return; + + QString showfile = item->getFileName(); + + if(showfile.startsWith("\"") && showfile.endsWith("\"")) + showfile = showfile.mid(1, showfile.length() - 2); + if(item->getStatus()==DccTransfer::Done) appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender", - "Download of \"%1\" from %2 finished.").arg(item->getFileName(), item->getPartnerNick())); + "Download of \"%1\" from %2 finished.").arg(showfile, item->getPartnerNick())); else if(item->getStatus()==DccTransfer::Failed) appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender", - "Download of \"%1\" from %2 failed. Reason: %3.").arg(item->getFileName(), item->getPartnerNick(), item->getStatusDetail())); + "Download of \"%1\" from %2 failed. Reason: %3.").arg(showfile, + item->getPartnerNick(), item->getStatusDetail())); } -void Server::dccSendDone(const DccTransfer* item) +void Server::dccSendDone(DccTransfer* item) { + if (!item) + return; + + QString showfile = item->getFileName(); + + if(showfile.startsWith("\"") && showfile.endsWith("\"")) + showfile = showfile.mid(1, showfile.length() - 2); + if(item->getStatus()==DccTransfer::Done) appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient", - "Upload of \"%1\" to %2 finished.").arg(item->getFileName(), item->getPartnerNick())); + "Upload of \"%1\" to %2 finished.").arg(showfile, item->getPartnerNick())); else if(item->getStatus()==DccTransfer::Failed) appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient", - "Upload of \"%1\" to %2 failed. Reason: %3.").arg(item->getFileName(), item->getPartnerNick(), item->getStatusDetail())); + "Upload of \"%1\" to %2 failed. Reason: %3.").arg(showfile, item->getPartnerNick(), + item->getStatusDetail())); } -void Server::dccStatusChanged(const DccTransfer *item, int newStatus, int oldStatus) +void Server::dccStatusChanged(DccTransfer *item, int newStatus, int oldStatus) { - getViewContainer()->getDccPanel()->dccStatusChanged(item); + if(!item) + return; + + QString showfile = item->getFileName(); + + if(showfile.startsWith("\"") && showfile.endsWith("\"")) + showfile = showfile.mid(1, showfile.length() - 2); if ( item->getType() == DccTransfer::Send ) { // when resuming, a message about the receiver's acceptance has been shown already, so suppress this message - if ( newStatus == DccTransfer::Sending && oldStatus == DccTransfer::WaitingRemote && !item->isResumed() ) + if ( newStatus == DccTransfer::Transferring && oldStatus == DccTransfer::WaitingRemote && !item->isResumed() ) appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 nickname of recipient", - "Sending \"%1\" to %2...").arg( item->getFileName(), item->getPartnerNick() ) ); + "Sending \"%1\" to %2...").arg( showfile, item->getPartnerNick() ) ); } - else + else // type == Receive { - if ( newStatus == DccTransfer::Receiving && !item->isResumed() ) + if ( newStatus == DccTransfer::Transferring && !item->isResumed() ) { appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 = file size, %3 = nickname of sender", "Downloading \"%1\" (%2) from %3...") - .arg( item->getFileName(), + .arg( showfile, ( item->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( item->getFileSize() ), item->getPartnerNick() ) ); } @@ -2031,27 +1943,29 @@ void Server::removeQuery(class Query* query) { // Traverse through list to find the query - class Query* lookQuery=queryList.first(); - while(lookQuery) + class Query* lookQuery = m_queryList.first(); + + while (lookQuery) { // Did we find our query? - if(lookQuery==query) + if (lookQuery == query) { // Remove it from the query list - queryList.remove(lookQuery); + m_queryList.remove(lookQuery); // break out of the loop - lookQuery=0; + lookQuery = 0; } // else select next query - else lookQuery=queryList.next(); + else lookQuery = m_queryList.next(); } + query->deleteLater(); } void Server::sendJoinCommand(const QString& name, const QString& password) { - Konversation::OutputFilterResult result = outputFilter->parse(getNickname(), - Preferences::commandChar() + "JOIN " + name + ' ' + password, QString::null); + Konversation::OutputFilterResult result = getOutputFilter()->parse(getNickname(), + Preferences::commandChar() + "JOIN " + name + ' ' + password, QString()); queue(result.toServer); } @@ -2060,21 +1974,24 @@ // (re-)join channel, open a new panel if needed Channel* channel = getChannelByName(name); - if(!channel) + if (!channel) { channel=getViewContainer()->addChannel(this,name); Q_ASSERT(channel); channel->setIdentity(getIdentity()); channel->setNickname(getNickname()); - channel->indicateAway(isAway()); - Konversation::ChannelSettings channelSettings = m_serverGroup->channelByNameFromHistory(name); - channel->setNotificationsEnabled(channelSettings.enableNotifications()); + channel->indicateAway(m_away); + + if (getServerGroup()) + { + Konversation::ChannelSettings channelSettings = getServerGroup()->channelByNameFromHistory(name); + channel->setNotificationsEnabled(channelSettings.enableNotifications()); + getServerGroup()->appendChannelHistory(channelSettings); + } - channelList.append(channel); - m_serverGroup->appendChannelHistory(channelSettings); + m_channelList.append(channel); connect(channel,SIGNAL (sendFile()),this,SLOT (requestDccSend()) ); - connect(this,SIGNAL (serverOnline(bool)),channel,SLOT (serverOnline(bool)) ); connect(this, SIGNAL(nicknameChanged(const QString&)), channel, SLOT(setNickname(const QString&))); } // Move channel from unjoined (if present) to joined list and add our own nickname to the joined list. @@ -2094,11 +2011,14 @@ // Update NickInfo. removeJoinedChannel(channel->getName()); - Konversation::ChannelSettings channelSettings = m_serverGroup->channelByNameFromHistory(channel->getName()); - channelSettings.setNotificationsEnabled(channel->notificationsEnabled()); - m_serverGroup->appendChannelHistory(channelSettings); + if (getServerGroup()) + { + Konversation::ChannelSettings channelSettings = getServerGroup()->channelByNameFromHistory(channel->getName()); + channelSettings.setNotificationsEnabled(channel->notificationsEnabled()); + getServerGroup()->appendChannelHistory(channelSettings); + } - channelList.removeRef(channel); + m_channelList.removeRef(channel); } void Server::updateChannelMode(const QString &updater, const QString &channelName, char mode, bool plus, const QString ¶meter) @@ -2163,11 +2083,12 @@ void Server::updateChannelQuickButtons() { - Channel* channel=channelList.first(); - while(channel) + Channel* channel=m_channelList.first(); + + while (channel) { channel->updateQuickButtons(Preferences::quickButtonList()); - channel=channelList.next(); + channel = m_channelList.next(); } } @@ -2178,11 +2099,11 @@ wanted=wanted.lower(); // Traverse through list to find the channel named "name" - Channel* lookChannel=channelList.first(); - while(lookChannel) + Channel* lookChannel =m_channelList.first(); + while (lookChannel) { - if(lookChannel->getName().lower()==wanted) return lookChannel; - lookChannel=channelList.next(); + if (lookChannel->getName().lower()==wanted) return lookChannel; + lookChannel = m_channelList.next(); } // No channel by that name found? Return 0. Happens on first channel join return 0; @@ -2195,11 +2116,11 @@ wanted=wanted.lower(); // Traverse through list to find the query with "name" - class Query* lookQuery=queryList.first(); + class Query* lookQuery=m_queryList.first(); while(lookQuery) { if(lookQuery->getName().lower()==wanted) return lookQuery; - lookQuery=queryList.next(); + lookQuery=m_queryList.next(); } // No query by that name found? Must be a new query request. Return 0 return 0; @@ -2315,7 +2236,7 @@ if (!nickInfo) { nickInfo = new NickInfo(nickname, this); - m_allNicks.insert(QString(nickname.lower()), nickInfo); + m_allNicks.insert(lcNickname, nickInfo); doWatchedNickChangedSignal = isWatchedNick(nickname); } // Move the channel from joined list (if present) to unjoined list. @@ -2371,17 +2292,36 @@ QString lcNickname = nickname.lower(); nickInfo = new NickInfo(nickname, this); m_allNicks.insert(lcNickname, nickInfo); - emit watchedNickChanged(this, nickname, true); - Konversation::Addressbook::self()->emitContactPresenceChanged(nickInfo->getAddressee().uid()); - appendMessageToFrontmost(i18n("Notify"),""+ - i18n("%1 is online (%2).").arg(nickname).arg(getServerName())+"",statusView); - - static_cast(kapp)->notificationHandler()->nickOnline(getStatusView(), nickname); } + + emit watchedNickChanged(this, nickname, true); + KABC::Addressee addressee = nickInfo->getAddressee(); + if (!addressee.isEmpty()) Konversation::Addressbook::self()->emitContactPresenceChanged(addressee.uid()); + + appendMessageToFrontmost(i18n("Notify"),""+ + i18n("%1 is online (%2).").arg(nickname).arg(getServerName())+"", getStatusView()); + + static_cast(kapp)->notificationHandler()->nickOnline(getStatusView(), nickname); + nickInfo->setPrintedOnline(true); return nickInfo; } +void Server::setWatchedNickOffline(const QString& nickname, const NickInfoPtr nickInfo) +{ + if (nickInfo) { + KABC::Addressee addressee = nickInfo->getAddressee(); + if (!addressee.isEmpty()) Konversation::Addressbook::self()->emitContactPresenceChanged(addressee.uid(), 1); + } + + emit watchedNickChanged(this, nickname, false); + + appendMessageToFrontmost(i18n("Notify"), i18n("%1 went offline (%2).").arg(nickname).arg(getServerName()), getStatusView()); + + static_cast(kapp)->notificationHandler()->nickOffline(getStatusView(), nickname); + +} + bool Server::setNickOffline(const QString& nickname) { QString lcNickname = nickname.lower(); @@ -2390,7 +2330,6 @@ if (nickInfo && wasOnline) { - KABC::Addressee addressee = nickInfo->getAddressee(); // Delete from query list, if present. if (m_queryNicks.contains(lcNickname)) m_queryNicks.remove(lcNickname); // Delete the nickname from all channels (joined or unjoined). @@ -2406,19 +2345,7 @@ // Delete NickInfo. if (m_allNicks.contains(lcNickname)) m_allNicks.remove(lcNickname); // If the nick was in the watch list, emit various signals and messages. - if (isWatchedNick(nickname)) - { - emit watchedNickChanged(this, nickname, false); - - if (!addressee.isEmpty()) - { - Konversation::Addressbook::self()->emitContactPresenceChanged(addressee.uid(), 1); - } - - appendMessageToFrontmost(i18n("Notify"), i18n("%1 went offline (%2).").arg(nickname).arg(getServerName()),statusView); - - static_cast(kapp)->notificationHandler()->nickOffline(getStatusView(), nickname); - } + if (isWatchedNick(nickname)) setWatchedNickOffline(nickname, nickInfo); nickInfo->setPrintedOnline(false); } @@ -2433,11 +2360,12 @@ * @param nickname The nickname to be deleted. Case insensitive. * @return True if the nickname is deleted. */ -bool Server::deleteNickIfUnlisted(QString &nickname) +bool Server::deleteNickIfUnlisted(const QString &nickname) { - // Don't delete our own nickinfo. - if (nickname == getNickname()) return false; QString lcNickname = nickname.lower(); + // Don't delete our own nickinfo. + if (lcNickname == loweredNickname()) return false; + if (!m_queryNicks.contains(lcNickname)) { QStringList nickChannels = getNickChannels(nickname); @@ -2496,7 +2424,7 @@ QStringList Server::getWatchList() { // no nickinfo ISON for the time being - return Preferences::notifyListByGroupName(getServerGroup()); + return Preferences::notifyListByGroupName(getDisplayName()); if (m_serverISON) return m_serverISON->getWatchList(); else @@ -2508,7 +2436,7 @@ QStringList Server::getISONList() { // no nickinfo ISON for the time being - return Preferences::notifyListByGroupName(getServerGroup()); + return Preferences::notifyListByGroupName(getDisplayName()); if (m_serverISON) return m_serverISON->getISONList(); else @@ -2522,8 +2450,10 @@ */ bool Server::isWatchedNick(const QString& nickname) { - QStringList watchList = getWatchList(); - return (watchList.contains(nickname.lower())); + // Get watch list from preferences. + QString watchlist= ' ' + getWatchListString() + ' '; + // Search case-insensitivly + return (watchlist.find(' ' + nickname + ' ', 0, 0) != -1); } /** @@ -2584,7 +2514,7 @@ if (nickInfo) { // Get existing lowercase nickname and rename nickname in the NickInfo object. - QString lcNickname = nickInfo->getNickname().lower(); + QString lcNickname = nickInfo->loweredNickname(); nickInfo->setNickname(newname); nickInfo->setIdentified(false); QString lcNewname = newname.lower(); @@ -2678,10 +2608,10 @@ if(outChannel) { ChannelNickPtr channelNick = getChannelNick(channelName, nickname); - ChannelNickPtr kickerNick = getChannelNick(channelName, kicker); + if(channelNick) { - outChannel->kickNick(channelNick, *kickerNick, reason); + outChannel->kickNick(channelNick, kicker, reason); // Tell Nickinfo removeChannelNick(channelName,nickname); } @@ -2690,21 +2620,18 @@ void Server::removeNickFromServer(const QString &nickname,const QString &reason) { - Channel* channel=channelList.first(); - while(channel) + Channel* channel = m_channelList.first(); + while (channel) { // Check if nick is in this channel or not. - Channel *nextchannel = channelList.next(); - if( channel->getNickByName( nickname ) ) + if(channel->getNickByName(nickname)) removeNickFromChannel(channel->getName(),nickname,reason,true); - channel=nextchannel; + + channel = m_channelList.next(); } Query* query=getQueryByName(nickname); - if(query) - { - query->quitNick(reason); - } + if (query) query->quitNick(reason); // Delete the nick from all channels and then delete the nickinfo, // emitting signal if on the watch list. @@ -2720,11 +2647,11 @@ } // If this was our own nickchange, tell our server object about it - if(nickname == getNickname()) + if (nickname == getNickname()) { setNickname(newNick); - // We may get a request from nickserv, so remove the auto-identify lock + // We may get a request from nickserv, so remove the auto-identify lock. m_autoIdentifyLock = false; } @@ -2741,14 +2668,16 @@ //The rest of the code below allows the channels to echo to the user to tell them that the nick has changed. // Rename the nick in every channel they are in - Channel* channel=channelList.first(); - while(channel) + Channel* channel=m_channelList.first(); + while (channel) { // All we do is notify that the nick has been renamed.. we haven't actually renamed it yet // Note that NickPanel has already updated, so pass new nick to getNickByName. - if(channel->getNickByName(newNick)) channel->nickRenamed(nickname, *nickInfo); - channel=channelList.next(); + if (channel->getNickByName(newNick)) channel->nickRenamed(nickname, *nickInfo); + channel = m_channelList.next(); } + //Watched nicknames stuff + if (isWatchedNick(nickname)) setWatchedNickOffline(nickname, 0); } // If we had a query with this nick, change that name, too @@ -2756,10 +2685,10 @@ void Server::userhost(const QString& nick,const QString& hostmask,bool away,bool /* ircOp */) { - addHostmaskToNick(nick,hostmask); + addHostmaskToNick(nick, hostmask); // remember my IP for DCC things // myself - if( ownIpByUserhost.isEmpty() && nick==nickname ) + if (m_ownIpByUserhost.isEmpty() && nick == getNickname()) { QString myhost = hostmask.section('@', 1); // Use async lookup else you will be blocking GUI badly @@ -2778,9 +2707,7 @@ void Server::gotOwnResolvedHostByUserhost(KResolverResults res) { if ( res.error() == KResolver::NoError && !res.isEmpty() ) - { - ownIpByUserhost = res.first().address().nodeName(); - } + m_ownIpByUserhost = res.first().address().nodeName(); else kdDebug() << "Server::gotOwnResolvedHostByUserhost(): Got error: " << ( int )res.error() << endl; } @@ -2788,30 +2715,35 @@ void Server::appendServerMessageToChannel(const QString& channel,const QString& type,const QString& message) { Channel* outChannel = getChannelByName(channel); - if(outChannel) - outChannel->appendServerMessage(type,message); + if (outChannel) outChannel->appendServerMessage(type,message); } -void Server::appendCommandMessageToChannel(const QString& channel,const QString& command,const QString& message) +void Server::appendCommandMessageToChannel(const QString& channel,const QString& command,const QString& message, bool highlight) { Channel* outChannel = getChannelByName(channel); - if(outChannel) - outChannel->appendCommandMessage(command,message); + if (outChannel) + { + outChannel->appendCommandMessage(command,message,true,true,!highlight); + } + else + { + appendStatusMessage(command, QString("%1 %2").arg(channel).arg(message)); + } } void Server::appendStatusMessage(const QString& type,const QString& message) { - statusView->appendServerMessage(type,message); + getStatusView()->appendServerMessage(type,message); } void Server::appendMessageToFrontmost(const QString& type,const QString& message, bool parseURL) { - getViewContainer()->appendToFrontmost(type,message, statusView, parseURL); + getViewContainer()->appendToFrontmost(type, message, getStatusView(), parseURL); } void Server::setNickname(const QString &newNickname) { - nickname = newNickname; + m_nickname = newNickname; m_loweredNickname = newNickname.lower(); emit nicknameChanged(newNickname); } @@ -2837,11 +2769,11 @@ } } -void Server::setTopicAuthor(const QString& channel,const QString& author) +void Server::setTopicAuthor(const QString& channel, const QString& author, QDateTime time) { Channel* outChannel = getChannelByName(channel); if(outChannel) - outChannel->setTopicAuthor(author); + outChannel->setTopicAuthor(author, time); } void Server::endOfWho(const QString& target) @@ -2853,12 +2785,12 @@ bool Server::isNickname(const QString &compare) const { - return (nickname == compare); + return (m_nickname == compare); } QString Server::getNickname() const { - return nickname; + return m_nickname; } QString Server::loweredNickname() const @@ -2930,8 +2862,8 @@ } else if (toExpand == 'K') { - if(!m_serverGroup->serverByIndex(m_currentServerIndex).password().isEmpty()) - out.append(m_serverGroup->serverByIndex(m_currentServerIndex).password()); + if(getConnectionSettings().server().password().isEmpty()) + out.append(getConnectionSettings().server().password()); } else if (toExpand == 'n') { @@ -2948,41 +2880,20 @@ return out; } -void Server::setIrcName(const QString &newIrcName) -{ - ircName = newIrcName; -} - -QString Server::getIrcName() const -{ - return ircName; -} - -InputFilter* Server::getInputFilter() -{ - return &inputFilter; -} - -Konversation::OutputFilter* Server::getOutputFilter() -{ - return outputFilter; -} - void Server::sendToAllChannels(const QString &text) { // Send a message to all channels we are in - Channel* channel = channelList.first(); - while(channel) + Channel* channel = m_channelList.first(); + while (channel) { channel->sendChannelText(text); - channel = channelList.next(); + channel = m_channelList.next(); } } void Server::invitation(const QString& nick,const QString& channel) { - if(Preferences::autojoinOnInvite() && - KMessageBox::questionYesNo(getViewContainer()->getWindow(), + if(KMessageBox::questionYesNo(getViewContainer()->getWindow(), i18n("You were invited by %1 to join channel %2. " "Do you accept the invitation?").arg(nick).arg(channel), i18n("Invitation"), @@ -3004,66 +2915,6 @@ appendMessageToFrontmost(i18n("DCOP"),i18n("Error: Could not execute script \"%1\". Check file permissions.").arg(name)); } -void Server::away() -{ - if(!m_isAway) - startAwayTimer(); //Don't start timer if we have already started it - - m_isAway=true; - emit awayState(true); - - if(!getIdentity()->getAwayNick().isEmpty() && getIdentity()->getAwayNick() != getNickname()) - { - nonAwayNick = getNickname(); - queue("NICK " + getIdentity()->getAwayNick()); - } - - if(getIdentity()->getInsertRememberLineOnAway()) - emit awayInsertRememberLine(this); - - // TODO: call renameNickInfo ? - - if(getViewContainer()->getWindow()) - { - KAction *action = getViewContainer()->getWindow()->actionCollection()->action("toggle_away"); - if(action) - { - action->setText(i18n("Set &Available Globally")); - action->setIcon("konversationavailable"); - } - } - -} - -void Server::unAway() -{ - m_isAway = false; - m_awayReason = QString(); - emit awayState(false); - - if(!getIdentity()->getAwayNick().isEmpty() && !nonAwayNick.isEmpty()) - queue("NICK " + nonAwayNick); - - // TODO: call renameNickInfo ? - - if(getViewContainer()->getWindow()) - { - KAction *action = getViewContainer()->getWindow()->actionCollection()->action("toggle_away"); - if(action) - { - //this may be wrong if other servers are still away - action->setText(i18n("Set &Away Globally")); - action->setIcon("konversationaway"); - } - } - -} - -void Server::setAwayReason(const QString& reason) -{ - m_awayReason = reason; -} - bool Server::isAChannel(const QString &channel) const { return (getChannelTypes().contains(channel.at(0)) > 0); @@ -3071,154 +2922,154 @@ void Server::addRawLog(bool show) { - if (!rawLog) - rawLog=getViewContainer()->addRawLog(this); + if (!m_rawLog) m_rawLog = getViewContainer()->addRawLog(this); - connect(this,SIGNAL (serverOnline(bool)),rawLog,SLOT (serverOnline(bool)) ); + connect(this, SIGNAL(serverOnline(bool)), m_rawLog, SLOT(serverOnline(bool))); // bring raw log to front since the main window does not do this for us - if (show) emit showView(rawLog); + if (show) emit showView(m_rawLog); } void Server::closeRawLog() { - if(rawLog) - { - delete rawLog; - rawLog = 0; - } + if (m_rawLog) delete m_rawLog; } ChannelListPanel* Server::addChannelListPanel() { - if(!channelListPanel) + if(!m_channelListPanel) { - channelListPanel = getViewContainer()->addChannelListPanel(this); + m_channelListPanel = getViewContainer()->addChannelListPanel(this); - connect(channelListPanel, SIGNAL(refreshChannelList()), this, SLOT(requestChannelList())); - connect(channelListPanel, SIGNAL(joinChannel(const QString&)), this, SLOT(sendJoinCommand(const QString&))); - connect(this, SIGNAL(serverOnline(bool)), channelListPanel, SLOT(serverOnline(bool))); + connect(m_channelListPanel, SIGNAL(refreshChannelList()), this, SLOT(requestChannelList())); + connect(m_channelListPanel, SIGNAL(joinChannel(const QString&)), this, SLOT(sendJoinCommand(const QString&))); + connect(this, SIGNAL(serverOnline(bool)), m_channelListPanel, SLOT(serverOnline(bool))); } - return channelListPanel; + return m_channelListPanel; } void Server::addToChannelList(const QString& channel, int users, const QString& topic) { addChannelListPanel(); - channelListPanel->addToChannelList(channel, users, topic); + m_channelListPanel->addToChannelList(channel, users, topic); } ChannelListPanel* Server::getChannelListPanel() const { - return channelListPanel; + return m_channelListPanel; } void Server::closeChannelListPanel() { - if(channelListPanel) - { - delete channelListPanel; - channelListPanel = 0; - } + if (m_channelListPanel) delete m_channelListPanel; } -void Server::updateAutoJoin(const QString& channel) +void Server::updateAutoJoin(Konversation::ChannelSettings channel) { - Konversation::ChannelList tmpList = m_serverGroup->channelList(); - - if (quickConnect && channel.isEmpty()) + if (!channel.name().isEmpty()) { - setAutoJoin(false); + setAutoJoin(true); + + setAutoJoinCommands(QStringList("JOIN " + channel.name() + " " + channel.password())); + return; } - if(!channel.isEmpty()) - tmpList.push_front(Konversation::ChannelSettings(channel)); + Konversation::ChannelList tmpList; + + if (m_channelList.isEmpty() && getServerGroup()) + tmpList = getServerGroup()->channelList(); + else + { + QPtrListIterator it(m_channelList); + Channel* channel; + + while ((channel = it.current()) != 0) + { + ++it; + tmpList << channel->channelSettings(); + } + } - if(!tmpList.isEmpty()) + if (!tmpList.isEmpty()) { setAutoJoin(true); - QString channels; - QString keys; + QStringList channels; + QStringList passwords; + QStringList joinCommands; + uint length = 0; - if (tmpList.count()>1) + Konversation::ChannelList::iterator it; + + for (it = tmpList.begin(); it != tmpList.end(); ++it) { - Konversation::ChannelList::iterator it; - for(it = tmpList.begin(); it != tmpList.end(); ++it) - { - if(it != tmpList.begin()) - { - channels += ','; - keys += ','; - } + QString channel = (*it).name();; + QString password = ((*it).password().isEmpty() ? "." : (*it).password()); - channels += (*it).name(); - keys += ((*it).password().isEmpty() ? QString(".") : (*it).password()); + int tempLen = channel.length(); + length += getIdentity()->getCodec()->fromUnicode(channel, tempLen).length(); + tempLen = password.length(); + length += getIdentity()->getCodec()->fromUnicode(password, tempLen).length(); + + if (length + 6 < 512) // 6: "JOIN " plus separating space between chans and pws. + { + channels << channel; + passwords << password; } - } - else - { - channels = tmpList.first().name(); - keys = (tmpList.first().password().isEmpty() ? QString("") : tmpList.first().password()); - } + else + { + if (passwords.last() == ".") passwords.pop_back(); - setAutoJoinChannel(channels); - setAutoJoinChannelKey(keys); - } - else - { - setAutoJoin(false); - } -} + joinCommands << "JOIN " + channels.join(",") + " " + passwords.join(","); -void Server::autoRejoinChannels() -{ - if (channelList.isEmpty()) - return; + channels.clear(); + passwords.clear(); - QStringList channels; - QStringList keys; + channels << channel; + passwords << password; - for (Channel* ch = channelList.first(); ch; ch = channelList.next()) - { - channels.append(ch->getName()); - keys.append(ch->getKey()); - } + length = 0; - QString joinString("JOIN "+channels.join(",")+' '+keys.join(",")); - queue(joinString); -} + tempLen = channel.length(); + length += getIdentity()->getCodec()->fromUnicode(channel, tempLen).length(); + tempLen = password.length(); + length += getIdentity()->getCodec()->fromUnicode(password, tempLen).length(); + } + } -IdentityPtr Server::getIdentity() const -{ - return m_serverGroup->identity(); -} + if (passwords.last() == ".") passwords.pop_back(); -void Server::setViewContainer(ViewContainer* newViewContainer) -{ - m_viewContainerPtr = newViewContainer; + joinCommands << "JOIN " + channels.join(",") + " " + passwords.join(","); + + setAutoJoinCommands(joinCommands); + } + else + setAutoJoin(false); } ViewContainer* Server::getViewContainer() const { - return m_viewContainerPtr; + KonversationApplication* konvApp = static_cast(kapp); + return konvApp->getMainWindow()->getViewContainer(); } bool Server::getUseSSL() const { - return m_serverGroup->serverByIndex(m_currentServerIndex).SSLEnabled(); + SSLSocket* sslsocket = dynamic_cast(m_socket); + + return (sslsocket != 0); } QString Server::getSSLInfo() const { - return static_cast(m_socket)->details(); -} + SSLSocket* sslsocket = dynamic_cast(m_socket); -bool Server::connected() const -{ - return alreadyConnected; + if(sslsocket) + return sslsocket->details(); + + return QString(); } void Server::sendMultiServerCommand(const QString& command, const QString& parameter) @@ -3228,131 +3079,175 @@ void Server::executeMultiServerCommand(const QString& command, const QString& parameter) { - if(command == "away" || command == "back") //back is the same as away, since paramater is "" - { - QString str = Preferences::commandChar() + command; - - //you cant have a message with 'back' - if(!parameter.isEmpty() && command == "away") - str += ' ' + parameter; - - Konversation::OutputFilterResult result = outputFilter->parse(getNickname(), str, QString::null); - queue(result.toServer); - } - else if(command == "msg") - { + if (command == "msg") sendToAllChannelsAndQueries(parameter); - } else - { sendToAllChannelsAndQueries(Preferences::commandChar() + command + ' ' + parameter); - } } void Server::sendToAllChannelsAndQueries(const QString& text) { // Send a message to all channels we are in - Channel* channel = channelList.first(); + Channel* channel = m_channelList.first(); - while(channel) + while (channel) { channel->sendChannelText(text); - channel=channelList.next(); + channel = m_channelList.next(); } // Send a message to all queries we are in - class Query* query = queryList.first(); + class Query* query = m_queryList.first(); - while(query) + while (query) { query->sendQueryText(text); - query=queryList.next(); + query = m_queryList.next(); } } -void Server::reconnect() +bool Server::isSocketConnected() const { - if (isConnected() && !connecting) - { - keepViewsOpenAfterQuit = true; - reconnectAfterQuit = true; - quitServer(); - send(); - } - else if (!isConnected()) + if (!m_socket) return false; + + return (m_socket->state() == KNetwork::KClientSocketBase::Connected); +} + +void Server::updateConnectionState(Konversation::ConnectionState state) +{ + if (state != m_connectionState) { - reconnectCounter = 0; - connectToIRCServer(); + m_connectionState = state; + + if (m_connectionState == Konversation::SSConnected) + emit serverOnline(true); + else if (m_connectionState != Konversation::SSConnecting) + emit serverOnline(false); + + emit connectionStateChanged(this, state); } } +void Server::reconnect() +{ + if (isConnecting() || isSocketConnected()) quitServer(); + + // Use asynchronous invocation so that the broken() that the above + // quitServer might cause is delivered before connectToIRCServer + // sets SSConnecting and broken() announces a deliberate disconnect + // due to the failure allegedly occuring during SSConnecting. + QTimer::singleShot(0, this, SLOT(connectToIRCServer())); +} + void Server::disconnect() { - if (isConnected()) - { - keepViewsOpenAfterQuit = true; - quitServer(); - send(); - } + if (isSocketConnected()) quitServer(); } -void Server::connectToServerGroup(const QString& serverGroup) +void Server::requestAway(const QString& reason) { - KonversationApplication *konvApp = static_cast(KApplication::kApplication()); - konvApp->connectToServerGroup(serverGroup); + QString awayReason = reason; + IdentityPtr identity = getIdentity(); + + if (awayReason.isEmpty() || !identity) + awayReason = i18n("Gone away for now"); + + setAwayReason(awayReason); + + queue("AWAY :" + awayReason); } -void Server::connectToNewServer(const QString& server, const QString& port, const QString& password) +void Server::requestUnaway() { - KonversationApplication *konvApp = static_cast(KApplication::kApplication()); - konvApp->quickConnectToServer(server, port,"", "", password); + queue("AWAY"); } -bool Server::isAway() const +void Server::setAway(bool away) { - return m_isAway; + IdentityPtr identity = getIdentity(); + + if (away) + { + if (!m_away) startAwayTimer(); + + m_away = true; + + emit awayState(true); + + if (identity && !identity->getAwayNick().isEmpty() && identity->getAwayNick() != getNickname()) + { + m_nonAwayNick = getNickname(); + queue("NICK " + getIdentity()->getAwayNick()); + } + + appendMessageToFrontmost(i18n("Away"), i18n("You are now marked as being away.")); + + if (identity && identity->getShowAwayMessage()) + { + QString message = identity->getAwayMessage(); + sendToAllChannels(message.replace(QRegExp("%s", false), m_awayReason)); + } + + if (identity && identity->getInsertRememberLineOnAway()) + emit awayInsertRememberLine(this); + } + else + { + m_awayReason = QString(); + + emit awayState(false); + + if (!identity->getAwayNick().isEmpty() && !m_nonAwayNick.isEmpty()) + { + queue("NICK " + m_nonAwayNick); + m_nonAwayNick = ""; + } + + if (m_away) + { + appendMessageToFrontmost(i18n("Away"), i18n("You are no longer marked as being away.")); + + if (identity && identity->getShowAwayMessage()) + { + QString message = identity->getReturnMessage(); + sendToAllChannels(message.replace(QRegExp("%t", false), awayTime())); + } + } + else + appendMessageToFrontmost(i18n("Away"), i18n("You are not marked as being away.")); + + m_away = false; + } } QString Server::awayTime() const { QString retVal; - if(m_isAway) + if (m_away) { int diff = QDateTime::currentDateTime().toTime_t() - m_awayTime; int num = diff / 3600; - if(num < 10) - { + if (num < 10) retVal = '0' + QString::number(num) + ':'; - } else - { retVal = QString::number(num) + ':'; - } num = (diff % 3600) / 60; - if(num < 10) - { - retVal += '0'; - } + if (num < 10) retVal += '0'; retVal += QString::number(num) + ':'; num = (diff % 3600) % 60; - if(num < 10) - { - retVal += '0'; - } + if (num < 10) retVal += '0'; retVal += QString::number(num); } else - { retVal = "00:00:00"; - } return retVal; } @@ -3404,23 +3299,25 @@ //hostmask, such as what happens when a Freenode cloak is activated. //It might be more intelligent to only do this when there is text //in the inputbox. Kinda changes this into a "do minutely" - //queue :-) - getInputFilter()->setAutomaticRequest("WHO", nickname, true); - queueAt(0, "WHO " + nickname); + //queue :-) + QStringList ql; + ql << "PING LAG" + QTime::currentTime().toString("hhmmss"); + getInputFilter()->setAutomaticRequest("WHO", getNickname(), true); + ql << "WHO " + getNickname(); + queueList(ql, HighPriority); - queueAt(0, "PING LAG" + QTime::currentTime().toString("hhmmss")); m_lagTime.start(); - inputFilter.setLagMeasuring(true); + m_inputFilter.setLagMeasuring(true); m_pingResponseTimer.start(1000 /*1 sec*/); } void Server::pongReceived() { - currentLag = m_lagTime.elapsed(); - inputFilter.setLagMeasuring(false); + m_currentLag = m_lagTime.elapsed(); + m_inputFilter.setLagMeasuring(false); m_pingResponseTimer.stop(); - emit serverLag(this, currentLag); + emit serverLag(this, m_currentLag); // Send another PING in 60 seconds QTimer::singleShot(60000 /*60 sec*/, this, SLOT(sendPing())); @@ -3428,17 +3325,23 @@ void Server::updateLongPongLag() { - if(isConnected()) + if (isSocketConnected()) { - currentLag = m_lagTime.elapsed(); - emit tooLongLag(this, currentLag); + m_currentLag = m_lagTime.elapsed(); + emit tooLongLag(this, m_currentLag); // kdDebug() << "Current lag: " << currentLag << endl; - if (currentLag > (Preferences::maximumLagTime() * 1000)) + if (m_currentLag > (Preferences::maximumLagTime() * 1000)) m_socket->close(); } } +void Server::updateEncoding() +{ + if(getViewContainer() && getViewContainer()->getFrontView()) + getViewContainer()->updateViewEncoding(getViewContainer()->getFrontView()); +} + #include "server.moc" // kate: space-indent on; tab-width 4; indent-width 4; mixed-indent off; replace-tabs on; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/serverdialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/serverdialog.cpp --- konversation-1.0.1/konversation/src/serverdialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/serverdialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -10,6 +10,7 @@ email: psn@linux.se */ #include "serverdialog.h" +#include "serversettings.h" #include #include @@ -22,7 +23,6 @@ #include #include -#include "serversettings.h" namespace Konversation { @@ -39,8 +39,8 @@ serverLbl->setBuddy(m_serverEdit); QLabel* portLbl = new QLabel(i18n("&Port:"), mainWidget); - // FIXME Need to check the real min & max - m_portSBox = new QSpinBox(1, 99999, 1, mainWidget); + + m_portSBox = new QSpinBox(1, 65535, 1, mainWidget); m_portSBox->setValue(6667); QWhatsThis::add(m_portSBox, i18n("Enter the port number required to connect to the server. For most servers, this should be 6667.")); portLbl->setBuddy(m_portSBox); @@ -70,7 +70,7 @@ void ServerDialog::setServerSettings(const ServerSettings& server) { - m_serverEdit->setText(server.server()); + m_serverEdit->setText(server.host()); m_portSBox->setValue(server.port()); m_passwordEdit->setText(server.password()); m_sslChBox->setChecked(server.SSLEnabled()); @@ -79,7 +79,7 @@ ServerSettings ServerDialog::serverSettings() { ServerSettings server; - server.setServer(m_serverEdit->text()); + server.setHost(m_serverEdit->text()); server.setPort(m_portSBox->value()); server.setPassword(m_passwordEdit->text()); server.setSSLEnabled(m_sslChBox->isChecked()); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/servergroupdialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/servergroupdialog.cpp --- konversation-1.0.1/konversation/src/servergroupdialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/servergroupdialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -9,7 +9,17 @@ copyright: (C) 2004 by Peter Simonsson email: psn@linux.se */ + #include "servergroupdialog.h" +#include "identity.h" +#include "konversationapplication.h" +#include "viewcontainer.h" +#include "preferences.h" +#include "serversettings.h" +#include "serverdialog.h" +#include "channeldialog.h" +#include "identitydialog.h" +#include "servergroupdialogui.h" #include #include @@ -30,14 +40,6 @@ #include #include -#include "identity.h" -#include "konversationapplication.h" -#include "preferences.h" -#include "serversettings.h" -#include "serverdialog.h" -#include "channeldialog.h" -#include "identitydialog.h" -#include "servergroupdialogui.h" namespace Konversation { @@ -59,12 +61,10 @@ m_mainWidget->m_identityLabel->setBuddy(m_mainWidget->m_identityCBox); connect(m_mainWidget->m_editIdentityButton, SIGNAL(clicked()), this, SLOT(editIdentity())); - QValueList identities = Preferences::identityList(); + IdentityList identities = Preferences::identityList(); - for(QValueList::iterator it = identities.begin(); it != identities.end(); ++it) - { + for (IdentityList::ConstIterator it = identities.begin(); it != identities.end(); ++it) m_mainWidget->m_identityCBox->insertItem((*it)->getName()); - } QWhatsThis::add(m_mainWidget->m_commandEdit, i18n("Optional. This command will be sent to the server after connecting. Example: /msg NickServ IDENTIFY konvirocks. This example is for the freenode network, which requires users to register their nickname with a password and login when connecting. konvirocks is the password for the nickname given in Identity. You may enter more than one command by separating them with semicolons.")); m_mainWidget->m_commandsLabel->setBuddy(m_mainWidget->m_commandEdit); @@ -117,14 +117,14 @@ m_mainWidget->m_identityCBox->setCurrentText(settings->identity()->getName()); m_mainWidget->m_commandEdit->setText(settings->connectCommands()); m_mainWidget->m_autoConnectCBox->setChecked(settings->autoConnectEnabled()); - m_serverList = settings->serverList(true); + m_serverList = settings->serverList(); m_channelHistory = settings->channelHistory(); ServerList::iterator it; m_mainWidget->m_serverLBox->clear(); for(it = m_serverList.begin(); it != m_serverList.end(); ++it) { - m_mainWidget->m_serverLBox->insertItem((*it).server()); + m_mainWidget->m_serverLBox->insertItem((*it).host()); } m_channelList = settings->channelList(); @@ -141,7 +141,7 @@ ServerGroupSettingsPtr settings = new ServerGroupSettings(m_id); settings->setSortIndex(m_sortIndex); settings->setName(m_mainWidget->m_nameEdit->text()); - QValueList identities = Preferences::identityList(); + IdentityList identities = Preferences::identityList(); settings->setIdentityId(identities[m_mainWidget->m_identityCBox->currentItem()]->id()); settings->setConnectCommands(m_mainWidget->m_commandEdit->text()); settings->setAutoConnectEnabled(m_mainWidget->m_autoConnectCBox->isChecked()); @@ -178,7 +178,7 @@ if(dlg.exec() == KDialog::Accepted) { ServerSettings server = dlg.serverSettings(); - m_mainWidget->m_serverLBox->insertItem(server.server()); + m_mainWidget->m_serverLBox->insertItem(server.host()); m_serverList.append(server); updateServerArrows(); } @@ -196,7 +196,7 @@ if(dlg.exec() == KDialog::Accepted) { ServerSettings server = dlg.serverSettings(); - m_mainWidget->m_serverLBox->changeItem(server.server(), current); + m_mainWidget->m_serverLBox->changeItem(server.host(), current); m_serverList[current] = server; } } @@ -234,9 +234,8 @@ { m_mainWidget->m_upServerBtn->setEnabled( m_mainWidget->m_serverLBox->count()>1 && m_mainWidget->m_serverLBox->currentItem()>0 ); - // FIXME: find another way than casting to overcome signedness warning m_mainWidget->m_downServerBtn->setEnabled( m_mainWidget->m_serverLBox->count()>1 && - m_mainWidget->m_serverLBox->currentItem()< static_cast(m_mainWidget->m_serverLBox->count()-1) ); + m_mainWidget->m_serverLBox->currentItem()m_serverLBox->numRows()-1 ); bool enabled = m_mainWidget->m_serverLBox->currentItem() >= 0; m_mainWidget->m_removeServerButton->setEnabled(enabled); m_mainWidget->m_changeServerButton->setEnabled(enabled); @@ -250,7 +249,7 @@ { ServerSettings server = m_serverList[current]; m_mainWidget->m_serverLBox->removeItem(current); - m_mainWidget->m_serverLBox->insertItem(server.server(), current - 1); + m_mainWidget->m_serverLBox->insertItem(server.host(), current - 1); m_mainWidget->m_serverLBox->setCurrentItem(current - 1); ServerList::iterator it = m_serverList.remove(m_serverList.at(current)); --it; @@ -272,7 +271,7 @@ { ServerSettings server = m_serverList[current]; m_mainWidget->m_serverLBox->removeItem(current); - m_mainWidget->m_serverLBox->insertItem(server.server(), current + 1); + m_mainWidget->m_serverLBox->insertItem(server.host(), current + 1); m_mainWidget->m_serverLBox->setCurrentItem(current + 1); ServerList::iterator it = m_serverList.remove(m_serverList.at(current)); ++it; @@ -333,9 +332,8 @@ { m_mainWidget->m_upChannelBtn->setEnabled( m_mainWidget->m_channelLBox->count()>1 && m_mainWidget->m_channelLBox->currentItem()>0 ); - // FIXME: find another way than casting to overcome signedness warning m_mainWidget->m_downChannelBtn->setEnabled( m_mainWidget->m_channelLBox->count()>1 && - m_mainWidget->m_channelLBox->currentItem()< static_cast(m_mainWidget->m_channelLBox->count()-1) ); + m_mainWidget->m_channelLBox->currentItem()m_channelLBox->numRows()-1 ); bool selected = m_mainWidget->m_channelLBox->currentItem() >= 0; m_mainWidget->m_removeChannelButton->setEnabled(selected); m_mainWidget->m_changeChannelButton->setEnabled(selected); @@ -381,21 +379,21 @@ { IdentityDialog dlg(this); dlg.setCurrentIdentity(m_mainWidget->m_identityCBox->currentItem()); - QValueList identities = Preferences::identityList(); - int identityId = identities[m_mainWidget->m_identityCBox->currentItem()]->id(); if(dlg.exec() == KDialog::Accepted) { - identities = Preferences::identityList(); + IdentityList identities = Preferences::identityList(); m_mainWidget->m_identityCBox->clear(); - for(QValueList::iterator it = identities.begin(); it != identities.end(); ++it) + for(IdentityList::ConstIterator it = identities.begin(); it != identities.end(); ++it) { m_mainWidget->m_identityCBox->insertItem((*it)->getName()); } - m_mainWidget->m_identityCBox->setCurrentText(Preferences::identityById(identityId)->getName()); - m_identitiesNeedsUpdate = true; + m_mainWidget->m_identityCBox->setCurrentText(dlg.currentIdentity()->getName()); + m_identitiesNeedsUpdate = true; // and what's this for? + ViewContainer* vc = KonversationApplication::instance()->getMainWindow()->getViewContainer(); + vc->updateViewEncoding(vc->getFrontView()); } } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/servergroupdialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/servergroupdialog.h --- konversation-1.0.1/konversation/src/servergroupdialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/servergroupdialog.h 2008-08-06 16:56:27.000000000 +0100 @@ -9,12 +9,14 @@ copyright: (C) 2004 by Peter Simonsson email: psn@linux.se */ + #ifndef KONVERSATIONSERVERGROUPDIALOG_H #define KONVERSATIONSERVERGROUPDIALOG_H +#include "servergroupsettings.h" + #include -#include "servergroupsettings.h" class QLineEdit; class QComboBox; @@ -66,6 +68,7 @@ ServerGroupDialogUI* m_mainWidget; bool m_expanded; bool m_enableNotifications; + bool m_configBacked; int m_id; int m_sortIndex; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/servergroupdialogui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/servergroupdialogui.ui --- konversation-1.0.1/konversation/src/servergroupdialogui.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/servergroupdialogui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -32,7 +32,7 @@ - Network: + Network name: @@ -56,19 +56,6 @@ Identity: - - - m_identityCBox - - - - 7 - 0 - 0 - 0 - - - m_commandsLabel @@ -91,14 +78,14 @@ - 5 + 1 1 0 0 - Edit... + &Edit... @@ -111,7 +98,7 @@ m_autoConnectCBox - Connect on application start up + Co&nnect on application start up @@ -135,7 +122,7 @@ m_addServerButton - Add... + &Add... @@ -146,7 +133,7 @@ false - Edit... + E&dit... @@ -239,7 +226,7 @@ false - Edit... + Ed&it... @@ -300,6 +287,19 @@ + + + m_identityCBox + + + + 1 + 0 + 2 + 0 + + + @@ -307,7 +307,6 @@ - kcombobox.h kpushbutton.h klistbox.h kpushbutton.h diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/servergroupsettings.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/servergroupsettings.cpp --- konversation-1.0.1/konversation/src/servergroupsettings.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/servergroupsettings.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,13 +6,14 @@ */ /* - copyright: (C) 2004 by Peter Simonsson - email: psn@linux.se + Copyright (C) 2004, 2007 Peter Simonsson + Copyright (C) 2006-2008 Eike Hein */ -#include "servergroupsettings.h" +#include "servergroupsettings.h" #include "konversationapplication.h" + namespace Konversation { @@ -78,18 +79,6 @@ { } - ServerList ServerGroupSettings::serverList(bool hideQuickServer) const - { - if (!m_quickServerList.isEmpty() && !hideQuickServer) - { - return m_quickServerList+m_serverList; - } - else - { - return m_serverList; - } - } - void ServerGroupSettings::setServerList(const ServerList& list) { m_serverList.clear(); @@ -139,6 +128,19 @@ return ChannelSettings(); } + void ServerGroupSettings::addChannel(const ChannelSettings& channel, const ChannelSettings& before) + { + if (before.name().isEmpty()) + m_channelList.append(channel); + else + m_channelList.insert(m_channelList.find(before), channel); + } + + void ServerGroupSettings::removeChannel(const ChannelSettings& channel) + { + m_channelList.remove(channel); + } + IdentityPtr ServerGroupSettings::identity() const { return Preferences::identityById(m_identityId); @@ -182,8 +184,6 @@ ChannelSettings::ChannelSettings() { - setName(""); - setPassword(""); setNotificationsEnabled(true); } @@ -197,7 +197,6 @@ ChannelSettings::ChannelSettings(const QString& name) { setName(name); - setPassword(""); setNotificationsEnabled(true); } @@ -215,6 +214,14 @@ setNotificationsEnabled(enableNotifications); } + bool ChannelSettings::operator== (const ChannelSettings& channel) const + { + if (m_name.lower() == channel.name().lower()) + return true; + else + return false; + } + ChannelSettings::~ChannelSettings() { } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/servergroupsettings.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/servergroupsettings.h --- konversation-1.0.1/konversation/src/servergroupsettings.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/servergroupsettings.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,19 +6,21 @@ */ /* - copyright: (C) 2004 by Peter Simonsson - email: psn@linux.se + Copyright (C) 2004, 2007 Peter Simonsson + Copyright (C) 2006-2008 Eike Hein */ + #ifndef KONVERSATIONSERVERGROUPSETTINGS_H #define KONVERSATIONSERVERGROUPSETTINGS_H +#include "serversettings.h" +#include "identity.h" + #include #include #include -#include "serversettings.h" -#include "identity.h" namespace Konversation { @@ -42,6 +44,8 @@ void setNotificationsEnabled(bool enable) { m_enableNotifications = enable; } bool enableNotifications() const { return m_enableNotifications; } + bool operator==(const ChannelSettings& channel) const; + private: QString m_name; QString m_password; @@ -70,12 +74,9 @@ void setServerList(const ServerList& list); void addServer(const ServerSettings& settings) { m_serverList.append(settings); } void removeServer(const ServerSettings settings); - ServerList serverList(bool hideQuickServer=false) const; + ServerList serverList() const { return m_serverList; } ServerSettings serverByIndex(unsigned int index) const; - ServerList quickServerList() const { return m_quickServerList; } - void setQuickServerList(const ServerSettings& settings) { m_quickServerList.append(settings); } - void clearQuickServerList() { m_quickServerList.clear(); } void setIdentityId(int identityId) { m_identityId = identityId; } int identityId() const { return m_identityId; } @@ -83,6 +84,8 @@ void setChannelList(const ChannelList& list); void addChannel(const ChannelSettings& channel) { m_channelList.append(channel); } + void addChannel(const ChannelSettings& channel, const ChannelSettings& before); + void removeChannel(const ChannelSettings& channel); ChannelList channelList() const { return m_channelList; } ChannelSettings channelByIndex(unsigned int index) const; @@ -113,7 +116,6 @@ int m_sortIndex; QString m_name; ServerList m_serverList; - ServerList m_quickServerList; int m_identityId; ChannelList m_channelList; ChannelList m_channelHistory; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/server.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/server.h --- konversation-1.0.1/konversation/src/server.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/server.h 2008-08-06 16:56:27.000000000 +0100 @@ -8,17 +8,27 @@ /* Copyright (C) 2002 Dario Abatianni Copyright (C) 2005 Ismail Donmez - Copyright (C) 2005 Peter Simonsson - Copyright (C) 2005 Eike Hein + Copyright (C) 2005-2006 Peter Simonsson + Copyright (C) 2006-2008 Eli J. MacKenzie + Copyright (C) 2005-2008 Eike Hein */ #ifndef SERVER_H #define SERVER_H -#include -#include +#include "common.h" +#include "channelnick.h" +#include "inputfilter.h" +#include "outputfilter.h" +#include "nickinfo.h" +#include "sslsocket.h" +#include "serversettings.h" +#include "servergroupsettings.h" +#include "connectionsettings.h" -#include +#include +#include +#include #include #include @@ -26,16 +36,10 @@ #include #include -#include "channelnick.h" -#include "inputfilter.h" -#include "outputfilter.h" -#include "nickinfo.h" -#include "sslsocket.h" -#include "serversettings.h" -#include "servergroupsettings.h" class Channel; class DccTransfer; +class DccTransferPanelItem; class Query; class StatusPanel; class Identity; @@ -49,64 +53,54 @@ using namespace KNetwork; +class IRCQueue; + class Server : public QObject { Q_OBJECT - + friend class IRCQueue; + friend class QueueTuner; +void resetNickSelection(); public: - typedef enum + enum QueuePriority { - SSDisconnected, - SSConnecting, - SSConnected - } State; - /** Constructor used for connecting to a known server. - * Read in the prefrences to get all the details about the server. - */ - Server(ViewContainer* viewContainer, int serverGroupId, bool clearQuickServerList = true); + LowPriority, /// getChannelList() const { return channelList; } - - /** Returns the time we have been away for. - * If we are not away, returns 00:00:00 - */ - QString awayTime() const; - /** Does the _server_ think we are away. Note that if we went auto-away when not connected to the server, this may - * return false. - */ - bool isAway() const; - void setAwayReason(const QString& reason); + const QPtrList& getChannelList() const { return m_channelList; } void emitChannelNickChanged(const ChannelNickPtr channelNick); void emitNickInfoChanged(const NickInfoPtr nickInfo); @@ -341,34 +333,77 @@ ChannelListPanel* addChannelListPanel(); + // invoked by DccTransferSend + void dccSendRequest(const QString& recipient,const QString& fileName,const QString& address,const QString& port,unsigned long size); + void dccPassiveSendRequest(const QString& recipient,const QString& fileName,const QString& address,unsigned long size,const QString& token); + // invoked by DccTransferRecv + void dccResumeGetRequest(const QString& sender,const QString& fileName,const QString& port,KIO::filesize_t startAt); + void dccReverseSendAck(const QString& partnerNick,const QString& fileName,const QString& ownAddress,const QString& ownPort,unsigned long size,const QString& reverseToken); + + // IRCQueueManager + bool validQueue(QueuePriority priority); ///< is this queue index valid? + void resetQueues(); ///< Tell all of the queues to reset + static int _max_queue() { return Howmanyqueuesdoweneedanywayquestionmark-1; } + + /** Forces the queued data to be sent in sequence of age, without pause. + + This could flood you off but since you're quitting, we probably don't care. This is done + here instead of in the queues themselves so we can interleave the queues without having to + zip the queues together. If you want to quit the server normally without sending, reset the queues + first. + */ + void flushQueues(); + + //These are really only here to limit where ircqueue.h is included + static void _fetchRates(); ///< on server construction + static void _stashRates(); ///< on application exit + static void _resetRates(); ///< when QueueTuner says to + + signals: + void destroyed(int connectionId); void nicknameChanged(const QString&); void serverLag(Server* server,int msec); /// will be connected to KonversationMainWindow::updateLag() void tooLongLag(Server* server, int msec);/// will be connected to KonversationMainWindow::updateLag() - void resetLag(); - /// Will be emitted when new 303 came in + void resetLag(); ///< will be emitted when new 303 came in void nicksNowOnline(Server* server,const QStringList& list,bool changed); - void deleted(Server* myself); /// will be connected to KonversationApplication::removeServer() void awayState(bool away); /// will be connected to any user input panel; void multiServerCommand(const QString& command, const QString& parameter); - /// Emitted when the server gains/loses connection. - void serverOnline(bool state); /// will be connected to all server dependant tabs + /** + * Emitted when the server gains/loses connection. + * Will be connected to all server dependant tabs. + */ + void serverOnline(bool state); + + /** + * Emitted every time something gets sent. + * + * @param bytes The count of bytes sent to the server, before re-encoding. + * @param encodedBytes The count of bytes sent to the server after re-encoding. + */ + void sentStat(int bytes, int encodedBytes, IRCQueue *whichQueue); + //FIXME can anyone who can connect to a Server signal not know about an IRCQueue? + void sentStat(int bytes, int encodedBytes); - /// Note that these signals haven't been implemented yet. + //Note that these signals haven't been implemented yet. /// Fires when the information in a NickInfo object changes. void nickInfoChanged(Server* server, const NickInfoPtr nickInfo); + /// Fires when the mode of a nick in a channel changes. void channelNickChanged(Server* server, const ChannelNickPtr channelNick); + /// Fires when a nick leaves or joins a channel. Based on joined flag, receiver could /// call getJoinedChannelMembers or getUnjoinedChannelMembers, or just /// getChannelMembers to get a list of all the nicks now in the channel. /// parted indicates whether the nick joined or left the channel. void channelMembersChanged(Server* server, const QString& channelName, bool joined, bool parted, const QString& nickname); + /// Fires when a channel is moved to/from the Joinied/Unjoined lists. /// joined indicates which list it is now on. Note that if joined is False, it is /// possible the channel does not exist in any list anymore. void channelJoinedOrUnjoined(Server* server, const QString& channelName, bool joined); + /// Fires when a nick on the watch list goes online or offline. void watchedNickChanged(Server* server, const QString& nickname, bool online); ///Fires when the user switches his state to away and has enabled "Insert Remember Line on away" in his identity. @@ -376,18 +411,20 @@ void sslInitFailure(); void sslConnected(Server* server); - void connectionChangedState(Server* server, Server::State state); + void connectionStateChanged(Server* server, Konversation::ConnectionState state); void showView(ChatWindow* view); void addDccPanel(); - void addDccChat(const QString& myNick,const QString& nick,const QString& numericalIp,const QStringList& arguments,bool listen); + void addDccChat(const QString& myNick,const QString& nick,const QStringList& arguments,bool listen); public slots: - void lookupFinished(); void connectToIRCServer(); - void queue(const QString &buffer); - void queueList(const QStringList &buffer); - void queueAt(uint pos,const QString& buffer); + + /** Adds line to queue if non-empty. */ + bool queue(const QString& line, QueuePriority priority=StandardPriority); + //TODO this should be an overload, not a separate name. ambiguous cases need QString() around the cstring + bool queueList(const QStringList& buffer, QueuePriority priority=StandardPriority); + void setNickname(const QString &newNickname); /** This is called when we want to open a new query, or focus an existing one. * @param nickInfo The nickinfo we want to open the query to. Must exist. @@ -398,14 +435,15 @@ void closeQuery(const QString &name); void closeChannel(const QString &name); void quitServer(); - void requestDccChat(const QString& nickname); + void openDccChat(const QString& nickname); + void requestDccChat(const QString& partnerNick, const QString& numericalOwnIp, const QString& ownPort); void requestBan(const QStringList& users,const QString& channel,const QString& option); void requestUnban(const QString& mask,const QString& channel); - void addDccSend(const QString &recipient,KURL fileURL, const QString &altFileName = QString::null, uint fileSize = 0); + void addDccSend(const QString &recipient,KURL fileURL, const QString &altFileName = QString(), uint fileSize = 0); void removeQuery(Query *query); void startNotifyTimer(int msec=0); - void sendJoinCommand(const QString& channelName, const QString& password = QString::null); + void sendJoinCommand(const QString& channelName, const QString& password = QString()); void requestChannelList(); void requestWhois(const QString& nickname); void requestWho(const QString& channel); @@ -420,9 +458,7 @@ void sendMultiServerCommand(const QString& command, const QString& parameter); void executeMultiServerCommand(const QString& command, const QString& parameter); void reconnect(); - void disconnect(); - void connectToServerGroup(const QString& serverGroup); - void connectToNewServer(const QString& server, const QString& port, const QString& password); + void disconnect(); //FIXME is this overriding a qobject method? do we care? void showSSLDialog(); void sendToAllChannels(const QString& text); void notifyTimeout(); @@ -436,18 +472,15 @@ void pongReceived(); protected slots: - + void lookupFinished(); void preShellCommandExited(KProcess*); void ircServerConnectionSuccess(); void startAwayTimer(); - void lockSending(); - void unlockSending(); void incoming(); void processIncomingData(); - void send(); - /** - *Because KBufferedSocket has no closed(int) signal we use this slot to call broken(0) - */ + /// Sends the QString to the socket. No longer has any internal concept of queueing + void toServer(QString&, IRCQueue *); + /// Because KBufferedSocket has no closed(int) signal we use this slot to call broken(0) void closed(); void broken(int state); /** This is connected to the SSLSocket failed. @@ -456,6 +489,8 @@ void sslError(const QString& reason); void connectionEstablished(const QString& ownHost); void notifyResponse(const QString& nicksOnline); + void slotNewDccTransferItemQueued(DccTransfer* transfer); + void startReverseDccSendTransfer(const QString& sourceNick,const QStringList& dccArguments); void addDccGet(const QString& sourceNick,const QStringList& dccArguments); void requestDccSend(); // -> to outputFilter, dccPanel // -> to outputFilter @@ -464,17 +499,13 @@ void resumeDccGetTransfer(const QString& sourceNick,const QStringList& dccArguments); // -> to inputFilter void resumeDccSendTransfer(const QString& sourceNick,const QStringList& dccArguments); - void dccSendRequest(const QString& recipient,const QString& fileName,const QString& address,const QString& port,unsigned long size); - void dccResumeGetRequest(const QString& sender,const QString& fileName,const QString& port,KIO::filesize_t startAt); - void dccGetDone(const DccTransfer* item); - void dccSendDone(const DccTransfer* item); - void dccStatusChanged(const DccTransfer* item, int newStatus, int oldStatus); - void away(); - void unAway(); + void dccGetDone(DccTransfer* item); + void dccSendDone(DccTransfer* item); + void dccStatusChanged(DccTransfer* item, int newStatus, int oldStatus); void scriptNotFound(const QString& name); void scriptExecutionError(const QString& name); void userhost(const QString& nick,const QString& hostmask,bool away,bool ircOp); - void setTopicAuthor(const QString& channel,const QString& author); + void setTopicAuthor(const QString& channel,const QString& author, QDateTime t); void endOfWho(const QString& target); void invitation(const QString& nick,const QString& channel); void sendToAllChannelsAndQueries(const QString& text); @@ -486,23 +517,27 @@ /// Updates GUI when the lag gets high void updateLongPongLag(); + /// Update the encoding shown in the mainwindow's actions + void updateEncoding(); + + private slots: + void collectStats(int bytes, int encodedBytes); + + /** Called in the server constructor if the preferences are set to run a command on a new server instance. + * This sets up the kprocess, runs it, and connects the signals to call preShellCommandExited when done. */ + void doPreShellCommand(); + protected: // constants static const int BUFFER_LEN=513; - /// Initialize the class - void init(ViewContainer* viewContainer, const QString& nick, const QString& channel); - /// Initialize the timers void initTimers(); /// Connect to the signals used in this class. void connectSignals(); - void setViewContainer(ViewContainer* newViewContainer); - - void autoRejoinChannels(); - void updateAutoJoin(const QString& channel=QString::null); + int _send_internal(QString outputline); ///< Guts of old send, isn't a slot. /** Adds a nickname to the unjoinedChannels list. * Creates new NickInfo if necessary. @@ -514,6 +549,7 @@ * @return The NickInfo for the nickname. */ ChannelNickPtr addNickToUnjoinedChannelsList(const QString& channelName, const QString& nickname); + /** * If not already online, changes a nick to the online state by creating * a NickInfo for it and emits various signals and messages for it. @@ -522,6 +558,16 @@ * @return Pointer to NickInfo for nick. */ NickInfoPtr setWatchedNickOnline(const QString& nickname); + + /** + * Display offline notification for a certain nickname. The function doesn't change NickInfo objects. + * If NickInfoPtr is given, then also the integration with KAddressBook is engaged (i.e. the + * nick is marked as away) + * @param nickname The nickname that is offline + * @param nickInfo Pointer to NickInfo for nick + */ + void setWatchedNickOffline(const QString& nickname, const NickInfoPtr nickInfo); + /** * If nickname is no longer on any channel list, or the query list, delete it altogether. * Call this routine only if the nick is not on the notify list or is on the notify @@ -529,7 +575,8 @@ * @param nickname The nickname to be deleted. Case insensitive. * @return True if the nickname is deleted. */ - bool deleteNickIfUnlisted(QString &nickname); + bool deleteNickIfUnlisted(const QString &nickname); + /** * If not already offline, changes a nick to the offline state. * Removes it from all channels on the joined and unjoined lists. @@ -542,104 +589,88 @@ * @return True if the nick was online. */ bool setNickOffline(const QString& nickname); + /** Remove nickname from a channel (on joined or unjoined lists). * @param channelName The channel name. Case insensitive. * @param nickname The nickname. Case insensitive. */ void removeChannelNick(const QString& channelName, const QString& nickname); + /** Remove channel from the joined list. * Nicknames in the channel are added to the unjoined list if they are in the watch list. * @param channelName The channel name. Case insensitive. */ void removeJoinedChannel(const QString& channelName); + /** Renames a nickname in all NickInfo lists. * @param nickInfo Pointer to existing NickInfo object. * @param newname New nickname for the nick. Case sensitive. */ void renameNickInfo(NickInfoPtr nickInfo, const QString& newname); - /** Called in the server constructor if the preferences are set to run a command on a new server instance. - * This sets up the kprocess, runs it, and connects the signals to call preShellCommandExited when done. */ - void doPreShellCommand(); + bool getAutoJoin() const; + void setAutoJoin(bool on); - unsigned int completeQueryPosition; - unsigned int tryNickNumber; - unsigned int reconnectCounter; + QStringList getAutoJoinCommands() const { return m_autoJoinCommands; } + void setAutoJoinCommands(const QStringList& commands) { m_autoJoinCommands = commands; } - QString bot; - QString botPassword; + unsigned int m_completeQueryPosition; + QValueList m_nickIndices; + QStringList m_referenceNicklist; // TODO roll these into a QMap. - QString serverNickPrefixes; // Prefixes used by the server to indicate a mode - QString serverNickPrefixModes; // if supplied: modes related to those prefixes - QString channelPrefixes; // prefixes that indicate channel names. defaults to RFC1459 "#&" - - bool autoJoin; - bool quickConnect; - bool deliberateQuit; - bool keepViewsOpenAfterQuit; - bool reconnectAfterQuit; + QString m_serverNickPrefixes; // Prefixes used by the server to indicate a mode + QString m_serverNickPrefixModes; // if supplied: modes related to those prefixes + QString m_channelPrefixes; // prefixes that indicate channel names. defaults to RFC1459 "#&" - QString autoJoinChannel; - QString autoJoinChannelKey; + bool m_autoJoin; - ViewContainer* m_viewContainerPtr; + QStringList m_autoJoinCommands; KNetwork::KStreamSocket* m_socket; - bool m_tryReconnect; - QTimer reconnectTimer; - QTimer incomingTimer; - QTimer outgoingTimer; - QTimer unlockTimer; // timeout waiting for server to send initial messages - - int timerInterval; // flood protection - - QTimer notifyTimer; - QStringList notifyCache; // List of users found with ISON - int checkTime; // Time elapsed while waiting for server 303 response - int currentLag; - - QString ircName; - QCString inputBufferIncomplete; - QStringList inputBuffer; - QStringList outputBuffer; - QString nickname; - QString m_loweredNickname; - QString ownIpByUserhost; // RPL_USERHOST - QString ownIpByWelcome; // RPL_WELCOME - QString lastDccDir; + QTimer m_reconnectTimer; + QTimer m_incomingTimer; + QTimer m_notifyTimer; + QStringList m_notifyCache; // List of users found with ISON + int m_checkTime; // Time elapsed while waiting for server 303 response + int m_currentLag; - QPtrList channelList; - QPtrList queryList; + QCString m_inputBufferIncomplete; + QStringList m_inputBuffer; - InputFilter inputFilter; - Konversation::OutputFilter* outputFilter; + QValueVector m_queues; + int m_bytesSent, m_encodedBytesSent, m_linesSent, m_bytesReceived; - StatusPanel* statusView; - RawLog* rawLog; - ChannelListPanel* channelListPanel; + QString m_nickname; + QString m_loweredNickname; + QString m_ownIpByUserhost; // RPL_USERHOST + QString m_ownIpByWelcome; // RPL_WELCOME - bool m_isAway; - QString m_awayReason; + QPtrList m_channelList; + QPtrList m_queryList; - bool alreadyConnected; - bool rejoinChannels; - bool sendUnlocked; - bool connecting; + InputFilter m_inputFilter; + Konversation::OutputFilter* m_outputFilter; - QString nonAwayNick; + QGuardedPtr m_statusView; + QGuardedPtr m_rawLog; + QGuardedPtr m_channelListPanel; + bool m_away; + QString m_awayReason; + QString m_nonAwayNick; int m_awayTime; + Konversation::ConnectionState m_connectionState; + void updateConnectionState(Konversation::ConnectionState state); + bool isSocketConnected() const; + ScriptLauncher* m_scriptLauncher; - KProcess preShellCommand; + KProcess m_preShellCommand; private: - /// The server we're going to connect to initially. - Konversation::ServerSettings m_quickServer; - /// Helper object to construct ISON (notify) list and map offline nicks to /// addressbook. ServerISON* m_serverISON; @@ -658,15 +689,13 @@ /// List of nicks in Queries. NickInfoMap m_queryNicks; - Konversation::ServerGroupSettingsPtr m_serverGroup; - unsigned int m_currentServerIndex; - QString m_allowedChannelModes; // Blowfish key map - QMap keyMap; + QMap m_keyMap; bool m_identifyMsg; + bool m_autoIdentifyLock; /// Used to lock incomingTimer while processing message. bool m_processingIncoming; @@ -676,6 +705,13 @@ /// Updates the gui when the lag gets too high QTimer m_pingResponseTimer; - bool m_autoIdentifyLock; + /// Previous ISON reply of the server, needed for comparison with the next reply + QStringList m_prevISONList; + + ConnectionSettings m_connectionSettings; + + static int m_availableConnectionId; + int m_connectionId; }; + #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/serverison.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/serverison.cpp --- konversation-1.0.1/konversation/src/serverison.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/serverison.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -15,20 +15,19 @@ email: john@geola.co.uk */ -// Qt includes. +#include "serverison.h" +#include "server.h" +#include "addressbook.h" +#include "konversationapplication.h" +#include "nickinfo.h" +#include "viewcontainer.h" + #include #include #include #include #include -// Konversation includes. -#include "server.h" -#include "serverison.h" -#include "addressbook.h" -#include "konversationapplication.h" -#include "nickinfo.h" -#include "viewcontainer.h" ServerISON::ServerISON(Server* server) : m_server(server) { @@ -49,8 +48,8 @@ SIGNAL(channelJoinedOrUnjoined(Server*, const QString&, bool )), this, SLOT(slotChannelJoinedOrUnjoined(Server*, const QString&, bool ))); - connect(m_server->getViewContainer()->getWindow(), SIGNAL(prefsChanged()), - this, SLOT(slotPrefsChanged())); + connect(KonversationApplication::instance(), SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)), + this, SLOT(slotServerGroupsChanged())); } QStringList ServerISON::getWatchList() @@ -113,7 +112,7 @@ // Lowercase server name and server group. QString lserverName = m_server->getServerName().lower(); - QString lserverGroup = m_server->getServerGroup().lower(); + QString lserverGroup = m_server->getDisplayName().lower(); // Build notify list from nicks in addressbook, eliminating dups (case insensitive). QMap ISONMap; @@ -170,7 +169,7 @@ // TODO: Don't add nick on user watch list if nick is known to be online // under a different nickname? QStringList prefsWatchList = - Preferences::notifyListByGroupName(m_server->getServerGroup()); + Preferences::notifyListByGroupName(m_server->getDisplayName()); QStringList::iterator itEnd = prefsWatchList.end(); for(QStringList::iterator it = prefsWatchList.begin(); it != itEnd; ++it) @@ -203,9 +202,9 @@ } // When user changes preferences and has nick watching turned on, rebuild notify list. -void ServerISON::slotPrefsChanged() +void ServerISON::slotServerGroupsChanged() { - kdDebug() << "ServerISON::slotPrefsChanged" << endl; + kdDebug() << "ServerISON::slotServerGroupsChanged" << endl; m_ISONList_invalid = true; } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/serverison.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/serverison.h --- konversation-1.0.1/konversation/src/serverison.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/serverison.h 2008-08-06 16:56:27.000000000 +0100 @@ -15,14 +15,17 @@ email: john@geola.co.uk */ -#ifndef SERVERISON_H -#define SERVERISON_H - /** * @author John Tapsell * @author Gary Cramblitt */ +#ifndef SERVERISON_H +#define SERVERISON_H + +#include "nickinfo.h" + + class Server; typedef QMap OfflineNickToAddresseeMap; @@ -78,7 +81,7 @@ private slots: void addressbookChanged(); void nickInfoChanged(Server* server, const NickInfoPtr nickInfo); - void slotPrefsChanged(); + void slotServerGroupsChanged(); void slotChannelMembersChanged(Server* server, const QString& channelName, bool joined, bool parted, const QString& nickname); void slotChannelJoinedOrUnjoined(Server* server, const QString& channelName, bool joined); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/serverlistdialog.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/serverlistdialog.cpp --- konversation-1.0.1/konversation/src/serverlistdialog.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/serverlistdialog.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,13 +6,15 @@ */ /* - copyright: (C) 2004 by Peter Simonsson - email: psn@linux.se - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2004, 2007 Peter Simonsson + Copyright (C) 2006-2008 Eike Hein */ #include "serverlistdialog.h" +#include "preferences.h" +#include "konversationapplication.h" +#include "servergroupdialog.h" +#include "connectionsettings.h" #include #include @@ -20,15 +22,13 @@ #include #include #include +#include #include #include #include #include -#include "preferences.h" -#include "konversationapplication.h" -#include "servergroupdialog.h" namespace Konversation { @@ -80,7 +80,7 @@ if (col==0) { - if (!item->server().server().isEmpty()) + if (!item->server().host().isEmpty()) { if (sortIndex() == item->sortIndex()) return 0; @@ -129,16 +129,23 @@ m_editButton = new QPushButton(i18n("&Edit..."), mainWidget); m_delButton = new QPushButton(i18n("&Delete"), mainWidget); - QGridLayout* layout = new QGridLayout(mainWidget, 1, 2, 0, spacingHint()); + QCheckBox* showAtStartup = new QCheckBox(i18n("Show at application startup"), mainWidget); + showAtStartup->setChecked(Preferences::showServerList()); + connect(showAtStartup, SIGNAL(toggled(bool)), this, SLOT(setShowAtStartup(bool))); + + QGridLayout* layout = new QGridLayout(mainWidget, 5, 2, 0, spacingHint()); layout->addMultiCellWidget(m_serverList, 0, 3, 0, 0); layout->addWidget(m_addButton, 0, 1); layout->addWidget(m_editButton, 1, 1); layout->addWidget(m_delButton, 2, 1); + layout->addMultiCellWidget(showAtStartup, 4, 4, 0, 1); layout->setRowStretch(3, 10); - m_editedItem = false; - m_editedServer = ServerSettings(""); + m_serverList->setFocus(); + + m_selectedItem = false; + m_selectedServer = ServerSettings(""); // Load server list updateServerList(); @@ -186,12 +193,16 @@ { if (item->isServer()) { - emit connectToServer(item->serverGroupId(),item->server()); + ConnectionSettings settings; + + settings.setServerGroup(Preferences::serverGroupById(item->serverGroupId())); + + settings.setServer(item->server()); + + emit connectTo(Konversation::PromptToReuseConnection, settings); } else - { - emit connectToServer(item->serverGroupId()); - } + emit connectTo(Konversation::PromptToReuseConnection, item->serverGroupId()); item = static_cast(selected.next()); } @@ -204,12 +215,8 @@ if(dlg.exec() == KDialog::Accepted) { addServerGroup(dlg.serverGroupSettings()); - emit serverGroupsChanged(); - if(dlg.identitiesNeedsUpdate()) - { - updateServerList(); - } + emit serverGroupsChanged(dlg.serverGroupSettings()); } } @@ -233,14 +240,13 @@ { delete item; - m_editedItem = true; - m_editedServerGroupId = serverGroup->id(); - m_editedServer = dlg.editedServer(); + m_selectedItem = true; + m_selectedServerGroupId = serverGroup->id(); + m_selectedServer = dlg.editedServer(); *serverGroup = *(dlg.serverGroupSettings()); - updateServerList(); - emit serverGroupsChanged(); + emit serverGroupsChanged(serverGroup); } } else @@ -249,14 +255,13 @@ { delete item; - m_editedItem = true; - m_editedServerGroupId = serverGroup->id(); - m_editedServer = ServerSettings(""); + m_selectedItem = true; + m_selectedServerGroupId = serverGroup->id(); + m_selectedServer = ServerSettings(""); *serverGroup = *(dlg.serverGroupSettings()); - updateServerList(); - emit serverGroupsChanged(); + emit serverGroupsChanged(serverGroup); } } } @@ -353,6 +358,7 @@ m_serverList->setCurrentItem(m_serverList->firstChild()); } } + emit serverGroupsChanged(); } @@ -435,6 +441,20 @@ void ServerListDialog::updateServerList() { + if (!m_selectedItem && m_serverList->currentItem()) + { + ServerListItem* item = static_cast(m_serverList->currentItem()); + + m_selectedItem = true; + m_selectedServerGroupId = item->serverGroupId(); + + if (item->isServer()) + m_selectedServer = item->server(); + else + m_selectedServer = ServerSettings(""); + } + + m_serverList->setUpdatesEnabled(false); m_serverList->clear(); Konversation::ServerGroupList serverGroups = Preferences::serverGroupList(); @@ -448,19 +468,22 @@ // The method was called by slotEdit() ... initialize a pointer to the new // location of the edited server group - if (m_editedItem && m_editedServer.server().isEmpty() && (*it)->id()==m_editedServerGroupId) + if (m_selectedItem && m_selectedServer.host().isEmpty() && (*it)->id()==m_selectedServerGroupId) { - m_editedItemPtr = networkItem; + m_selectedItemPtr = networkItem; } } // Highlight the last edited item - if (m_editedItem) + if (m_selectedItem) { - m_serverList->setSelected(m_editedItemPtr,true); - m_serverList->setCurrentItem(m_editedItemPtr); - m_editedItem = false; + m_serverList->setSelected(m_selectedItemPtr,true); + m_serverList->setCurrentItem(m_selectedItemPtr); + m_selectedItem = false; } + + m_serverList->setUpdatesEnabled(true); + m_serverList->repaint(); } QListViewItem* ServerListDialog::insertServerGroup(ServerGroupSettingsPtr serverGroup) @@ -495,7 +518,7 @@ networkItem->setOpen(true); // Produce a list of this server group's servers and iterate over it - Konversation::ServerList serverList = serverGroup->serverList(true); + Konversation::ServerList serverList = serverGroup->serverList(); Konversation::ServerList::iterator serverIt; QListViewItem* serverItem = 0; @@ -504,7 +527,7 @@ for (serverIt = serverList.begin(); serverIt != serverList.end(); ++serverIt) { // Produce a string representation of the server object - QString name = (*serverIt).server(); + QString name = (*serverIt).host(); if ((*serverIt).port() != 6667) name += ':' + QString::number((*serverIt).port()); @@ -523,8 +546,8 @@ serverItem->setDragEnabled(false); // Initialize a pointer to the new location of the last edited server - if (m_editedItem && m_editedServer==(*serverIt)) - m_editedItemPtr = serverItem; + if (m_selectedItem && m_selectedServer==(*serverIt)) + m_selectedItemPtr = serverItem; ++i; } @@ -532,6 +555,10 @@ return networkItem; } + void ServerListDialog::setShowAtStartup(bool show) + { + Preferences::setShowServerList(show); + } } #include "serverlistdialog.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/serverlistdialog.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/serverlistdialog.h --- konversation-1.0.1/konversation/src/serverlistdialog.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/serverlistdialog.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,27 +6,26 @@ */ /* - copyright: (C) 2004 by Peter Simonsson - email: psn@linux.se - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2004 Peter Simonsson + Copyright (C) 2006-2008 Eike Hein */ #ifndef KONVERSATIONSERVERLISTDIALOG_H #define KONVERSATIONSERVERLISTDIALOG_H -#include - -#include +#include "serverlistview.h" +#include "common.h" #include "servergroupsettings.h" +#include + +class ConnectionSettings; class Preferences; class QPushButton; class QStringList; namespace Konversation { - class ServerListItem : public KListViewItem { public: @@ -59,17 +58,18 @@ class ServerListDialog : public KDialogBase { Q_OBJECT - public: - ServerListDialog(QWidget *parent = 0, const char *name = 0); + + public: + explicit ServerListDialog(QWidget *parent = 0, const char *name = 0); ~ServerListDialog(); public slots: void updateServerList(); signals: - void connectToServer(int serverId); - void connectToServer(int serverId, Konversation::ServerSettings quickServer); - void serverGroupsChanged(); + void connectTo(Konversation::ConnectionFlag flag, int serverGroupId); + void connectTo(Konversation::ConnectionFlag flag, ConnectionSettings& connectionSettings); + void serverGroupsChanged(const Konversation::ServerGroupSettings* serverGroup = 0); protected slots: virtual void slotOk(); @@ -86,6 +86,8 @@ void updateButtons(); + void setShowAtStartup(bool show); + protected: QListViewItem* insertServerGroup(ServerGroupSettingsPtr serverGroup); void addServerGroup(ServerGroupSettingsPtr serverGroup); @@ -96,10 +98,10 @@ QPushButton* m_editButton; QPushButton* m_delButton; - bool m_editedItem; - int m_editedServerGroupId; - ServerSettings m_editedServer; - QListViewItem* m_editedItemPtr; + bool m_selectedItem; + int m_selectedServerGroupId; + ServerSettings m_selectedServer; + QListViewItem* m_selectedItemPtr; int m_lastSortColumn; SortOrder m_lastSortOrder; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/serverlistview.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/serverlistview.cpp --- konversation-1.0.1/konversation/src/serverlistview.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/serverlistview.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -8,19 +8,15 @@ /* ServerListView is derived from KListView and implements custom drag'n'drop behavior needed in ServerListDialog. - begin: Wed Jan 18 2006 - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + + Copyright (C) 2006 Eike Hein */ +#include "serverlistview.h" + #include #include -#include "serverlistview.h" - -/* - @author Eike Hein -*/ ServerListView::ServerListView(QWidget *parent) : KListView(parent) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/serverlistview.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/serverlistview.h --- konversation-1.0.1/konversation/src/serverlistview.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/serverlistview.h 2008-08-06 16:56:27.000000000 +0100 @@ -8,9 +8,8 @@ /* ServerListView is derived from KListView and implements custom drag'n'drop behavior needed in ServerListDialog. - begin: Wed Jan 18 2006 - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + + Copyright (C) 2006 Eike Hein */ #ifndef SERVERLISTVIEW_H @@ -18,9 +17,6 @@ #include -/* - @author Eike Hein -*/ class QDragObject; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/serversettings.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/serversettings.cpp --- konversation-1.0.1/konversation/src/serversettings.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/serversettings.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,11 +6,13 @@ */ /* - copyright: (C) 2004 by Peter Simonsson - email: psn@linux.se + Copyright (C) 2004 Peter Simonsson + Copyright (C) 2008 Eike Hein */ + #include "serversettings.h" + namespace Konversation { @@ -22,15 +24,15 @@ ServerSettings::ServerSettings(const ServerSettings& settings) { - setServer(settings.server()); + setHost(settings.host()); setPort(settings.port()); setPassword(settings.password()); setSSLEnabled(settings.SSLEnabled()); } - ServerSettings::ServerSettings(const QString& server) + ServerSettings::ServerSettings(const QString& host) { - setServer(server); + setHost(host); setPort(6667); setSSLEnabled(false); } @@ -39,11 +41,26 @@ { } - bool ServerSettings::operator== (const ServerSettings& settings) const + bool ServerSettings::operator==(const ServerSettings& settings) const { - if (m_server==settings.server() && m_port==settings.port() && m_password==settings.password() && m_SSLEnabled==settings.SSLEnabled()) + if (m_host.lower() == settings.host().lower() + && m_port == settings.port() + && m_password == settings.password() + && m_SSLEnabled == settings.SSLEnabled()) + { return true; + } else return false; } + + void ServerSettings::setHost(const QString& host) + { + m_host = host.stripWhiteSpace(); + } + + void ServerSettings::setPassword(const QString& password) + { + m_password = password.stripWhiteSpace(); + } } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/serversettings.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/serversettings.h --- konversation-1.0.1/konversation/src/serversettings.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/serversettings.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,9 +6,10 @@ */ /* - copyright: (C) 2004 by Peter Simonsson - email: psn@linux.se + Copyright (C) 2004 Peter Simonsson + Copyright (C) 2008 Eike Hein */ + #ifndef KONVERSATIONSERVERSETTINGS_H #define KONVERSATIONSERVERSETTINGS_H @@ -22,16 +23,16 @@ public: ServerSettings(); ServerSettings(const ServerSettings& settings); - explicit ServerSettings(const QString& server); + explicit ServerSettings(const QString& host); ~ServerSettings(); - void setServer(const QString& server) { m_server = server; } - QString server() const { return m_server; } + void setHost(const QString& host); + QString host() const { return m_host; } void setPort(int port) { m_port = port; } int port() const { return m_port;} - void setPassword(const QString& password) { m_password = password; } + void setPassword(const QString& password); QString password() const { return m_password; } void setSSLEnabled(bool enabled) { m_SSLEnabled = enabled; } @@ -40,7 +41,7 @@ bool operator== (const ServerSettings& settings) const; private: - QString m_server; + QString m_host; int m_port; QString m_password; bool m_SSLEnabled; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/ssllabel.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/ssllabel.cpp --- konversation-1.0.1/konversation/src/ssllabel.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/ssllabel.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -14,6 +14,7 @@ #include "ssllabel.h" + SSLLabel::SSLLabel(QWidget* parent,const char* name) : QLabel(parent,name) { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/sslsocket.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/sslsocket.cpp --- konversation-1.0.1/konversation/src/sslsocket.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/sslsocket.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -15,6 +15,8 @@ ************************************************************************* */ +#include "sslsocket.h" + #include #include #include @@ -25,7 +27,6 @@ #include #include -#include "sslsocket.h" struct SSLSocketPrivate { @@ -63,7 +64,10 @@ Q_LONG SSLSocket::writeBlock(const char *data, Q_ULONG len) { - return d->kssl->write( data,len ); + if (d->kssl && KSSL::doesSSLWork() && state() == KNetwork::KClientSocketBase::Connected) + return d->kssl->write( data,len ); + else + return 0; } Q_LONG SSLSocket::readBlock(char *data, Q_ULONG maxlen) @@ -85,12 +89,9 @@ const QString SSLSocket::details() { - QString details; int strength = d->kssl->connectionInfo().getCipherUsedBits(); - details = "Connection is secured with "; - details += QString::number(strength); - details += " bit SSL"; + QString details = i18n("Connection is secured with %1 bit SSL.").arg(strength); return details; } @@ -268,7 +269,8 @@ i18n("Server Authentication"), KGuiItem(i18n("Details")), KGuiItem(i18n("Continue")), - "SslInvalidHost"); + QString::null, + KMessageBox::Dangerous); } else { @@ -279,7 +281,8 @@ i18n("Server Authentication"), KGuiItem(i18n("Details")), KGuiItem(i18n("Continue")), - "SslCertificateNotAuthentic" ); + QString::null, + KMessageBox::Dangerous); } if (result == KMessageBox::Yes) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/sslsocket.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/sslsocket.h --- konversation-1.0.1/konversation/src/sslsocket.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/sslsocket.h 2008-08-06 16:56:27.000000000 +0100 @@ -45,7 +45,7 @@ /** Emitted when there is a problem with SSL * @param reason An error string that has already been through i18n */ - void sslFailure(QString reason); + void sslFailure(const QString& reason); void sslInitDone(); private: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/statuspanel.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/statuspanel.cpp --- konversation-1.0.1/konversation/src/statuspanel.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/statuspanel.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,12 +6,18 @@ */ /* - The panel where the server status messages go - begin: Sam Jan 18 2003 - copyright: (C) 2003 by Dario Abatianni - email: eisfuchs@tigress.com + Copyright (C) 2003 Dario Abatianni + Copyright (C) 2006-2008 Eike Hein */ +#include "statuspanel.h" +#include "channel.h" +#include "konversationapplication.h" +#include "ircinput.h" +#include "ircview.h" +#include "ircviewbox.h" +#include "server.h" + #include #include #include @@ -23,13 +29,6 @@ #include #include -#include "channel.h" -#include "statuspanel.h" -#include "konversationapplication.h" -#include "ircinput.h" -#include "ircview.h" -#include "ircviewbox.h" -#include "server.h" StatusPanel::StatusPanel(QWidget* parent) : ChatWindow(parent) { @@ -64,14 +63,13 @@ connect(getTextView(),SIGNAL (gotFocus()),statusInput,SLOT (setFocus()) ); - connect(getTextView(), SIGNAL(updateTabNotification(Konversation::TabNotifyType)), - this, SLOT(activateTabNotification(Konversation::TabNotifyType))); connect(getTextView(),SIGNAL (sendFile()),this,SLOT (sendFileMenu()) ); connect(getTextView(),SIGNAL (autoText(const QString&)),this,SLOT (sendStatusText(const QString&)) ); connect(statusInput,SIGNAL (submit()),this,SLOT(statusTextEntered()) ); connect(statusInput,SIGNAL (textPasted(const QString&)),this,SLOT(textPasted(const QString&)) ); connect(getTextView(), SIGNAL(textPasted(bool)), statusInput, SLOT(paste(bool))); + connect(getTextView(), SIGNAL(popupCommand(int)), this, SLOT(popupCommand(int))); connect(nicknameCombobox,SIGNAL (activated(int)),this,SLOT(nicknameComboboxChanged())); Q_ASSERT(nicknameCombobox->lineEdit()); //it should be editedable. if we design it so it isn't, remove these lines. @@ -85,6 +83,11 @@ { } +void StatusPanel::serverSaysClose() +{ + closeYourself(false); +} + void StatusPanel::setNickname(const QString& newNickname) { nicknameCombobox->setCurrentText(newNickname); @@ -102,7 +105,7 @@ // replace aliases and wildcards if(m_server->getOutputFilter()->replaceAliases(outputAll)) { - outputAll = m_server->parseWildcards(outputAll, m_server->getNickname(), QString::null, QString::null, QString::null, QString::null); + outputAll = m_server->parseWildcards(outputAll, m_server->getNickname(), QString(), QString(), QString(), QString()); } // Send all strings, one after another @@ -112,7 +115,7 @@ QString output(outList[index]); // encoding stuff is done in Server() - Konversation::OutputFilterResult result = m_server->getOutputFilter()->parse(m_server->getNickname(), output, QString::null); + Konversation::OutputFilterResult result = m_server->getOutputFilter()->parse(m_server->getNickname(), output, QString()); if(!result.output.isEmpty()) { @@ -125,7 +128,7 @@ void StatusPanel::statusTextEntered() { QString line=statusInput->text(); - statusInput->clear(); + statusInput->setText(""); if(line.lower()==Preferences::commandChar()+"clear") textView->clear(); else @@ -179,7 +182,7 @@ else { getTextView()->setViewBackground(Preferences::color(Preferences::TextViewBackground), - QString::null); + QString()); } if (Preferences::customTextFont()) @@ -208,12 +211,9 @@ void StatusPanel::updateName() { - if (getServer()->serverGroupSettings()) - { - QString newName = getServer()->serverGroupSettings()->name(); - setName(newName); - setLogfileName(newName.lower()); - } + QString newName = getServer()->getDisplayName(); + setName(newName); + setLogfileName(newName.lower()); } void StatusPanel::sendFileMenu() @@ -256,39 +256,40 @@ void StatusPanel::setNotificationsEnabled(bool enable) { - m_server->serverGroupSettings()->setNotificationsEnabled(enable); + if (m_server->getServerGroup()) m_server->getServerGroup()->setNotificationsEnabled(enable); + m_notificationsEnabled = enable; } -bool StatusPanel::closeYourself() +bool StatusPanel::closeYourself(bool confirm) { int result; //FIXME: Show "Do you really want to close ..." warnings in // disconnected state instead of closing directly. Can't do // that due to string freeze at the moment. - if (!m_server->isConnected()) + if (confirm && !m_server->isConnected()) { - result = KMessageBox::Continue; + result = KMessageBox::warningContinueCancel(this, i18n("Do you really want to close '%1'?\n\n All associated tabs will be closed as well.").arg(getName()), + i18n("Close Tab"), i18n("Close"), "QuitServerTab"); } else { result = KMessageBox::warningContinueCancel( this, - i18n("Do you want to disconnect from '%1'?").arg(m_server->getServerName()), + i18n("Do you want to disconnect from '%1'?\n\n All associated tabs will be closed as well.").arg(m_server->getServerName()), i18n("Disconnect From Server"), i18n("Disconnect"), "QuitServerTab"); } - if(result==KMessageBox::Continue) + if (result==KMessageBox::Continue) { - m_server->serverGroupSettings()->setNotificationsEnabled(notificationsEnabled()); + if (m_server->getServerGroup()) m_server->getServerGroup()->setNotificationsEnabled(notificationsEnabled()); m_server->quitServer(); - //Why are these separate? why would deleting the server not quit it? FIXME - delete m_server; - m_server=0; - deleteLater(); //NO NO! Deleting the server should delete this! FIXME + // This will delete the status view as well. + m_server->deleteLater(); + m_server = 0; return true; } return false; @@ -314,25 +315,33 @@ void StatusPanel::emitUpdateInfo() { - QString info = m_server->getServerGroup(); - - emit updateInfo(info); + emit updateInfo(getServer()->getDisplayName()); } -void StatusPanel::appendInputText(const QString& text) +void StatusPanel::appendInputText(const QString& text, bool fromCursor) { - statusInput->setText(statusInput->text() + text); + if(!fromCursor) + { + statusInput->append(text); + } + else + { + int para = 0, index = 0; + statusInput->getCursorPosition(¶, &index); + statusInput->insertAt(text, para, index); + statusInput->setCursorPosition(para, index + text.length()); + } } // virtual void StatusPanel::setChannelEncoding(const QString& encoding) { - Preferences::setChannelEncoding(m_server->getServerGroup(), ":server", encoding); + Preferences::setChannelEncoding(m_server->getDisplayName(), ":server", encoding); } QString StatusPanel::getChannelEncoding() // virtual { - return Preferences::channelEncoding(m_server->getServerGroup(), ":server"); + return Preferences::channelEncoding(m_server->getDisplayName(), ":server"); } // virtual @@ -361,16 +370,29 @@ } } -void StatusPanel::setIdentity(const Identity *newIdentity) +void StatusPanel::setIdentity(const IdentityPtr identity) { - if(!newIdentity) + if (identity) { - return; + nicknameCombobox->clear(); + nicknameCombobox->insertStringList(identity->getNicknameList()); } +} - ChatWindow::setIdentity(newIdentity); - nicknameCombobox->clear(); - nicknameCombobox->insertStringList(newIdentity->getNicknameList()); +void StatusPanel::popupCommand(int command) +{ + switch(command) + { + case Konversation::Join: + m_server->queue("JOIN " + getTextView()->currentChannel()); + break; + case Konversation::Topic: + m_server->requestTopic(getTextView()->currentChannel()); + break; + case Konversation::Names: + m_server->queue("NAMES " + getTextView()->currentChannel(), Server::LowPriority); + break; + } } #include "statuspanel.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/statuspanel.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/statuspanel.h --- konversation-1.0.1/konversation/src/statuspanel.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/statuspanel.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,10 +6,8 @@ */ /* - The panel where the server status messages go - begin: Sam Jan 18 2003 - copyright: (C) 2003 by Dario Abatianni - email: eisfuchs@tigress.com + Copyright (C) 2003 Dario Abatianni + Copyright (C) 2006-2008 Eike Hein */ #ifndef STATUSPANEL_H @@ -19,9 +17,6 @@ #include -/* - @author Dario Abatianni -*/ class QPushButton; class QCheckBox; @@ -42,7 +37,7 @@ virtual void setName(const QString& newName); virtual QString getTextInLine(); - virtual bool closeYourself(); + virtual bool closeYourself(bool askForConfirmation=true); virtual bool canBeFrontView(); virtual bool searchView(); @@ -51,7 +46,7 @@ virtual QString getChannelEncodingDefaultDesc(); virtual void emitUpdateInfo(); - virtual void setIdentity(const Identity *newIdentity); + void setIdentity(const IdentityPtr identity); virtual bool isInsertSupported() { return true; } @@ -65,8 +60,9 @@ virtual void indicateAway(bool show); void showNicknameBox(bool show); void updateAppearance(); - virtual void appendInputText(const QString&); + virtual void appendInputText(const QString&, bool fromCursor); void updateName(); + void serverSaysClose(); protected slots: void sendFileMenu(); @@ -79,6 +75,8 @@ //Used to disable functions when not connected virtual void serverOnline(bool online); + void popupCommand(int command); + protected: /** Called from ChatWindow adjustFocus */ diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/tabnotifications_preferences.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/tabnotifications_preferences.ui --- konversation-1.0.1/konversation/src/tabnotifications_preferences.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/tabnotifications_preferences.ui 2008-08-06 16:56:27.000000000 +0100 @@ -9,17 +9,17 @@ 0 0 278 - 364 + 418 - + unnamed 0 - + groupBox4 @@ -51,7 +51,7 @@ - + groupBox5 @@ -62,31 +62,23 @@ unnamed - + - kcfg_TabNotificationsHighlights + kcfg_TabNotificationsSystem - Highlight + Application event true - - - - kcfg_TabNotificationsNick - - - Current nick used - - - true + + Application events occur in Konsole tabs, the DCC Status tab and other application tabs not used directly for chatting. - + - spacer44 + spacer45_2 Horizontal @@ -97,35 +89,32 @@ 50 - 20 + 21 - + - kcfg_TabNotificationsNickColor + kcfg_TabNotificationsSystemColor - + - kcfg_TabNotificationsEvents + kcfg_TabNotificationsMsgs - Channel event + Message - false - - - Channel events are mode changes or users joining/leaving a channel. + true - + - spacer43 + spacer42 Horizontal @@ -136,35 +125,28 @@ 50 - 20 + 21 - + - kcfg_TabNotificationsEventsColor - - - false + kcfg_TabNotificationsMsgsColor - - - - kcfg_TabNotificationsMsgs - - - Message - - - true + + + 0 + 0 + 0 + - + - spacer42 + spacer42_2 Horizontal @@ -174,14 +156,25 @@ - 50 + 60 21 - + - kcfg_TabNotificationsMsgsColor + kcfg_TabNotificationsPrivate + + + Private message + + + true + + + + + kcfg_TabNotificationsPrivateColor @@ -194,9 +187,20 @@ - + - spacer45 + kcfg_TabNotificationsNick + + + Current nick used + + + true + + + + + spacer44 Horizontal @@ -207,21 +211,13 @@ 50 - 21 + 20 - + - kcfg_TabNotificationsHighlightsColor - - - - - - - - spacer45_2 + spacer45 Horizontal @@ -236,31 +232,78 @@ - + - kcfg_TabNotificationsSystemColor + kcfg_TabNotificationsNickColor - + - kcfg_TabNotificationsSystem + kcfg_TabNotificationsHighlightsColor - Application event + + + + + + kcfg_TabNotificationsEvents + + + Channel event - true + false - Application events occur in Konsole tabs, the DCC Status tab and other application tabs not used directly for chatting. + Channel events are mode changes or users joining/leaving a channel. + + + + + kcfg_TabNotificationsHighlights + + + Highlight + + + true + + + + + spacer43 + + + Horizontal + + + Expanding + + + + 50 + 20 + + + + + + kcfg_TabNotificationsEventsColor + + + false + + + - + groupBox10 @@ -284,7 +327,7 @@ - + spacer47 @@ -297,11 +340,11 @@ 21 - 20 + 60 - + @@ -335,6 +378,23 @@ setEnabled(bool) + + kcfg_TabNotificationsText + kcfg_TabNotificationsLeds + kcfg_TabNotificationsMsgs + kcfg_TabNotificationsMsgsColor + kcfg_TabNotificationsPrivate + kcfg_TabNotificationsPrivateColor + kcfg_TabNotificationsNick + kcfg_TabNotificationsNickColor + kcfg_TabNotificationsHighlights + kcfg_TabNotificationsHighlightsColor + kcfg_TabNotificationsEvents + kcfg_TabNotificationsEventsColor + kcfg_TabNotificationsSystem + kcfg_TabNotificationsSystemColor + kcfg_TabNotificationsOverride + kcolorbutton.h @@ -342,5 +402,6 @@ kcolorbutton.h kcolorbutton.h kcolorbutton.h + kcolorbutton.h diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/tabs_preferences.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/tabs_preferences.cpp --- konversation-1.0.1/konversation/src/tabs_preferences.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/tabs_preferences.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,15 +6,15 @@ */ /* - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2006 Eike Hein */ +#include "tabs_preferences.h" +#include "tabs_preferencesui.h" + #include #include -#include "tabs_preferences.h" -#include "tabs_preferencesui.h" Tabs_Config::Tabs_Config(QWidget *parent, const char *name) : Tabs_PreferencesUI(parent, name) diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/tabs_preferences.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/tabs_preferences.h --- konversation-1.0.1/konversation/src/tabs_preferences.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/tabs_preferences.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,8 +6,7 @@ */ /* - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2006 Eike Hein */ #ifndef TABS_PREFERENCES_H @@ -15,12 +14,13 @@ #include "tabs_preferencesui.h" + class Tabs_Config : public Tabs_PreferencesUI { Q_OBJECT public: - Tabs_Config(QWidget *parent = 0, const char *name = 0); + explicit Tabs_Config(QWidget *parent = 0, const char *name = 0); ~Tabs_Config(); public slots: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/tabs_preferencesui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/tabs_preferencesui.ui --- konversation-1.0.1/konversation/src/tabs_preferencesui.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/tabs_preferencesui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -147,6 +147,27 @@ + + + mouseGBox + + + Mouse + + + + unnamed + + + + kcfg_MiddleClickClose + + + &Middle-click on a tab to close it + + + + spacer1 diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/theme_preferences.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/theme_preferences.cpp --- konversation-1.0.1/konversation/src/theme_preferences.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/theme_preferences.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -9,8 +9,15 @@ Copyright (C) 2005 Ismail Donmez Copyright (C) 2006 Dario Abatianni Copyright (C) 2006 John Tapsell + Copyright (C) 2007 Eike Hein */ +#include "theme_preferences.h" +#include "preferences_base.h" +#include "images.h" +#include "common.h" +#include "konversationapplication.h" + #include #include #include @@ -37,11 +44,6 @@ #include // unlink() -#include "theme_preferences.h" -#include "preferences_base.h" -#include "images.h" -#include "common.h" -#include "konversationapplication.h" using namespace Konversation; @@ -76,6 +78,8 @@ // if we have any themes if(m_dirs.count() > 0) { + m_dirs.sort(); + // clear listview iconThemeIndex->clear(); // initialize index counter @@ -148,7 +152,6 @@ Preferences::setIconTheme(m_currentTheme); // update theme on runtime KonversationApplication::instance()->images()->initializeNickIcons(); - KonversationApplication::instance()->updateNickIcons(); // remember current theme for hasChanged() m_oldTheme = m_currentTheme; @@ -164,7 +167,7 @@ void Theme_Config::installTheme() { - KURL themeURL = KFileDialog::getOpenURL(QString::null, + KURL themeURL = KFileDialog::getOpenURL(QString(), i18n("*.tar.gz *.tar.bz2 *.tar *.zip|Konversation Themes"), NULL, i18n("Select Theme Package") @@ -251,11 +254,16 @@ if(remove == KMessageBox::Continue) { unlink(QFile::encodeName(dir)); - KIO::del(KURL(dir.remove("index.desktop"))); - loadSettings(); + KIO::DeleteJob* job = KIO::del(KURL(dir.remove("index.desktop"))); + connect(job, SIGNAL(result(KIO::Job*)), this, SLOT(postRemoveTheme(KIO::Job*))); } } +void Theme_Config::postRemoveTheme(KIO::Job* /* delete_job */) +{ + loadSettings(); +} + void Theme_Config::updatePreview(int id) { QString dir; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/theme_preferences.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/theme_preferences.h --- konversation-1.0.1/konversation/src/theme_preferences.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/theme_preferences.h 2008-08-06 16:56:27.000000000 +0100 @@ -9,6 +9,7 @@ Copyright (C) 2005 Ismail Donmez Copyright (C) 2006 Dario Abatianni Copyright (C) 2006 John Tapsell + Copyright (C) 2007 Eike Hein */ #ifndef PREFSPAGETHEMES_H @@ -17,6 +18,9 @@ #include "theme_preferencesui.h" #include "konvisettingspage.h" +#include + + class QStringList; class Theme_Config : public Theme_ConfigUI, public KonviSettingsPage @@ -41,6 +45,7 @@ void updateButtons(); void installTheme(); void removeTheme(); + void postRemoveTheme(KIO::Job* delete_job); private: QStringList m_dirs; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/theme_preferencesui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/theme_preferencesui.ui --- konversation-1.0.1/konversation/src/theme_preferencesui.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/theme_preferencesui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -149,7 +149,7 @@ AlignCenter - Icon for users with half-operator priviliges + Icon for users with half-operator privileges @@ -163,7 +163,7 @@ AlignCenter - Icon for users with operator priviliges + Icon for users with operator privileges diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/topiccombobox.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/topiccombobox.cpp --- konversation-1.0.1/konversation/src/topiccombobox.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/topiccombobox.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -11,10 +11,9 @@ email: eisfuchs@tigress.com */ -#include - #include "topiccombobox.h" + TopicComboBox::TopicComboBox(QWidget* parent) : KComboBox(parent,"topic_combo_box") { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/topiccombobox.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/topiccombobox.h --- konversation-1.0.1/konversation/src/topiccombobox.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/topiccombobox.h 2008-08-06 16:56:27.000000000 +0100 @@ -16,9 +16,6 @@ #include -/* - @author Dario Abatianni -*/ class TopicComboBox : public KComboBox { diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/topiclabel.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/topiclabel.cpp --- konversation-1.0.1/konversation/src/topiclabel.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/topiclabel.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -7,10 +7,15 @@ /* Copyright (C) 2004 Peter Simonsson - Copyright (C) 2006 Eike Hein + Copyright (C) 2006-2008 Eike Hein */ #include "topiclabel.h" +#include "konversationapplication.h" +#include "connectionmanager.h" +#include "server.h" +#include "common.h" +#include "channel.h" #include #include @@ -26,14 +31,9 @@ #include #include #include - -#include "konversationapplication.h" -#include "server.h" -#include "common.h" -#include "channel.h" - #include + namespace Konversation { @@ -82,8 +82,11 @@ if (e->button()==QMouseEvent::LeftButton) { pressPosition=e->pos(); + urlToDrag = anchorAt(pressPosition); + // HACK Replace % with \x03 in the url to keep Qt from doing stupid things + urlToDrag = urlToDrag.replace ('\x03', "%"); // Hack to counter the fact that we're given an decoded url - urlToDrag = KURL::fromPathOrURL(anchorAt(pressPosition)).url(); + urlToDrag = KURL::fromPathOrURL(urlToDrag).url(); if (!urlToDrag.isNull()) { mousePressed=true; @@ -110,6 +113,7 @@ mousePressed=false; removeSelection(); KURL ux = KURL::fromPathOrURL(urlToDrag); + //FIXME consistent IRC URL serialization if (urlToDrag.startsWith("##")) ux=QString("irc://%1:%2/%3").arg(m_server->getServerName()). arg(m_server->getPort()).arg(urlToDrag.mid(2)); KURLDrag* u=new KURLDrag(ux,viewport()); @@ -128,7 +132,12 @@ { if (!link.isEmpty()) { - if (link.startsWith("#") && m_server && m_server->isConnected()) + if (link.startsWith("irc://")) + { + KonversationApplication* konvApp = static_cast(kapp); + konvApp->getConnectionManager()->connectTo(Konversation::SilentlyReuseConnection, link); + } + else if (link.startsWith("#") && m_server && m_server->isConnected()) { QString channel(link); channel.replace("##","#"); @@ -201,7 +210,7 @@ case Bookmark: { KBookmarkManager* bm = KBookmarkManager::userBookmarksManager(); - KBookmarkGroup bg = bm->addBookmarkDialog(m_urlToCopy, QString::null); + KBookmarkGroup bg = bm->addBookmarkDialog(m_urlToCopy, QString()); bm->save(); bm->emitChanged(bg); break; @@ -232,6 +241,15 @@ void TopicLabel::updateSqueezedText() { + QToolTip::remove(this); + + if (m_fullText.isEmpty()) + { + KActiveLabel::setText(QString::null); + + return; + } + QFontMetrics fm(currentFont()); QString text = m_fullText; // text.replace("&", "&"). Not needed as we do it in tagURLs @@ -239,8 +257,6 @@ replace(">", "\x0bgt;"); text = tagURLs(text, "", false); - QToolTip::remove(this); - if(height() < (fm.lineSpacing() * 2)) { text = rPixelSqueeze(text, visibleWidth() - 10); @@ -337,10 +353,10 @@ m_popup->removeItem(Bookmark); m_copyUrlMenu = false; } - else if(!link.isEmpty() && !m_copyUrlMenu) + else if (!link.isEmpty() && !m_copyUrlMenu) { - m_popup->insertItem(i18n("Copy URL to Clipboard"),CopyUrl,1); - m_popup->insertItem(i18n("Add to Bookmarks"),Bookmark,2); + m_popup->insertItem(SmallIcon("editcopy"), i18n("Copy URL to Clipboard"), CopyUrl, 0); + m_popup->insertItem(SmallIcon("bookmark"), i18n("Add to Bookmarks"), Bookmark, 1); m_copyUrlMenu = true; m_urlToCopy = link; } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/topiclabel.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/topiclabel.h --- konversation-1.0.1/konversation/src/topiclabel.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/topiclabel.h 2008-08-06 16:56:27.000000000 +0100 @@ -7,7 +7,7 @@ /* Copyright (C) 2004 Peter Simonsson - Copyright (C) 2006 Eike Hein + Copyright (C) 2006-2008 Eike Hein */ #ifndef KONVERSATIONTOPICLABEL_H @@ -16,6 +16,7 @@ #include #include + class QFontMetrics; class Server; class KPopupMenu; @@ -28,7 +29,7 @@ Q_OBJECT public: - TopicLabel(QWidget *parent = 0, const char *name = 0); + explicit TopicLabel(QWidget *parent = 0, const char *name = 0); ~TopicLabel(); QSize minimumSizeHint() const; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/trayicon.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/trayicon.cpp --- konversation-1.0.1/konversation/src/trayicon.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/trayicon.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -14,6 +14,10 @@ #include "trayicon.h" #include "konversationapplication.h" +#include "channel.h" +#include "server.h" +#include "chatwindow.h" +#include "config/preferences.h" #include #include @@ -22,9 +26,6 @@ #include #include -#include "channel.h" -#include "server.h" -#include "chatwindow.h" namespace Konversation { @@ -32,12 +33,11 @@ TrayIcon::TrayIcon(QWidget* parent) : KSystemTray(parent) { m_notificationEnabled = false; - m_nomessagePix = loadIcon("konversation"); - m_messagePix = loadIcon("konv_message"); - setPixmap(m_nomessagePix); m_blinkTimer = new QTimer(this); connect(m_blinkTimer, SIGNAL(timeout()), SLOT(blinkTimeout())); + updateAppearance(); + QToolTip::add(this,i18n("Konversation - IRC Client")); } @@ -52,21 +52,26 @@ return; } - if(!m_blinkTimer->isActive()) + if(Preferences::trayNotifyBlink()) + { + if(!m_blinkTimer->isActive()) + { + setPixmap(m_messagePix); + m_blinkOn = true; + m_blinkTimer->start(500); + } + } + else { setPixmap(m_messagePix); - m_blinkOn = true; - m_blinkTimer->start(500); + m_blinkTimer->stop(); } } void TrayIcon::endNotification() { - if(m_blinkTimer->isActive()) - { - m_blinkTimer->stop(); - setPixmap(m_nomessagePix); - } + m_blinkTimer->stop(); + setPixmap(m_nomessagePix); } void TrayIcon::blinkTimeout() @@ -82,6 +87,13 @@ setPixmap(m_nomessagePix); } } + + void TrayIcon::updateAppearance() + { + m_nomessagePix = loadIcon("konversation"); + m_messagePix = loadIcon("konv_message"); + setPixmap(m_nomessagePix); + } } #include "trayicon.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/trayicon.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/trayicon.h --- konversation-1.0.1/konversation/src/trayicon.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/trayicon.h 2008-08-06 16:56:27.000000000 +0100 @@ -20,6 +20,7 @@ #include + class QTimer; class Server; @@ -29,8 +30,9 @@ class TrayIcon : public KSystemTray { Q_OBJECT - public: - TrayIcon(QWidget* parent = 0); + + public: + explicit TrayIcon(QWidget* parent = 0); ~TrayIcon(); bool notificationEnabled() { return m_notificationEnabled; } @@ -39,6 +41,7 @@ void startNotification(); void endNotification(); void setNotificationEnabled(bool notify) { m_notificationEnabled = notify; } + void updateAppearance(); protected slots: void blinkTimeout(); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/unicode.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/unicode.cpp --- konversation-1.0.1/konversation/src/unicode.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/unicode.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -36,6 +36,7 @@ #define UTF8_6Bytes(c) ( k6BytesLeadByte == ((c) & kLeft7BitsMask)) #define UTF8_ValidTrialByte(c) ( kTrialByte == ((c) & kLeft2BitsMask)) + bool isUtf8(const QCString& text) { int i; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/urlcatcher.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/urlcatcher.cpp --- konversation-1.0.1/konversation/src/urlcatcher.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/urlcatcher.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -12,11 +12,18 @@ email: eisfuchs@tigress.com */ +#include "urlcatcher.h" +#include "channel.h" +#include "server.h" +#include "konversationapplication.h" +#include "viewcontainer.h" + #include #include #include #include #include +#include #include #include @@ -28,15 +35,12 @@ #include #include #include +#include -#include "urlcatcher.h" -#include "channel.h" -#include "server.h" -#include "konversationapplication.h" -#include "viewcontainer.h" UrlCatcher::UrlCatcher(QWidget* parent) : ChatWindow(parent) { + layout()->setAutoAdd(false); setName(i18n("URL Catcher")); setType(ChatWindow::UrlCatcher); @@ -50,6 +54,9 @@ "during this session."); QWhatsThis::add(urlListView, urlListViewWT); + searchWidget = new KListViewSearchLineWidget(urlListView, this, "search_line"); + searchWidget->setEnabled(false); + QHBox* buttonBox=new QHBox(this); buttonBox->setSpacing(spacing()); @@ -89,6 +96,10 @@ saveListButton->setEnabled(false); clearListButton->setEnabled(false); + layout()->add(searchWidget); + layout()->add(urlListView); + layout()->add(buttonBox); + urlSelected(); } @@ -119,6 +130,7 @@ new KListViewItem(urlListView,who,url); clearListButton->setEnabled(true); saveListButton->setEnabled(true); + searchWidget->setEnabled(true); } void UrlCatcher::openUrl(QListViewItem* item) @@ -175,6 +187,7 @@ { saveListButton->setEnabled(false); clearListButton->setEnabled(false); + searchWidget->setEnabled(false); } } } @@ -192,8 +205,8 @@ { // Ask user for file name QString fileName=KFileDialog::getSaveFileName( - QString::null, - QString::null, + QString(), + QString(), this, i18n("Save URL List")); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/urlcatcher.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/urlcatcher.h --- konversation-1.0.1/konversation/src/urlcatcher.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/urlcatcher.h 2008-08-06 16:56:27.000000000 +0100 @@ -17,14 +17,12 @@ #include "chatwindow.h" -/* - @author Dario Abatianni -*/ class KListView; class QListViewItem; class QPushButton; class ViewContainer; +class KListViewSearchLineWidget; class UrlCatcher : public ChatWindow { @@ -55,6 +53,7 @@ protected: KListView* urlListView; + KListViewSearchLineWidget* searchWidget; /** Called from ChatWindow adjustFocus */ virtual void childAdjustFocus(); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/valuelistviewitem.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/valuelistviewitem.cpp --- konversation-1.0.1/konversation/src/valuelistviewitem.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/valuelistviewitem.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -15,6 +15,7 @@ #include "valuelistviewitem.h" + ValueListViewItem::ValueListViewItem(int newValue, KListView* parent, const QString& label) : KListViewItem(parent,label) { @@ -33,7 +34,7 @@ { } -const int ValueListViewItem::getValue() const +int ValueListViewItem::getValue() const { return m_value; } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/valuelistviewitem.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/valuelistviewitem.h --- konversation-1.0.1/konversation/src/valuelistviewitem.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/valuelistviewitem.h 2008-08-06 16:56:27.000000000 +0100 @@ -17,9 +17,6 @@ #include -/* - @author Dario Abatianni -*/ class ValueListViewItem : public KListViewItem { @@ -28,7 +25,7 @@ ValueListViewItem(int newValue, KListView* parent, QListViewItem* after, const QString& label); ~ValueListViewItem(); - const int getValue() const; + int getValue() const; protected: int m_value; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/version.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/version.h --- konversation-1.0.1/konversation/src/version.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/version.h 2008-08-06 16:56:27.000000000 +0100 @@ -1,3 +1,3 @@ #ifndef KONVI_VERSION -#define KONVI_VERSION "1.0.1" +#define KONVI_VERSION "1.1" #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/viewcontainer.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/viewcontainer.cpp --- konversation-1.0.1/konversation/src/viewcontainer.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/viewcontainer.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,35 +6,22 @@ */ /* - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2006-2008 Eike Hein */ -#include -#include - -#include -#include -#include -#include -#include -#include -#include - #include "viewcontainer.h" +#include "queuetuner.h" #include "viewtree.h" -#include "konversationmainwindow.h" #include "konversationapplication.h" #include "notificationhandler.h" -#include "chatwindow.h" #include "images.h" #include "irccharsets.h" #include "ircview.h" -#include "statuspanel.h" #include "logfilereader.h" #include "konsolepanel.h" #include "urlcatcher.h" -#include "dccpanel.h" +#include "dcctransferpanel.h" +#include "dcctransfermanager.h" #include "dccchat.h" #include "statuspanel.h" #include "channel.h" @@ -45,8 +32,22 @@ #include "insertchardialog.h" #include "irccolorchooser.h" #include "joinchanneldialog.h" +#include "servergroupsettings.h" + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + -ViewContainer::ViewContainer(KonversationMainWindow* window) +ViewContainer::ViewContainer(KonversationMainWindow* window): + m_vbox(0), m_queueTuner(0) { m_window = window; @@ -55,18 +56,9 @@ m_tabWidget = 0; m_viewTree = 0; - m_frontServer = 0; - m_contextServer = 0; - m_frontView = 0; - m_previousFrontView = 0; - m_searchView = 0; - m_urlCatcherPanel = 0; m_nicksOnlinePanel = 0; - m_dccPanel = 0; - m_dccPanelOpen = false; - m_insertCharDialog = 0; m_queryViewCount = 0; @@ -82,11 +74,47 @@ setupTabWidget(); initializeSplitterSizes(); + + m_dccPanel = new DccTransferPanel(m_tabWidget); + m_dccPanel->hide(); + m_dccPanelOpen = false; + connect(m_dccPanel, SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&))); } ViewContainer::~ViewContainer() { +} + +void ViewContainer::showQueueTuner(bool p) +{ + if (p) + m_queueTuner->open(); + else + m_queueTuner->close(); +} + +///Use this instead of setting m_frontServer directly so we can emit the frontServerChanging signal easily. +void ViewContainer::setFrontServer(Server* newserver) +{ + if (m_frontServer == QGuardedPtr(newserver)) + return; + emit frontServerChanging(newserver); + m_frontServer = newserver; +} + +void ViewContainer::prepareShutdown() +{ + if (!m_tabWidget) return; + deleteDccPanel(); + closeNicksOnlinePanel(); + + for (int i = 0; i < m_tabWidget->count(); ++i) + m_tabWidget->page(i)->blockSignals(true); + + m_tabWidget->blockSignals(true); + + m_tabWidget = 0; } void ViewContainer::initializeSplitterSizes() @@ -116,11 +144,16 @@ { m_popupViewIndex = -1; - m_tabWidget = new KTabWidget(m_viewTreeSplitter, "main_window_tab_widget"); + m_vbox = new QVBox(m_viewTreeSplitter, "main_window_right_side"); + m_tabWidget = new KTabWidget(m_vbox, "main_window_tab_widget"); + m_queueTuner = new QueueTuner(m_vbox, this); + m_queueTuner->hide(); + m_tabWidget->setTabReorderingEnabled(true); m_tabWidget->setTabCloseActivatePrevious(true); - m_tabWidget->hide(); + m_vbox->hide(); //m_tabWidget->hide(); + KPushButton* closeBtn = new KPushButton(m_tabWidget); closeBtn->setPixmap(KGlobal::iconLoader()->loadIcon("tab_remove", KIcon::Small)); closeBtn->resize(22, 22); @@ -131,6 +164,7 @@ connect(m_tabWidget, SIGNAL(currentChanged(QWidget*)), this, SLOT (switchView(QWidget*))); connect(m_tabWidget, SIGNAL(closeRequest(QWidget*)), this, SLOT(closeView(QWidget*))); connect(m_tabWidget, SIGNAL(contextMenu(QWidget*, const QPoint&)), this, SLOT(showViewContextMenu(QWidget*, const QPoint&))); + connect(m_tabWidget, SIGNAL(mouseMiddleClick(QWidget*)), this, SLOT(closeViewMiddleClick(QWidget*))); updateTabWidgetAppearance(); } @@ -279,7 +313,7 @@ { QPtrList viewList = m_viewTree->getSortedViewList(); - if (!viewList.isEmpty()) + if (m_tabWidget && !viewList.isEmpty()) { QPtrListIterator it(viewList); ChatWindow* view; @@ -300,13 +334,6 @@ } updateViewActions(m_tabWidget->currentPageIndex()); - updateSwitchViewAction(); -} - -void ViewContainer::silenceViews() -{ - for (int i = 0; i < m_tabWidget->count(); ++i) - m_tabWidget->page(i)->blockSignals(true); } void ViewContainer::updateAppearance() @@ -328,10 +355,24 @@ KToggleAction* action = static_cast(actionCollection()->action("hide_nicknamelist")); action->setChecked(!Preferences::showNickList()); + + if(m_insertCharDialog) + { + QFont font; + + if (Preferences::customTextFont()) + font = Preferences::textFont(); + else + font = KGlobalSettings::generalFont(); + + m_insertCharDialog->setFont(font); + } } void ViewContainer::updateTabWidgetAppearance() { + if (!m_tabWidget) return; + m_tabWidget->setTabBarHidden((Preferences::tabPlacement()==Preferences::Left)); if (Preferences::customTabFont()) @@ -356,11 +397,17 @@ void ViewContainer::updateViewActions(int index) { + if (!m_tabWidget) return; + KAction* action; - if (m_tabWidget->count() > 0) + ChatWindow* view = static_cast(m_tabWidget->page(index)); + + if (m_tabWidget->count() > 0 && view) { - ChatWindow* view = static_cast(m_tabWidget->page(index)); + ChatWindow::WindowType viewType = view->getType(); + Server* server = view->getServer(); + bool insertSupported = view->isInsertSupported(); if (m_viewTree) { @@ -370,7 +417,7 @@ action = actionCollection()->action("move_tab_right"); if (action) action->setEnabled(m_viewTree->canMoveViewDown(view)); } - else + else if (m_tabWidget) { action = actionCollection()->action("move_tab_left"); if (action) action->setEnabled(index > 0); @@ -379,294 +426,156 @@ if (action) action->setEnabled(index < (m_tabWidget->count() - 1)); } - action = actionCollection()->action("tab_notifications"); - if (action) action->setEnabled(true); + if (server && (viewType == ChatWindow::Status || server == m_frontServer)) + { + action = actionCollection()->action("reconnect_server"); + if (action) action->setEnabled(true); - action = actionCollection()->action("next_tab"); - if (action) action->setEnabled(true); - action = actionCollection()->action("previous_tab"); - if (action) action->setEnabled(true); + action = actionCollection()->action("disconnect_server"); + if (action) action->setEnabled(server->isConnected()); - action = actionCollection()->action("close_tab"); - if (action) action->setEnabled(true); - action = actionCollection()->action("reconnect_server"); - if (action) + action = actionCollection()->action("join_channel"); + if (action) action->setEnabled(server->isConnected()); + } + else { - Server* server = view->getServer(); + action = actionCollection()->action("reconnect_server"); + if (action) action->setEnabled(false); - if (server && !server->isConnected()) - action->setEnabled(true); - else - action->setEnabled(false); - } - action = actionCollection()->action("disconnect_server"); - if (action) - { - Server* server = view->getServer(); + action = actionCollection()->action("disconnect_server"); + if (action) action->setEnabled(false); - if (server && server->isConnected()) - action->setEnabled(true); - else - action->setEnabled(false); + + action = actionCollection()->action("join_channel"); + if (action) action->setEnabled(false); } - action = actionCollection()->action("join_channel"); - if (action) + KToggleAction* notifyAction = static_cast(actionCollection()->action("tab_notifications")); + if (notifyAction) { - Server* server = view->getServer(); - - if (!server || (server && !server->isConnected())) - action->setEnabled(false); - else - action->setEnabled(true); + notifyAction->setEnabled(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || + viewType == ChatWindow::Status || viewType == ChatWindow::Konsole || + viewType == ChatWindow::DccTransferPanel || viewType == ChatWindow::RawLog); + notifyAction->setChecked(view->notificationsEnabled()); } - } - else - { - action = actionCollection()->action("move_tab_left"); - if (action) action->setEnabled(false); - action = actionCollection()->action("move_tab_right"); - if(action) action->setEnabled(false); - - action = actionCollection()->action("tab_notifications"); - if (action) action->setEnabled(false); - - action = actionCollection()->action("next_tab"); - if (action) action->setEnabled(false); - - action = actionCollection()->action("previous_tab"); - if (action) action->setEnabled(false); - - action = actionCollection()->action("close_tab"); - if (action) action->setEnabled(false); - - action = actionCollection()->action("insert_remember_line"); - if (action) action->setEnabled(false); - - action = actionCollection()->action("insert_character"); - if (action) action->setEnabled(false); + KToggleAction* autoJoinAction = static_cast(actionCollection()->action("tab_autojoin")); + Channel* channel = static_cast(view); + if (autoJoinAction && viewType == ChatWindow::Channel && channel->getServer()->getServerGroup()) + { + autoJoinAction->setEnabled(true); + autoJoinAction->setChecked(channel->autoJoin()); + } + else if (!(viewType != ChatWindow::Channel && index != m_tabWidget->currentPageIndex())) + { + autoJoinAction->setEnabled(false); + autoJoinAction->setChecked(false); + } - action = actionCollection()->action("irc_colors"); - if (action) action->setEnabled(false); + action = actionCollection()->action("rejoin_channel"); + if (action) action->setEnabled(viewType == ChatWindow::Channel && channel->rejoinable()); - action = actionCollection()->action("clear_window"); - if (action) action->setEnabled(false); + action = actionCollection()->action("close_queries"); + if (action) action->setEnabled(m_queryViewCount > 0); action = actionCollection()->action("clear_tabs"); - if (action) action->setEnabled(false); - - action = actionCollection()->action("edit_find"); - if (action) action->setEnabled(false); - - action = actionCollection()->action("edit_find_next"); - if (action) action->setEnabled(false); - - action = actionCollection()->action("open_channel_list"); - if (action) action->setEnabled(false); - - action = actionCollection()->action("open_logfile"); - if (action) action->setEnabled(false); + if (action) action->setEnabled(true); action = actionCollection()->action("toggle_away"); - if (action) action->setEnabled(false); - - action = actionCollection()->action("join_channel"); - if (action) action->setEnabled(false); - - action = actionCollection()->action("disconnect_server"); - if (action) action->setEnabled(false); - - action = actionCollection()->action("reconnect_server"); - if (action) action->setEnabled(false); - } -} - -void ViewContainer::updateSwitchViewAction() -{ - QStringList tabList; - - for (int i = 0; i < m_tabWidget->count(); ++i) - tabList << static_cast(m_tabWidget->page(i))->getName(); - - KSelectAction* action = static_cast(actionCollection()->action("switch_to_tab")); - - if (action) - { - action->setItems(tabList); - action->setCurrentItem(m_tabWidget->currentPageIndex()); - } -} - -void ViewContainer::updateFrontView() -{ - ChatWindow* view = static_cast(m_tabWidget->currentPage()); - KAction* action; - - if (view) - { - // Make sure that only views with info output get to be the m_frontView - if (m_frontView) - { - m_previousFrontView = m_frontView; + if (action) action->setEnabled(true); - disconnect(m_frontView, SIGNAL(updateInfo(const QString &)), this, SIGNAL(setStatusBarInfoLabel(const QString &))); - } + action = actionCollection()->action("next_tab"); + if (action) action->setEnabled(true); - if (view->canBeFrontView()) - { - m_frontView = view; + action = actionCollection()->action("previous_tab"); + if (action) action->setEnabled(true); - connect(view, SIGNAL(updateInfo(const QString &)), this, SIGNAL(setStatusBarInfoLabel(const QString &))); - view->emitUpdateInfo(); - } - else - { - QString viewName = Konversation::removeIrcMarkup(view->getName()); + action = actionCollection()->action("next_active_tab"); + if (action) action->setEnabled(true); - if(viewName != "ChatWindowObject") - emit setStatusBarInfoLabel(viewName); - else - emit clearStatusBarInfoLabel(); - } + action = actionCollection()->action("close_tab"); + if (action) action->setEnabled(true); - switch (view->getType()) + if (index == m_tabWidget->currentPageIndex()) { - case ChatWindow::Channel: - case ChatWindow::Query: - case ChatWindow::Status: - case ChatWindow::ChannelList: - case ChatWindow::RawLog: - emit setStatusBarLagLabelShown(true); - break; - - default: - emit setStatusBarLagLabelShown(false); - break; - } + // The following only need to be updated when this run is related + // to the active tab, e.g. when it was just changed. - // Make sure that only text views get to be the m_searchView - if (view->searchView()) m_searchView = view; + action = actionCollection()->action("insert_marker_line"); + if (action) action->setEnabled(insertSupported); - bool insertSupported = view->isInsertSupported(); + action = actionCollection()->action("insert_character"); + if (action) action->setEnabled(insertSupported); - action = actionCollection()->action("insert_remember_line"); - if (action) action->setEnabled(insertSupported); + action = actionCollection()->action("irc_colors"); + if (action) action->setEnabled(insertSupported); - action = actionCollection()->action("insert_character"); - if (action) action->setEnabled(insertSupported); + action = actionCollection()->action("clear_lines"); + if (action) action->setEnabled(insertSupported && view->getTextView()->hasLines()); - action = actionCollection()->action("irc_colors"); - if (action) action->setEnabled(insertSupported); + action = actionCollection()->action("clear_window"); + if (action) action->setEnabled(insertSupported); - action = actionCollection()->action("clear_window"); - if (action) action->setEnabled(view->getTextView() != 0); + action = actionCollection()->action("edit_find"); + if (action) + { + action->setText(i18n("Find Text...")); + action->setEnabled(view->searchView()); + action->setToolTip(i18n("Search for text in the current tab")); + } - action = actionCollection()->action("edit_find"); - if (action) - { - action->setText(i18n("Find Text...")); - action->setEnabled(view->searchView()); - action->setToolTip(i18n("Search for text in the current tab")); - } + action = actionCollection()->action("edit_find_next"); + if (action) action->setEnabled(view->searchView()); - action = actionCollection()->action("edit_find_next"); - if(action) action->setEnabled(view->searchView()); + action = actionCollection()->action("edit_find_last"); + if (action) action->setEnabled(view->searchView()); - KToggleAction* channelListAction = static_cast(actionCollection()->action("open_channel_list")); - if (channelListAction) - { - if (view->getServer()) - { - QString name = view->getServer()->getServerGroup(); - name = name.replace('&', "&&"); - channelListAction->setEnabled(true); - channelListAction->setChecked(m_frontServer->getChannelListPanel()); - channelListAction->setText(i18n("Channel &List for %1").arg(name)); - } - else + KToggleAction* channelListAction = static_cast(actionCollection()->action("open_channel_list")); + if (channelListAction) { - channelListAction->setEnabled(false); - channelListAction->setChecked(false); - channelListAction->setText(i18n("Channel &List")); + if (m_frontServer) + { + QString name = m_frontServer->getDisplayName(); + name = name.replace('&', "&&"); + channelListAction->setEnabled(true); + channelListAction->setChecked(m_frontServer->getChannelListPanel()); + channelListAction->setText(i18n("Channel &List for %1").arg(name)); + } + else + { + channelListAction->setEnabled(false); + channelListAction->setChecked(false); + channelListAction->setText(i18n("Channel &List")); + } } - } - action = actionCollection()->action("open_logfile"); - if (action) - { - action->setEnabled(!view->logFileName().isEmpty()); - if(view->logFileName().isEmpty()) - action->setText(i18n("&Open Logfile")); - else + action = actionCollection()->action("open_logfile"); + if (action) { - QString name = view->getName(); - name = name.replace('&', "&&"); - action->setText(i18n("&Open Logfile for %1").arg(name)); + action->setEnabled(!view->logFileName().isEmpty()); + if (view->logFileName().isEmpty()) + action->setText(i18n("&Open Logfile")); + else + { + QString name = view->getName(); + name = name.replace('&', "&&"); + action->setText(i18n("&Open Logfile for %1").arg(name)); + } } - } - - action = actionCollection()->action("clear_tabs"); - if (action) action->setEnabled(true); - - action = actionCollection()->action("toggle_away"); - if (action) action->setEnabled(true); - - action = actionCollection()->action("reconnect_server"); - if (action) - { - Server* server = view->getServer(); - - if (server && !server->isConnected()) - action->setEnabled(true); - else - action->setEnabled(false); - } - - action = actionCollection()->action("disconnect_server"); - if (action) - { - Server* server = view->getServer(); - if (server && server->isConnected()) - action->setEnabled(true); - else - action->setEnabled(false); - } - - action = actionCollection()->action("join_channel"); - if (action) - { - Server* server = view->getServer(); - - if (!server || (server && !server->isConnected())) - action->setEnabled(false); - else - action->setEnabled(true); - } - - if (view->getType() == ChatWindow::Channel) - { action = actionCollection()->action("hide_nicknamelist"); - if (action) action->setEnabled(true); + if (action) action->setEnabled(view->getType() == ChatWindow::Channel); action = actionCollection()->action("channel_settings"); - if (action) + if (action && view->getType() == ChatWindow::Channel) { action->setEnabled(true); action->setText(i18n("&Channel Settings for %1...").arg(view->getName())); } - } - else - { - action = actionCollection()->action("hide_nicknamelist"); - if (action) action->setEnabled(false); - - action = actionCollection()->action("channel_settings"); - if (action) + else if (action) { action->setEnabled(false); action->setText(i18n("&Channel Settings...")); @@ -675,7 +584,34 @@ } else { - action = actionCollection()->action("insert_remember_line"); + action = actionCollection()->action("move_tab_left"); + if (action) action->setEnabled(false); + + action = actionCollection()->action("move_tab_right"); + if(action) action->setEnabled(false); + + action = actionCollection()->action("next_tab"); + if (action) action->setEnabled(false); + + action = actionCollection()->action("previous_tab"); + if (action) action->setEnabled(false); + + action = actionCollection()->action("close_tab"); + if (action) action->setEnabled(false); + + action = actionCollection()->action("next_active_tab"); + if (action) action->setEnabled(false); + + action = actionCollection()->action("tab_notifications"); + if (action) action->setEnabled(false); + + action = actionCollection()->action("tab_autojoin"); + if (action) action->setEnabled(false); + + action = actionCollection()->action("rejoin_channel"); + if (action) action->setEnabled(false); + + action = actionCollection()->action("insert_marker_line"); if (action) action->setEnabled(false); action = actionCollection()->action("insert_character"); @@ -684,6 +620,9 @@ action = actionCollection()->action("irc_colors"); if (action) action->setEnabled(false); + action = actionCollection()->action("clear_lines"); + if (action) action->setEnabled(false); + action = actionCollection()->action("clear_window"); if (action) action->setEnabled(false); @@ -696,6 +635,9 @@ action = actionCollection()->action("edit_find_next"); if (action) action->setEnabled(false); + action = actionCollection()->action("edit_find_last"); + if (action) action->setEnabled(false); + action = actionCollection()->action("open_channel_list"); if (action) action->setEnabled(false); @@ -708,10 +650,10 @@ action = actionCollection()->action("join_channel"); if (action) action->setEnabled(false); - action = actionCollection()->action("reconnect_server"); + action = actionCollection()->action("disconnect_server"); if (action) action->setEnabled(false); - action = actionCollection()->action("disconnect_server"); + action = actionCollection()->action("reconnect_server"); if (action) action->setEnabled(false); action = actionCollection()->action("hide_nicknamelist"); @@ -719,37 +661,99 @@ action = actionCollection()->action("channel_settings"); if (action) action->setEnabled(false); + + action = actionCollection()->action("close_queries"); + if (action) action->setEnabled(false); + } +} + +void ViewContainer::updateFrontView() +{ + if (!m_tabWidget) return; + + ChatWindow* view = static_cast(m_tabWidget->currentPage()); + + if (!view) return; + + // Make sure that only views with info output get to be the m_frontView + if (m_frontView) + { + disconnect(m_frontView, SIGNAL(updateInfo(const QString &)), this, SIGNAL(setStatusBarInfoLabel(const QString &))); + } + + if (view->canBeFrontView()) + { + m_frontView = view; + + connect(view, SIGNAL(updateInfo(const QString &)), this, SIGNAL(setStatusBarInfoLabel(const QString &))); + view->emitUpdateInfo(); + } + else + { + QString viewName = Konversation::removeIrcMarkup(view->getName()); + + if(viewName != "ChatWindowObject") + emit setStatusBarInfoLabel(viewName); + else + emit clearStatusBarInfoLabel(); + } + + switch (view->getType()) + { + case ChatWindow::Channel: + case ChatWindow::Query: + case ChatWindow::Status: + case ChatWindow::ChannelList: + case ChatWindow::RawLog: + emit setStatusBarLagLabelShown(true); + break; + + default: + emit setStatusBarLagLabelShown(false); + break; } + + // Make sure that only text views get to be the m_searchView + if (view->searchView()) m_searchView = view; + + updateViewActions(m_tabWidget->currentPageIndex()); } -void ViewContainer::updateViews() +void ViewContainer::updateViews(const Konversation::ServerGroupSettings* serverGroup) { - QString label; + if (!m_tabWidget) return; for (int i = 0; i < m_tabWidget->count(); ++i) { ChatWindow* view = static_cast(m_tabWidget->page(i)); - if (m_viewTree) + if (serverGroup) { - if (view->getType()==ChatWindow::Status) + if (view->getType() == ChatWindow::Status && view->getServer()->getServerGroup() == serverGroup) { - if (view->getServer()->serverGroupSettings()) - label = view->getServer()->serverGroupSettings()->name(); + QString label = view->getServer()->getDisplayName(); if (!label.isEmpty() && m_tabWidget->tabLabel(view) != label) { - m_tabWidget->setTabLabel(view, label); - m_viewTree->setViewName(view, label); + if (m_tabWidget) m_tabWidget->setTabLabel(view, label); + if (m_viewTree) m_viewTree->setViewName(view, label); - if (view==m_frontView) + if (view == m_frontView) { emit setStatusBarInfoLabel(label); emit setWindowCaption(label); } + + static_cast(view)->updateName(); } } + if (i == m_tabWidget->currentPageIndex()) + updateViewActions(m_tabWidget->currentPageIndex()); + } + + if (m_viewTree) + { if (!Preferences::tabNotificationsLeds() && !Preferences::closeButtons()) m_viewTree->setViewIcon(view, QIconSet()); @@ -760,25 +764,8 @@ if (!Preferences::tabNotificationsText()) m_viewTree->setViewColor(view, m_window->colorGroup().foreground()); } - else + else if (m_tabWidget) { - if (view->getType()==ChatWindow::Status) - { - if (view->getServer()->serverGroupSettings()) - label = view->getServer()->serverGroupSettings()->name(); - - if (!label.isEmpty() && m_tabWidget->tabLabel(view) != label) - { - m_tabWidget->setTabLabel(view, label); - - if (view==m_frontView) - { - emit setStatusBarInfoLabel(label); - emit setWindowCaption(label); - } - } - } - if (!Preferences::tabNotificationsLeds() && !Preferences::closeButtons()) m_tabWidget->setTabIconSet(view, QIconSet()); @@ -795,6 +782,8 @@ unsetViewNotification(view); else if (view->currentTabNotification()==Konversation::tnfNormal && !Preferences::tabNotificationsMsgs()) unsetViewNotification(view); + else if (view->currentTabNotification()==Konversation::tnfPrivate && !Preferences::tabNotificationsPrivate()) + unsetViewNotification(view); else if (view->currentTabNotification()==Konversation::tnfSystem && !Preferences::tabNotificationsSystem()) unsetViewNotification(view); else if (view->currentTabNotification()==Konversation::tnfControl && !Preferences::tabNotificationsEvents()) @@ -813,6 +802,8 @@ void ViewContainer::updateViewIcons() { + if (!m_tabWidget) return; + for (int i = 0; i < m_tabWidget->count(); ++i) { ChatWindow* view = static_cast(m_tabWidget->page(i)); @@ -821,7 +812,7 @@ { if (m_viewTree) m_viewTree->setViewIcon(view, images->getCloseIcon()); - else + else if (m_tabWidget) m_tabWidget->setTabIconSet(view, images->getCloseIcon()); } } @@ -832,6 +823,9 @@ if (!view || view == m_tabWidget->currentPage()) return; + if (type < Konversation::tnfControl && (m_activeViewOrderList.find(view) == m_activeViewOrderList.end())) + m_activeViewOrderList.append(view); + if (!Preferences::tabNotificationsLeds() && !Preferences::tabNotificationsText()) return; @@ -849,6 +843,16 @@ } break; + case Konversation::tnfPrivate: + if (Preferences::tabNotificationsPrivate()) + { + if (Preferences::tabNotificationsLeds()) + m_viewTree->setViewIcon(view, images->getPrivateLed(true)); + if (Preferences::tabNotificationsText()) + m_viewTree->setViewColor(view, Preferences::tabNotificationsPrivateColor()); + } + break; + case Konversation::tnfSystem: if (Preferences::tabNotificationsSystem()) { @@ -921,7 +925,7 @@ break; } } - else + else if (m_tabWidget) { switch (type) { @@ -935,6 +939,16 @@ } break; + case Konversation::tnfPrivate: + if (Preferences::tabNotificationsPrivate()) + { + if (Preferences::tabNotificationsLeds()) + m_tabWidget->setTabIconSet(view, images->getPrivateLed(true)); + if (Preferences::tabNotificationsText()) + m_tabWidget->setTabColor(view, Preferences::tabNotificationsPrivateColor()); + } + break; + case Konversation::tnfSystem: if (Preferences::tabNotificationsSystem()) { @@ -1018,11 +1032,14 @@ switch (view->getType()) { case ChatWindow::Channel: - case ChatWindow::Query: case ChatWindow::DccChat: m_viewTree->setViewIcon(view, images->getMsgsLed(false)); break; + case ChatWindow::Query: + m_viewTree->setViewIcon(view, images->getPrivateLed(false)); + break; + case ChatWindow::Status: m_viewTree->setViewIcon(view, images->getServerLed(false)); break; @@ -1035,20 +1052,37 @@ QColor textColor = (Preferences::inputFieldsBackgroundColor() ? Preferences::color(Preferences::ChannelMessage) : m_window->colorGroup().foreground()); + + if (view->getType() == ChatWindow::Channel) + { + Channel *channel = static_cast(view); + + if (!channel->joined()) + textColor = KonversationApplication::instance()->palette(m_viewTree).disabled().text(); + } + else if (view->getType() == ChatWindow::Query) + { + if (!view->getServer()->isConnected()) + textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text(); + } + m_viewTree->setViewColor(view, textColor); } - else + else if (m_tabWidget) { if (Preferences::tabNotificationsLeds()) { switch (view->getType()) { case ChatWindow::Channel: - case ChatWindow::Query: case ChatWindow::DccChat: m_tabWidget->setTabIconSet(view, images->getMsgsLed(false)); break; + case ChatWindow::Query: + m_tabWidget->setTabIconSet(view, images->getPrivateLed(false)); + break; + case ChatWindow::Status: m_tabWidget->setTabIconSet(view, images->getServerLed(false)); break; @@ -1059,8 +1093,28 @@ } } - m_tabWidget->setTabColor(view, m_window->colorGroup().foreground()); + QColor textColor = m_window->colorGroup().foreground(); + + if (view->getType() == ChatWindow::Channel) + { + Channel *channel = static_cast(view); + + if (!channel->joined()) + textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text(); + } + else if (view->getType() == ChatWindow::Query) + { + if (!view->getServer()->isConnected()) + textColor = KonversationApplication::instance()->palette(m_tabWidget).disabled().text(); + } + + m_tabWidget->setTabColor(view, textColor); } + + QValueList::iterator it = m_activeViewOrderList.find(view); + + if (it != m_activeViewOrderList.end()) + m_activeViewOrderList.remove(it); } void ViewContainer::toggleViewNotifications() @@ -1093,6 +1147,25 @@ m_popupViewIndex = -1; } +void ViewContainer::toggleAutoJoin() +{ + Channel* channel = 0; + + if (m_popupViewIndex == -1) + channel = static_cast(m_tabWidget->currentPage()); + else + channel = static_cast(m_tabWidget->page(m_popupViewIndex)); + + if (channel && channel->getType() == ChatWindow::Channel) + { + bool autoJoin = channel->autoJoin(); + + channel->setAutoJoin(!autoJoin); + + emit autoJoinToggled(channel->getServer()->getServerGroup()); + } +} + void ViewContainer::addView(ChatWindow* view, const QString& label, bool weinitiated) { ChatWindow *tmp_ChatWindow; @@ -1104,6 +1177,7 @@ connect(view, SIGNAL(setStatusBarTempText(const QString&)), this, SIGNAL(setStatusBarTempText(const QString&))); connect(view, SIGNAL(clearStatusBarTempText()), this, SIGNAL(clearStatusBarTempText())); connect(view, SIGNAL(closing(ChatWindow*)), this, SIGNAL(removeView(ChatWindow*))); + connect(view, SIGNAL(closing(ChatWindow*)), this, SLOT(cleanupAfterClose(ChatWindow*))); // Please be careful about changing any of the grouping behavior in here, // because it needs to match up with the sorting behavior of the tree list, @@ -1163,7 +1237,7 @@ case ChatWindow::Query: if (Preferences::tabNotificationsLeds()) - iconSet = images->getMsgsLed(false); + iconSet = images->getPrivateLed(false); else if (Preferences::closeButtons()) iconSet = images->getCloseIcon(); @@ -1262,7 +1336,7 @@ } m_tabWidget->insertTab(view, iconSet, label, placement); - m_tabWidget->show(); + m_vbox->show();//m_tabWidget->show(); if (m_viewTree) { @@ -1294,7 +1368,6 @@ if (doBringToFront) showView(view); updateViewActions(m_tabWidget->currentPageIndex()); - updateSwitchViewAction(); } void ViewContainer::switchView(QWidget* newView) @@ -1306,18 +1379,17 @@ if (m_frontView) { m_frontView->resetTabNotification(); - m_previousFrontView = m_frontView; disconnect(m_frontView, SIGNAL(updateInfo(const QString &)), this, SIGNAL(setStatusBarInfoLabel(const QString &))); - if (Preferences::autoInsertRememberLineAfterMinimizing() && m_previousFrontView->isInsertSupported()) - m_previousFrontView->insertRememberLine(); + if (Preferences::automaticRememberLine() && m_frontView->isInsertSupported()) + m_frontView->getTextView()->insertRememberLine(); } m_frontView = 0; m_searchView = 0; - m_frontServer = view->getServer(); + setFrontServer(view->getServer()); // display this server's lag time if (m_frontServer) @@ -1334,40 +1406,25 @@ view->resetTabNotification(); - if (!m_viewTree || !m_viewTree->hasFocus()) - view->adjustFocus(); - - updateViewActions(m_tabWidget->currentPageIndex()); - updateSwitchViewAction(); + if (!m_viewTree || !m_viewTree->hasFocus()) view->adjustFocus(); - if (view) - { - KToggleAction* notifyAction = static_cast(actionCollection()->action("tab_notifications")); - if (notifyAction) - { - ChatWindow::WindowType viewType = view->getType(); - notifyAction->setEnabled(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || - viewType == ChatWindow::Status || viewType == ChatWindow::Konsole || - viewType == ChatWindow::DccPanel || viewType == ChatWindow::RawLog); - notifyAction->setChecked(view->notificationsEnabled()); - } + if (view->isInsertSupported()) view->getTextView()->cancelRememberLine(); - updateViewEncoding(view); - } + updateViewEncoding(view); QString tabName = Konversation::removeIrcMarkup(view->getName()); if (tabName != "ChatWindowObject") emit setWindowCaption(tabName); else - emit setWindowCaption(QString::null); + emit setWindowCaption(QString()); } void ViewContainer::showView(ChatWindow* view) { // Don't bring Tab to front if TabWidget is hidden. Otherwise QT gets confused // and shows the Tab as active but will display the wrong pane - if (m_tabWidget->isVisible()) + if (m_tabWidget && m_tabWidget->isVisible()) m_tabWidget->showPage(view); } @@ -1418,14 +1475,13 @@ m_viewTree->moveViewUp(view); syncTabBarToTree(); } - else + else if (m_tabWidget) { m_tabWidget->moveTab(index, index - 1); updateViewActions(index - 1); } } - updateSwitchViewAction(); m_popupViewIndex = -1; } @@ -1446,14 +1502,13 @@ m_viewTree->moveViewDown(view); syncTabBarToTree(); } - else + else if (m_tabWidget) { m_tabWidget->moveTab(index, index + 1); updateViewActions(index + 1); } } - updateSwitchViewAction(); m_popupViewIndex = -1; } @@ -1468,50 +1523,66 @@ { if (view) { - ChatWindow::WindowType viewType=view->getType(); - - // the views should know by themselves how to close + ChatWindow::WindowType viewType = view->getType(); - bool confirmClose = true; - if (viewType==ChatWindow::Status) confirmClose = view->closeYourself(); - else if (viewType==ChatWindow::Channel) confirmClose = view->closeYourself(); - else if (viewType==ChatWindow::ChannelList) confirmClose = view->closeYourself(); - else if (viewType==ChatWindow::Query) confirmClose = view->closeYourself(); - else if (viewType==ChatWindow::RawLog) confirmClose = view->closeYourself(); - else if (viewType==ChatWindow::DccChat) confirmClose = view->closeYourself(); - - else if (viewType==ChatWindow::DccPanel) closeDccPanel(); - else if (viewType==ChatWindow::Konsole) closeKonsolePanel(view); - else if (viewType==ChatWindow::UrlCatcher) closeUrlCatcher(); - else if (viewType==ChatWindow::NicksOnline) closeNicksOnlinePanel(); - - else if (viewType == ChatWindow::LogFileReader) view->closeYourself(); - - // We haven't done anything yet, so safe to return - if (!confirmClose) return; - - // if this view was the front view, delete the pointer - if (view==m_previousFrontView) m_previousFrontView=0; - if (view==m_frontView) m_frontView=m_previousFrontView; + bool closeConfirmed = true; - m_tabWidget->removePage(view); + switch (viewType) + { + case ChatWindow::DccTransferPanel: + closeDccPanel(); + break; + case ChatWindow::UrlCatcher: + closeUrlCatcher(); + break; + case ChatWindow::NicksOnline: + closeNicksOnlinePanel(); + break; + default: + closeConfirmed = view->closeYourself(); + break; + } + } +} - if (viewType==ChatWindow::Query) - --m_queryViewCount; +void ViewContainer::cleanupAfterClose(ChatWindow* view) +{ + if (view == m_frontView) m_frontView = 0; - if (m_queryViewCount == 0) - actionCollection()->action("close_queries")->setEnabled(false); + if (m_tabWidget) + { + m_tabWidget->removePage(view); + emit removeView(view); if (m_tabWidget->count() <= 0) { m_saveSplitterSizesLock = true; - m_tabWidget->hide(); + m_vbox->hide(); emit resetStatusBar(); + emit setWindowCaption(QString::null); } } - updateViewActions(m_tabWidget->currentPageIndex()); - updateSwitchViewAction(); + // Remove the view from the active view list if it's still on it + QValueList::iterator it = m_activeViewOrderList.find(view); + + if (it != m_activeViewOrderList.end()) + m_activeViewOrderList.remove(it); + + if (view->getType() == ChatWindow::Query) + --m_queryViewCount; + + if (m_queryViewCount == 0 && actionCollection()) + { + KAction* action = actionCollection()->action("close_queries"); + if (action) action->setEnabled(false); + } +} + +void ViewContainer::closeViewMiddleClick(QWidget* view) +{ + if (Preferences::middleClickClose()) + closeView(view); } void ViewContainer::closeCurrentView() @@ -1536,7 +1607,7 @@ if (chatWin) { if (index == 0) - chatWin->setChannelEncoding(QString::null); + chatWin->setChannelEncoding(QString()); else chatWin->setChannelEncoding(Konversation::IRCCharsets::self()->availableEncodingShortNames()[index - 1]); } @@ -1590,24 +1661,28 @@ if (!menu) return; ChatWindow* view = static_cast(tab); + KToggleAction* autoJoinAction = static_cast(actionCollection()->action("tab_autojoin")); + KAction* rejoinAction = actionCollection()->action("rejoin_channel"); if (view) { - KToggleAction* notifyAction = static_cast(actionCollection()->action("tab_notifications")); + ChatWindow::WindowType viewType = view->getType(); - if (notifyAction) + updateViewEncoding(view); + + if (viewType == ChatWindow::Channel) { - ChatWindow::WindowType viewType = view->getType(); - notifyAction->setEnabled(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || - viewType == ChatWindow::Status || viewType == ChatWindow::Konsole || - viewType == ChatWindow::DccPanel || viewType == ChatWindow::RawLog || - viewType == ChatWindow::DccChat); - notifyAction->setChecked(view->notificationsEnabled()); - } + autoJoinAction->plug(menu, 1); - updateViewEncoding(view); + Channel *channel = static_cast(view); + if (channel->rejoinable() && rejoinAction) + { + rejoinAction->plug(menu, 0); + rejoinAction->setEnabled(true); + } + } - if (view->getType() == ChatWindow::Status) + if (viewType == ChatWindow::Status) { QPtrList serverActions; KAction* action = actionCollection()->action("disconnect_server"); @@ -1616,16 +1691,13 @@ if (action) serverActions.append(action); action = actionCollection()->action("join_channel"); if (action) serverActions.append(action); - menu->setItemVisible(menu->idAt(menu->count()-1), true); + action = new KActionSeparator(); + if (action) serverActions.append(action); m_window->plugActionList("server_actions", serverActions); m_contextServer = view->getServer(); } else - { - if (menu->text(menu->idAt(menu->count()-1)).isEmpty()) - menu->setItemVisible(menu->idAt(menu->count()-1), false); m_contextServer = 0; - } } if (menu->exec(pos) == -1) @@ -1633,24 +1705,12 @@ m_popupViewIndex = -1; view = static_cast(m_tabWidget->currentPage()); - if (view) - { - KToggleAction* notifyAction = static_cast(actionCollection()->action("tab_notifications")); - - if (notifyAction) - { - ChatWindow::WindowType viewType = view->getType(); - notifyAction->setEnabled(viewType == ChatWindow::Channel || viewType == ChatWindow::Query || - viewType == ChatWindow::Status || viewType == ChatWindow::Konsole || - viewType == ChatWindow::DccPanel || ChatWindow::RawLog || - viewType == ChatWindow::DccChat); - notifyAction->setChecked(view->notificationsEnabled()); - } - - updateViewEncoding(view); - } + if (view) updateViewEncoding(view); } + autoJoinAction->unplug(menu); + rejoinAction->unplug(menu); + m_window->unplugActionList("server_actions"); emit contextMenuClosed(); @@ -1662,22 +1722,10 @@ { if (m_frontServer) { - if(m_frontView && m_frontView->getType() == ChatWindow::Channel) - { + if (m_frontView && m_frontView->getType() == ChatWindow::Channel) return m_frontView->getName(); - } else - { - QString serverGroup = m_frontServer->getServerGroup(); - if (!serverGroup.isEmpty()) - { - return serverGroup; - } - else - { - return m_frontServer->getServerName(); - } - } + return m_frontServer->getDisplayName(); } else { @@ -1700,7 +1748,7 @@ channel = m_frontView->getName(); if (passNetwork) - server = m_frontServer->getServerGroup(); + server = m_frontServer->getDisplayName(); else { server = m_frontServer->getServerName(); @@ -1716,6 +1764,11 @@ return url; } +int ViewContainer::getViewIndex(QWidget* widget) +{ + return m_tabWidget->indexOf(widget); +} + void ViewContainer::clearView() { if (m_frontView) m_frontView->getTextView()->clear(); @@ -1737,7 +1790,7 @@ void ViewContainer::findText() { - if (m_searchView==0) + if (!m_searchView) { KMessageBox::sorry(m_window, i18n("You can only search in text fields."), @@ -1754,18 +1807,31 @@ if (m_searchView) m_searchView->getTextView()->searchAgain(); } +void ViewContainer::findPrevText() +{ + if (m_searchView) m_searchView->getTextView()->searchNext(true); +} + void ViewContainer::appendToFrontmost(const QString& type,const QString& message,ChatWindow* serverView, bool parseURL) { - if (!serverView) serverView = m_frontView->getServer()->getStatusView(); + if (!m_tabWidget) return; - //if this fails, we need to fix frontServer - Q_ASSERT(m_frontView && m_frontView->getServer() == m_frontServer); + if (!serverView) // e.g. DCOP info call + { + if (m_frontView) // m_frontView == NULL if canBeFrontView() == false for active ChatWindow + serverView = m_frontView->getServer()->getStatusView(); + else if (m_frontServer) // m_fronView == NULL && m_frontServer != NULL if ChannelListPanel is active. + serverView = m_frontServer->getStatusView(); + } - Q_ASSERT(serverView); if(!serverView) return; + // This might happen if canBeFrontView() is false for active ChatWindow + // and the view does not belong to any server (e.g. DCC Status View). + // Discard message in this case. + if (!serverView) return; updateFrontView(); - if(!m_frontView || // Check if the m_frontView can actually display text or ... + if (!m_frontView || // Check if the m_frontView can actually display text or ... // if it does not belong to this server or... serverView->getServer()!=m_frontView->getServer() || // if the user decided to force it. @@ -1784,21 +1850,20 @@ void ViewContainer::insertCharacter() { - if (!m_insertCharDialog) - { - ChatWindow* view = static_cast(m_tabWidget->currentPage()); - - QFont font; + QFont font; - if (view && view->getTextView()) - font = view->getTextView()->font(); - else if (view) - font = static_cast(view)->font(); + if (Preferences::customTextFont()) + font = Preferences::textFont(); + else + font = KGlobalSettings::generalFont(); + if (!m_insertCharDialog) + { m_insertCharDialog = new Konversation::InsertCharDialog(font.family(), m_window); connect(m_insertCharDialog, SIGNAL(insertChar(const QChar&)), this, SLOT(insertChar(const QChar&))); } + m_insertCharDialog->setFont(font); m_insertCharDialog->show(); } @@ -1806,45 +1871,82 @@ { ChatWindow* view = static_cast(m_tabWidget->currentPage()); - if (view) view->appendInputText(chr); + if (view) view->appendInputText(chr, true/*fromCursor*/); } void ViewContainer::insertIRCColor() { IRCColorChooser dlg(m_window); - if (dlg.exec() == QDialog::Accepted) m_frontView->appendInputText(dlg.color()); + if (dlg.exec() == KDialog::Accepted) m_frontView->appendInputText(dlg.color(), true/*fromCursor*/); } -void ViewContainer::insertRememberLine() +void ViewContainer::clearViewLines() { - if (Preferences::showRememberLineInAllWindows()) + if (m_frontView && m_frontView->isInsertSupported()) { - int total = m_tabWidget->count()-1; - ChatWindow* nextPage; + m_frontView->getTextView()->clearLines(); - for(int i = 0; i <= total; ++i) - { - nextPage = static_cast(m_tabWidget->page(i)); - if (nextPage->isInsertSupported()) - nextPage->insertRememberLine(); - } + KAction* action = actionCollection()->action("clear_lines"); + if (action) action->setEnabled(false); } - else +} + +void ViewContainer::insertRememberLine() +{ + if (Preferences::automaticRememberLine()) { - if (m_frontView->isInsertSupported()) - m_frontView->insertRememberLine(); + if (m_frontView && m_frontView->isInsertSupported()) + m_frontView->getTextView()->insertRememberLine(); } } -void ViewContainer::insertRememberLine(Server* server) +void ViewContainer::insertRememberLines(Server* server) { for (int i = 0; i < m_tabWidget->count(); ++i) { ChatWindow* view = static_cast(m_tabWidget->page(i)); - if (view->getServer()==server && view->isInsertSupported()) - view->insertRememberLine(); + if (view->getServer() == server && view->isInsertSupported()) + view->getTextView()->insertRememberLine(); + } +} + +void ViewContainer::cancelRememberLine() +{ + if (m_frontView && m_frontView->isInsertSupported()) + { + m_frontView->getTextView()->cancelRememberLine(); + + KAction* action = actionCollection()->action("clear_lines"); + if (action) action->setEnabled(m_frontView->getTextView()->hasLines()); + } +} + +void ViewContainer::insertMarkerLine() +{ + if (Preferences::markerLineInAllViews()) + { + int total = m_tabWidget->count()-1; + ChatWindow* view; + + for (int i = 0; i <= total; ++i) + { + view = static_cast(m_tabWidget->page(i)); + + if (view->isInsertSupported()) view->getTextView()->insertMarkerLine(); + } + } + else + { + if (m_frontView && m_frontView->isInsertSupported()) + m_frontView->getTextView()->insertMarkerLine(); + } + + if (m_frontView && m_frontView->isInsertSupported()) + { + KAction* action = actionCollection()->action("clear_lines"); + if (action) action->setEnabled(m_frontView->getTextView()->hasLines()); } } @@ -1881,13 +1983,6 @@ connect(panel, SIGNAL(closeView(ChatWindow*)), this, SLOT(closeView(ChatWindow*))); } -void ViewContainer::closeKonsolePanel(ChatWindow* konsolePanel) -{ - m_tabWidget->removePage(konsolePanel); - // tell QT to delete the panel during the next event loop since we are inside a signal here - konsolePanel->deleteLater(); -} - void ViewContainer::addUrlCatcher() { // if the panel wasn't open yet @@ -1936,26 +2031,12 @@ void ViewContainer::addDccPanel() { - // if the panel wasn't open yet - if (m_dccPanel==0) + if (!m_dccPanelOpen) { - m_dccPanel=new DccPanel(m_tabWidget); addView(m_dccPanel, i18n("DCC Status")); - connect(m_dccPanel, SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&))); - m_dccPanelOpen = true; + m_dccPanelOpen=true; (dynamic_cast(actionCollection()->action("open_dccstatus_window")))->setChecked(true); } - // show already opened panel - else - { - if (!m_dccPanelOpen) - { - addView(m_dccPanel, i18n("DCC Status")); - m_dccPanelOpen=true; - (dynamic_cast(actionCollection()->action("open_dccstatus_window")))->setChecked(true); - } - // FIXME newText(dccPanel,QString::null,true); - } } void ViewContainer::closeDccPanel() @@ -1965,7 +2046,7 @@ { // hide it from view, does not delete it emit removeView(m_dccPanel); - m_tabWidget->removePage(m_dccPanel); + if (m_tabWidget) m_tabWidget->removePage(m_dccPanel); m_dccPanelOpen=false; (dynamic_cast(actionCollection()->action("open_dccstatus_window")))->setChecked(false); } @@ -1981,12 +2062,12 @@ } } -DccPanel* ViewContainer::getDccPanel() +DccTransferPanel* ViewContainer::getDccPanel() { return m_dccPanel; } -void ViewContainer::addDccChat(const QString& myNick,const QString& nick,const QString& numericalIp,const QStringList& arguments,bool listen) +void ViewContainer::addDccChat(const QString& myNick,const QString& nick,const QStringList& arguments,bool listen) { if (!listen) // Someone else initiated dcc chat { @@ -1996,72 +2077,62 @@ if (m_frontServer) { - DccChat* dccChatPanel=new DccChat(m_tabWidget, myNick,nick,arguments,listen); - addView(dccChatPanel, dccChatPanel->getName()); + DccChat* dccChatPanel=listen + ? new DccChat(m_tabWidget, listen, m_frontServer, myNick, nick ) + : new DccChat(m_tabWidget, listen, m_frontServer, myNick, nick, arguments[1], arguments[2].toInt() ); + connect(dccChatPanel, SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&))); - if(listen) - m_frontServer->queue(QString("PRIVMSG %1 :\001DCC CHAT chat %2 %3\001") - .arg(nick).arg(numericalIp).arg(dccChatPanel->getPort())); + + // This needs to be here as addView will change m_frontServer if focus new tabs is enabled. + addView(dccChatPanel, dccChatPanel->getName()); } } StatusPanel* ViewContainer::addStatusView(Server* server) { - StatusPanel* statusView=new StatusPanel(m_tabWidget); + StatusPanel* statusView = new StatusPanel(m_tabWidget); - // first set up internal data ... statusView->setServer(server); statusView->setIdentity(server->getIdentity()); - statusView->setNotificationsEnabled(server->serverGroupSettings()->enableNotifications()); + + if (server->getServerGroup()) statusView->setNotificationsEnabled(server->getServerGroup()->enableNotifications()); // Get group name for tab if available - QString label = server->getServerGroup(); - if (label.isEmpty()) label = server->getServerName(); + QString label = server->getDisplayName(); statusView->setName(label); QObject::connect(server, SIGNAL(sslInitFailure()), this, SIGNAL(removeStatusBarSSLLabel())); QObject::connect(server, SIGNAL(sslConnected(Server*)), this, SIGNAL(updateStatusBarSSLLabel(Server*))); // ... then put it into the tab widget, otherwise we'd have a race with server member - addView(statusView,label); + addView(statusView, label); - connect(m_window, SIGNAL(prefsChanged()), statusView, SLOT(updateName())); - connect(statusView, SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&))); + connect(statusView, SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), + this, SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&))); connect(statusView, SIGNAL(sendFile()), server, SLOT(requestDccSend())); connect(server, SIGNAL(awayState(bool)), statusView, SLOT(indicateAway(bool)) ); // make sure that m_frontServer gets set on adding the first status panel, too, // since there won't be a switchView happening - if (!m_frontServer) m_frontServer = server; + if (!m_frontServer) setFrontServer(server); return statusView; } RawLog* ViewContainer::addRawLog(Server* server) { - RawLog* rawLog=new RawLog(m_tabWidget); + RawLog* rawLog = new RawLog(m_tabWidget); rawLog->setServer(server); rawLog->setLog(false); - rawLog->setNotificationsEnabled(server->serverGroupSettings()->enableNotifications()); - addView(rawLog, i18n("Raw Log")); - connect(rawLog, SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&))); + if (server->getServerGroup()) rawLog->setNotificationsEnabled(server->getServerGroup()->enableNotifications()); - return rawLog; -} - -void ViewContainer::serverQuit(Server* server) -{ - if (server == m_frontServer) - m_frontServer = 0; - - if (m_frontView && m_frontView->getServer() == server) - m_frontView = 0; + addView(rawLog, i18n("Raw Log")); - delete server->getStatusView(); - delete server; + connect(rawLog, SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), + this, SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&))); - updateFrontView(); + return rawLog; } void ViewContainer::reconnectFrontServer() @@ -2073,8 +2144,7 @@ else server = m_frontServer; - if (server && !server->isConnected() && !server->isConnecting()) - server->reconnect(); + if (server) server->reconnect(); } void ViewContainer::disconnectFrontServer() @@ -2108,7 +2178,7 @@ server->sendJoinCommand(dlg.channel(), dlg.password()); } -void ViewContainer::serverStateChanged(Server* server, Server::State state) +void ViewContainer::connectionStateChanged(Server* server, Konversation::ConnectionState state) { Server* updateServer = 0; @@ -2121,47 +2191,63 @@ { KAction* action = actionCollection()->action("disconnect_server"); if (action) - { - if (state == Server::SSConnected) - action->setEnabled(true); - else - action->setEnabled(false); - } - - action = actionCollection()->action("reconnect_server"); - if (action) - { - if (state != Server::SSDisconnected) - action->setEnabled(false); - else - action->setEnabled(true); - } + action->setEnabled(state == Konversation::SSConnected); action = actionCollection()->action("join_channel"); if (action) + action->setEnabled(state == Konversation::SSConnected); + + if (m_frontView && m_frontView->getServer() == server + && m_frontView->getType() == ChatWindow::Channel) { - if (state != Server::SSConnected) - action->setEnabled(false); - else - action->setEnabled(true); + ChatWindow* view = m_frontView; + Channel* channel = static_cast(view); + + action = actionCollection()->action("rejoin_channel"); + if (action) action->setEnabled(state == Konversation::SSConnected && channel->rejoinable()); } } } +void ViewContainer::channelJoined(Channel* channel) +{ + ChatWindow* view = m_frontView; + + if (view == channel) + { + KAction* action = actionCollection()->action("rejoin_channel"); + if (action) action->setEnabled(false); + } +} + Channel* ViewContainer::addChannel(Server* server, const QString& name) { - Channel* channel=new Channel(m_tabWidget); + Channel* channel=new Channel(m_tabWidget, name); channel->setServer(server); - channel->setName(name); + channel->setName(name); //still have to do this for now addView(channel, name); connect(this, SIGNAL(updateChannelAppearance()), channel, SLOT(updateAppearance())); connect(channel, SIGNAL(updateTabNotification(ChatWindow*,const Konversation::TabNotifyType&)), this, SLOT(setViewNotification(ChatWindow*,const Konversation::TabNotifyType&))); connect(server, SIGNAL(awayState(bool)), channel, SLOT(indicateAway(bool)) ); + connect(channel, SIGNAL(joined(Channel*)), this, SLOT(channelJoined(Channel*))); return channel; } +void ViewContainer::rejoinChannel() +{ + Channel* channel = 0; + + if (m_popupViewIndex == -1) + channel = static_cast(m_tabWidget->currentPage()); + else + channel = static_cast(m_tabWidget->page(m_popupViewIndex)); + + if (channel && channel->getType() == ChatWindow::Channel) + channel->rejoin(); +} + void ViewContainer::openChannelSettings() { if (m_frontView->getType() == ChatWindow::Channel) @@ -2175,28 +2261,21 @@ { KToggleAction* action = static_cast(actionCollection()->action("hide_nicknamelist")); - if (action->isChecked()) - { - Preferences::setShowNickList(false); - Preferences::writeConfig(); - action->setChecked(true); - } - else + if (action) { - Preferences::setShowNickList(true); + Preferences::setShowNickList(!action->isChecked()); Preferences::writeConfig(); - action->setChecked(false); - } - emit updateChannelAppearance(); + emit updateChannelAppearance(); + } } Query* ViewContainer::addQuery(Server* server, const NickInfoPtr& nickInfo, bool weinitiated) { QString name = nickInfo->getNickname(); - Query* query=new Query(m_tabWidget); + Query* query=new Query(m_tabWidget, name); query->setServer(server); - query->setNickInfo(nickInfo); + query->setNickInfo(nickInfo); //still have to do this addView(query, name, weinitiated); // About to increase the number of queries, so enable the close action @@ -2223,7 +2302,7 @@ if (!newName.isEmpty() && m_tabWidget->tabLabel(view) != newName) { if (m_viewTree) m_viewTree->setViewName(view, newName); - m_tabWidget->setTabLabel(view, newName); + if (m_tabWidget) m_tabWidget->setTabLabel(view, newName); } if (!newName.isEmpty() && view==m_frontView) @@ -2250,6 +2329,10 @@ } ++operations; } + + m_queryViewCount = 0; + + actionCollection()->action("close_queries")->setEnabled(false); } ChannelListPanel* ViewContainer::addChannelListPanel(Server* server) @@ -2341,4 +2424,31 @@ (dynamic_cast(actionCollection()->action("open_nicksonline_window")))->setChecked(false); } +void ViewContainer::showNextActiveView() +{ + if (!m_activeViewOrderList.isEmpty()) + { + ChatWindow* prev = m_activeViewOrderList.first(); + ChatWindow* view = prev; + + QValueList::ConstIterator it; + + for (it = m_activeViewOrderList.begin(); it != m_activeViewOrderList.end(); ++it) + { + if ((*it)->currentTabNotification() < prev->currentTabNotification()) + view = (*it); + } + + m_tabWidget->setCurrentPage(m_tabWidget->indexOf(view)); + } +} + +/*! + \fn ViewContainer::frontServerChanging(Server *newServer) + + This signal is emitted immediately before the front server is changed. + + If the server is being removed this will fire with a null pointer. +*/ + #include "viewcontainer.moc" diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/viewcontainer.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/viewcontainer.h --- konversation-1.0.1/konversation/src/viewcontainer.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/viewcontainer.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,20 +6,20 @@ */ /* - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2006-2008 Eike Hein */ #ifndef VIEWCONTAINER_H #define VIEWCONTAINER_H -#include -#include - #include "konversationmainwindow.h" #include "common.h" #include "server.h" +#include +#include + + class QSplitter; class KTabWidget; @@ -31,12 +31,14 @@ class Server; class Images; class UrlCatcher; -class DccPanel; +class DccTransferPanel; class NicksOnline; +class QueueTuner; namespace Konversation { class InsertCharDialog; + class ServerGroupSettings; } class ViewContainer : public QObject @@ -54,9 +56,7 @@ QGuardedPtr getFrontView() { return m_frontView; } Server* getFrontServer() { return m_frontServer; } - void silenceViews(); - - void serverQuit(Server* server); + void prepareShutdown(); QString currentViewTitle(); QString currentViewURL(bool passNetwork); @@ -64,17 +64,22 @@ void appendToFrontmost(const QString& type,const QString& message,ChatWindow* serverView, bool parseURL = true); + void showQueueTuner(bool); + + int getViewIndex(QWidget* widget); + public slots: void updateAppearance(); void saveSplitterSizes(); void setViewTreeShown(bool show); void syncTabBarToTree(); - void updateViews(); + void updateViews(const Konversation::ServerGroupSettings* serverGroup = 0); void updateViewIcons(); void setViewNotification(ChatWindow* widget, const Konversation::TabNotifyType& type); void unsetViewNotification(ChatWindow* view); void toggleViewNotifications(); + void toggleAutoJoin(); void switchView(QWidget* newView); void showView(ChatWindow* view); @@ -87,7 +92,9 @@ void closeView(QWidget* view); void closeView(ChatWindow* view); + void closeViewMiddleClick(QWidget* view); void closeCurrentView(); + void cleanupAfterClose(ChatWindow* view); void changeViewCharset(int index); void updateViewEncoding(ChatWindow* view); @@ -99,18 +106,22 @@ void findText(); void findNextText(); + void findPrevText(); void insertCharacter(); void insertChar(const QChar& chr); void insertIRCColor(); + + void clearViewLines(); void insertRememberLine(); - void insertRememberLine(Server* server); + void cancelRememberLine(); + void insertMarkerLine(); + void insertRememberLines(Server* server); void openLogFile(); void openLogFile(const QString& caption, const QString& file); void addKonsolePanel(); - void closeKonsolePanel(ChatWindow* konsolePanel); void addUrlCatcher(); void closeUrlCatcher(); @@ -119,18 +130,20 @@ void addDccPanel(); void closeDccPanel(); void deleteDccPanel(); - DccPanel* getDccPanel(); + DccTransferPanel* getDccPanel(); - void addDccChat(const QString& myNick,const QString& nick,const QString& numericalIp,const QStringList& arguments,bool listen); + void addDccChat(const QString& myNick,const QString& nick,const QStringList& arguments,bool listen); StatusPanel* addStatusView(Server* server); RawLog* addRawLog(Server* server); void disconnectFrontServer(); void reconnectFrontServer(); void showJoinChannelDialog(); - void serverStateChanged(Server* server, Server::State state); + void connectionStateChanged(Server* server, Konversation::ConnectionState state); + void channelJoined(Channel* channel); Channel* addChannel(Server* server, const QString& name); + void rejoinChannel(); void openChannelSettings(); void toggleChannelNicklists(); @@ -139,11 +152,13 @@ void closeQueries(); ChannelListPanel* addChannelListPanel(Server* server); - void openChannelList(const QString& filter = QString::null, bool getList = false); + void openChannelList(const QString& filter = QString(), bool getList = false); void openNicksOnlinePanel(); void closeNicksOnlinePanel(); + void showNextActiveView(); + signals: void viewChanged(ChatWindow* view); void removeView(ChatWindow* view); @@ -161,6 +176,9 @@ void setStatusBarLagLabelTooLongLag(Server* server, int msec); void updateStatusBarSSLLabel(Server* server); void removeStatusBarSSLLabel(); + void autoJoinToggled(const Konversation::ServerGroupSettings*); + + void frontServerChanging(Server *); private: void setupTabWidget(); @@ -174,6 +192,8 @@ void updateSwitchViewAction(); void updateFrontView(); + void setFrontServer(Server *); + void initializeSplitterSizes(); bool m_saveSplitterSizesLock; @@ -182,25 +202,28 @@ QSplitter* m_viewTreeSplitter; KTabWidget* m_tabWidget; ViewTree* m_viewTree; + QVBox *m_vbox; + QueueTuner *m_queueTuner; Images* images; - Server* m_frontServer; - Server* m_contextServer; + QGuardedPtr m_frontServer; + QGuardedPtr m_contextServer; QGuardedPtr m_frontView; - QGuardedPtr m_previousFrontView; - ChatWindow* m_searchView; + QGuardedPtr m_searchView; UrlCatcher* m_urlCatcherPanel; NicksOnline* m_nicksOnlinePanel; - DccPanel* m_dccPanel; + DccTransferPanel* m_dccPanel; bool m_dccPanelOpen; Konversation::InsertCharDialog* m_insertCharDialog; int m_popupViewIndex; int m_queryViewCount; + + QValueList m_activeViewOrderList; }; #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/viewtree.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/viewtree.cpp --- konversation-1.0.1/konversation/src/viewtree.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/viewtree.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,29 +6,59 @@ */ /* - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2006 Eike Hein */ +#include "viewtree.h" +#include "viewtreeitem.h" +#include "preferences.h" +#include "chatwindow.h" +#include "server.h" +#include "channel.h" +#include "ircview.h" +#include "konsolepanel.h" + #include #include #include #include #include #include +#include #include #include #include #include -#include "viewtree.h" -#include "viewtreeitem.h" -#include "preferences.h" -#include "chatwindow.h" -#include "server.h" -#include "channel.h" -#include "ircview.h" + +class ViewTree::ToolTip : public QToolTip +{ + public: + ToolTip(QWidget *parent, KListView *viewTree); + virtual ~ToolTip() {} + + protected: + virtual void maybeTip(const QPoint &pos); + + private: + KListView* viewTree; +}; + +ViewTree::ToolTip::ToolTip(QWidget *parent, KListView *viewTree) + : QToolTip(parent), viewTree(viewTree) +{ +} + +void ViewTree::ToolTip::maybeTip (const QPoint &pos) +{ + if (!parentWidget() || !viewTree) return; + + ViewTreeItem* view = static_cast(viewTree->itemAt(pos)); + + if (view && view->isTruncated()) tip(viewTree->itemRect(view), view->getName()); +} + ViewTree::ViewTree(QWidget *parent) : KListView(parent) @@ -48,6 +78,9 @@ setAcceptDrops(true); setDropVisualizer(true); + setShowToolTips(false); + m_toolTip = new ViewTree::ToolTip(viewport(), this); + // Controls whether or not to select the first view added // to the tree. Don't do so by default; only when told to // by the ViewContainer. @@ -59,6 +92,8 @@ m_closeButtonItem = 0; m_enableCloseButtonTimer = new QTimer(this); + m_middleClickItem = 0; + connect(m_enableCloseButtonTimer, SIGNAL(timeout()), SLOT(enableCloseButton())); connect(this, SIGNAL(selectionChanged(QListViewItem*)), SLOT(announceSelection(QListViewItem*))); connect(this, SIGNAL(aboutToMove()), SLOT(slotAboutToMoveView())); @@ -67,6 +102,8 @@ ViewTree::~ViewTree() { + delete m_toolTip; + m_toolTip = 0; emit setViewTreeShown(false); } @@ -90,6 +127,7 @@ fg = KGlobalSettings::textColor(); } + setPalette(KApplication::palette()); setPaletteForegroundColor(fg); setPaletteBackgroundColor(bg); } @@ -513,6 +551,7 @@ m_pressedAboveCloseButton = false; KListView::contentsMousePressEvent(e); } + m_middleClickItem = (Preferences::middleClickClose() && e->button() == MidButton) ? item : 0; } } @@ -524,12 +563,21 @@ if (!item && e->button() == RightButton) return; - if (Preferences::closeButtons() && item) + if (item) { - if (e->button() == LeftButton && isAboveIcon(vp, item) - && m_pressedAboveCloseButton && item->getCloseButtonEnabled()) + if (Preferences::closeButtons() && e->button() == LeftButton + && isAboveIcon(vp, item) && m_pressedAboveCloseButton + && item->getCloseButtonEnabled()) + { + emit closeView(item->getView()); + } + + if (Preferences::middleClickClose() && e->button() == MidButton + && item == m_middleClickItem) { emit closeView(item->getView()); + + m_middleClickItem = 0; } } else @@ -544,6 +592,9 @@ if (item && item->isSeparator()) return; + // Cancel middle-click close. + if (item != m_middleClickItem) m_middleClickItem = 0; + // Allow dragging only with the middle mouse button, just // like for the tab bar. if ((e->state() & MidButton) == MidButton) @@ -621,16 +672,24 @@ else { ViewTreeItem* item = static_cast(selectedItem()); - if (item && item->getView()->isInsertSupported()) + if (item && item->getView() && item->getView()->isInsertSupported()) { KApplication::sendEvent(item->getView()->getTextView(), e); item->getView()->adjustFocus(); } + else if (item && item->getView() && item->getView()->getType() == ChatWindow::Konsole) + { + KonsolePanel* panel = static_cast(item->getView()); + KApplication::sendEvent(panel->getWidget(), e); + item->getView()->adjustFocus(); + } } } void ViewTree::selectUpper(bool wrap) { + if (!selectedItem()) return; + ViewTreeItem* itemAbove = static_cast(selectedItem()->itemAbove()); if (itemAbove) @@ -650,6 +709,8 @@ void ViewTree::selectLower(bool wrap) { + if (!selectedItem()) return; + ViewTreeItem* itemBelow = static_cast(selectedItem()->itemBelow()); if (itemBelow) @@ -719,19 +780,20 @@ if (itemAbove->sortLast()) { after = m_separator->itemAbove(); - parent = after ? after->parent() : 0L; + after = (!after || after->depth() == 0) ? after : after->parent(); + parent = 0L; return; } else if (above->depth() == dragItem->depth()) { after = above; - parent = after->parent(); + parent = 0L; return; } else { after = above->parent(); - parent = after ? after->parent() : 0L; + parent = 0L; return; } } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/viewtree.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/viewtree.h --- konversation-1.0.1/konversation/src/viewtree.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/viewtree.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,8 +6,7 @@ */ /* - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2006 Eike Hein */ #ifndef VIEWTREE_H @@ -15,6 +14,7 @@ #include + class ViewTreeItem; class ChatWindow; @@ -75,6 +75,9 @@ void enableCloseButton(); private: + class ToolTip; + ViewTree::ToolTip* m_toolTip; + void toggleSeparator(); void selectUpper(bool wrap = false); void selectLower(bool wrap = false); @@ -101,6 +104,9 @@ bool m_pressedAboveCloseButton; ViewTreeItem* m_closeButtonItem; QTimer* m_enableCloseButtonTimer; + + // Used for middle-click close. + ViewTreeItem* m_middleClickItem; }; #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/viewtreeitem.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/viewtreeitem.cpp --- konversation-1.0.1/konversation/src/viewtreeitem.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/viewtreeitem.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -6,10 +6,16 @@ */ /* - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2006 Eike Hein */ +#include "viewtreeitem.h" +#include "konversationapplication.h" +#include "chatwindow.h" +#include "preferences.h" +#include "images.h" + + #include #include #include @@ -19,11 +25,6 @@ #include #include -#include "viewtreeitem.h" -#include "konversationapplication.h" -#include "chatwindow.h" -#include "preferences.h" -#include "images.h" int ViewTreeItem::s_availableSortIndex = 0; @@ -33,8 +34,6 @@ m_sortIndex = s_availableSortIndex; s_availableSortIndex++; - m_name = name; - setView(view); setViewType(view->getType()); @@ -46,6 +45,7 @@ m_isSeparator = false; m_isHighlighted = false; + m_isTruncated = false; images = KonversationApplication::instance()->images(); m_closeButtonShown = false; @@ -63,8 +63,6 @@ s_availableSortIndex++; } - m_name = name; - setView(view); setViewType(view->getType()); @@ -76,6 +74,7 @@ m_isSeparator = false; m_isHighlighted = false; + m_isTruncated = false; m_customColorSet = false; images = KonversationApplication::instance()->images(); @@ -84,13 +83,11 @@ } ViewTreeItem::ViewTreeItem(QListViewItem* parent, QListViewItem* afterItem, const QString& name, ChatWindow* view) - : QListViewItem(parent, afterItem) + : QListViewItem(parent, afterItem, name) { m_sortIndex = s_availableSortIndex; s_availableSortIndex++; - m_name = name; - setView(view); setViewType(view->getType()); @@ -102,6 +99,7 @@ m_isSeparator = false; m_isHighlighted = false; + m_isTruncated = false; m_customColorSet = false; images = KonversationApplication::instance()->images(); @@ -117,6 +115,7 @@ m_isSeparator = true; m_isHighlighted = false; + m_isTruncated = false; } ViewTreeItem::~ViewTreeItem() @@ -135,11 +134,17 @@ void ViewTreeItem::setName(const QString& name) { - if (name != m_name) - { - m_name = name; - repaint(); - } + setText(0, name); +} + +QString ViewTreeItem::getName() const +{ + return text(0); +} + +bool ViewTreeItem::isTruncated() const +{ + return m_isTruncated; } void ViewTreeItem::setView(ChatWindow* view) @@ -152,11 +157,6 @@ return m_view; } -QString ViewTreeItem::getName() const -{ - return m_name; -} - void ViewTreeItem::setViewType(ChatWindow::WindowType viewType) { m_viewType = viewType; @@ -374,7 +374,7 @@ pBuffer.setPen(colorRound); pBuffer.setBrush(colorRound); - // If the rectangle is smaller in width than in height, don't overlap ellipses... + // If the rectangle is higher than wide, don't overlap ellipses. if (wRound > hRound) { pBuffer.drawEllipse(0, 0, hRound * 2, hRound * 2); @@ -452,7 +452,7 @@ painter.drawPixmap(xPixmap, yPixmap, *pixmap(0)); } - // Enough space left to draw icon+text? + // Enough space left to draw icon and text? if (textWidth > 0) { int xText = MARGIN; @@ -461,14 +461,19 @@ if (pixmap(0)) xText = MARGIN + LED_ICON_SIZE + MARGIN; - QString theText = getName(); + QString text = getName(); - if (p->fontMetrics().width(theText) > textWidth) - theText = KStringHandler::rPixelSqueeze(theText, p->fontMetrics(), textWidth); + if (p->fontMetrics().width(text) > textWidth) + { + m_isTruncated = true; + text = KStringHandler::rPixelSqueeze(text, p->fontMetrics(), textWidth); + } + else + m_isTruncated = false; painter.setPen(textColor); painter.setFont(listView()->font()); - painter.drawText(xText, 0, textWidth, height(), Qt::AlignAuto | Qt::AlignVCenter, theText); + painter.drawText(xText, 0, textWidth, height(), Qt::AlignAuto | Qt::AlignVCenter, text); } } else @@ -481,6 +486,5 @@ painter.end(); - // Apply the buffer. p->drawPixmap(0, 0, buffer); } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/viewtreeitem.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/viewtreeitem.h --- konversation-1.0.1/konversation/src/viewtreeitem.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/viewtreeitem.h 2008-08-06 16:56:27.000000000 +0100 @@ -6,18 +6,20 @@ */ /* - copyright: (C) 2006 by Eike Hein - email: sho@eikehein.com + Copyright (C) 2006 Eike Hein */ #ifndef VIEWTREEITEM_H #define VIEWTREEITEM_H +#include "chatwindow.h" + #include #include +#include #include +#include -#include "chatwindow.h" class ChatWindow; class Images; @@ -38,6 +40,7 @@ void setName(const QString& name); QString getName() const; + bool isTruncated() const; void setView(ChatWindow* view); ChatWindow* getView() const; @@ -68,13 +71,13 @@ private: uint m_sortIndex; static int s_availableSortIndex; - QString m_name; QGuardedPtr m_view; ChatWindow::WindowType m_viewType; QColor m_color; bool m_isSeparator; bool m_isHighlighted; + bool m_isTruncated; bool m_customColorSet; Images* images; diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/warnings_preferences.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/warnings_preferences.cpp --- konversation-1.0.1/konversation/src/warnings_preferences.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/warnings_preferences.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -8,16 +8,21 @@ /* Copyright (C) 2006 Dario Abatianni Copyright (C) 2006 John Tapsell + Copyright (C) 2006-2008 Eike Hein */ -#include -#include -#include + #include "warnings_preferences.h" -#include -#include #include "konviconfigdialog.h" + +#include + #include +#include +#include +#include +#include + Warnings_Config::Warnings_Config( QWidget* parent, const char* name, WFlags fl ) : Warnings_ConfigUI( parent, name, fl ) @@ -64,7 +69,7 @@ // save state of this item in hasChanged() list warningsChecked+=item->isOn(); - if (item->text(2) == "LargePaste") + if (item->text(2) == "LargePaste" || item->text(2) == "Invitation") { if (item->isOn()) { @@ -96,23 +101,24 @@ void Warnings_Config::loadSettings() { QStringList dialogDefinitions; - QString flagNames = "Invitation,SaveLogfileNote,ClearLogfileQuestion,CloseQueryAfterIgnore,ReconnectDifferentServer,QuitServerTab,QuitChannelTab,QuitQueryTab,ChannelListNoServerSelected,RemoveDCCReceivedFile,HideMenuBarWarning,ChannelListWarning,LargePaste,systemtrayquitKonversation,IgnoreNick,UnignoreNick"; + QString flagNames = "Invitation,SaveLogfileNote,ClearLogfileQuestion,CloseQueryAfterIgnore,ReconnectWithDifferentServer,ReuseExistingConnection,QuitServerTab,QuitChannelTab,QuitQueryTab,ChannelListNoServerSelected,HideMenuBarWarning,ChannelListWarning,LargePaste,systemtrayquitKonversation,IgnoreNick,UnignoreNick,QuitWithActiveDccTransfers"; dialogDefinitions.append(i18n("Automatically join channel on invite")); dialogDefinitions.append(i18n("Notice that saving logfiles will save whole file")); dialogDefinitions.append(i18n("Ask before deleting logfile contents")); dialogDefinitions.append(i18n("Ask about closing queries after ignoring the nickname")); - dialogDefinitions.append(i18n("Ask before connecting to a different server in the network")); + dialogDefinitions.append(i18n("Ask before switching a connection to a network to a different server")); + dialogDefinitions.append(i18n("Ask before creating another connection to the same network or server")); dialogDefinitions.append(i18n("Close server tab")); dialogDefinitions.append(i18n("Close channel tab")); dialogDefinitions.append(i18n("Close query tab")); dialogDefinitions.append(i18n("The channel list can only be opened from server-aware tabs")); - dialogDefinitions.append(i18n("Warning on deleting file received on DCC")); dialogDefinitions.append(i18n("Warning on hiding the main window menu")); dialogDefinitions.append(i18n("Warning on high traffic with channel list")); dialogDefinitions.append(i18n("Warning on pasting large portions of text")); dialogDefinitions.append(i18n("Warning on quitting Konversation")); dialogDefinitions.append(i18n("Ignore")); dialogDefinitions.append(i18n("Unignore")); + dialogDefinitions.append(i18n("Warn before quitting with active DCC file transfers")); QCheckListItem *item; dialogListView->clear(); @@ -126,7 +132,7 @@ flagName = flagNames.section(",",i,i); item->setText(2,flagName); - if (flagName == "LargePaste") + if (flagName == "LargePaste" || flagName == "Invitation") { QString state = config->readEntry(flagName); diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/warnings_preferences.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/warnings_preferences.h --- konversation-1.0.1/konversation/src/warnings_preferences.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/warnings_preferences.h 2008-08-06 16:56:27.000000000 +0100 @@ -23,26 +23,26 @@ { Q_OBJECT -public: - Warnings_Config( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); - ~Warnings_Config(); + public: + explicit Warnings_Config( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + ~Warnings_Config(); - virtual void restorePageToDefaults(); - virtual void saveSettings(); - virtual void loadSettings(); + virtual void restorePageToDefaults(); + virtual void saveSettings(); + virtual void loadSettings(); - virtual bool hasChanged(); + virtual bool hasChanged(); -public slots: - virtual void languageChange(); + public slots: + virtual void languageChange(); -protected: - QString currentWarningsChecked(); // for hasChanged() + protected: + QString currentWarningsChecked(); // for hasChanged() - QString m_oldWarningsChecked; // for hasChanged() + QString m_oldWarningsChecked; // for hasChanged() -signals: - void modified(); + signals: + void modified(); }; #endif // WARNINGS_CONFIG_H diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/warnings_preferencesui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/warnings_preferencesui.ui --- konversation-1.0.1/konversation/src/warnings_preferencesui.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/warnings_preferencesui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -40,6 +40,9 @@ + + dialogListView + klistview.h diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/watchednicknames_preferences.cpp /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/watchednicknames_preferences.cpp --- konversation-1.0.1/konversation/src/watchednicknames_preferences.cpp 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/watchednicknames_preferences.cpp 2008-08-06 16:56:27.000000000 +0100 @@ -9,6 +9,13 @@ Copyright (C) 2006 Dario Abatianni */ +#include "watchednicknames_preferences.h" +#include "watchednicknames_preferencesui.h" +#include "config/preferences.h" +#include "konversationapplication.h" +#include "konversationmainwindow.h" +#include "valuelistviewitem.h" + #include #include #include @@ -20,13 +27,6 @@ #include #include -#include "config/preferences.h" -#include "konversationapplication.h" -#include "konversationmainwindow.h" -#include "valuelistviewitem.h" - -#include "watchednicknames_preferences.h" -#include "watchednicknames_preferencesui.h" WatchedNicknames_Config::WatchedNicknames_Config(QWidget *parent, const char *name) : WatchedNicknames_ConfigUI(parent, name) @@ -47,7 +47,8 @@ connect(networkDropdown,SIGNAL (activated(const QString&)),this,SLOT (networkChanged(const QString&)) ); connect(nicknameInput,SIGNAL (textChanged(const QString&)),this,SLOT (nicknameChanged(const QString&)) ); - connect(KonversationApplication::instance()->getMainWindow(), SIGNAL (prefsChanged()),this,SLOT (updateNetworkNames()) ); + connect(KonversationApplication::instance(), SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)), + this, SLOT(updateNetworkNames())); } WatchedNicknames_Config::~WatchedNicknames_Config() @@ -289,7 +290,9 @@ // update network and nickname inputs entrySelected(item); // unfold group branch in case it was empty before - listView->setOpen(item->parent(),true); + listView->ensureItemVisible(item); + nicknameInput->setFocus(); + nicknameInput->selectAll(); // tell the config system that something has changed emit modified(); } diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/watchednicknames_preferences.h /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/watchednicknames_preferences.h --- konversation-1.0.1/konversation/src/watchednicknames_preferences.h 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/watchednicknames_preferences.h 2008-08-06 16:56:27.000000000 +0100 @@ -16,47 +16,44 @@ #include "servergroupsettings.h" #include "watchednicknames_preferencesui.h" + class QListView; class QListViewItem; -/** - @author Dario Abatianni -*/ - class WatchedNicknames_Config : public WatchedNicknames_ConfigUI, public KonviSettingsPage { - Q_OBJECT + Q_OBJECT - public: - WatchedNicknames_Config(QWidget *parent = 0, const char *name = 0); - ~WatchedNicknames_Config(); - - virtual void saveSettings(); - virtual void loadSettings(); - virtual void restorePageToDefaults(); - - virtual bool hasChanged(); - - signals: - void modified(); - - protected slots: - void checkIfEmptyListview(bool state); - void newNotify(); - void removeNotify(); - void entrySelected(QListViewItem* notifyEntry); - void networkChanged(const QString& newNetwork); - void nicknameChanged(const QString& newNickname); - void updateNetworkNames(); // connected to KonversationApplication::prefsChanged() - - protected: - void enableEditWidgets(bool enabled); - QStringList currentNotifyList(); // for hasChanged() - void addNetworkBranch(Konversation::ServerGroupSettingsPtr group); - QListViewItem* getItemById(QListView* listView,int id); + public: + explicit WatchedNicknames_Config(QWidget *parent = 0, const char *name = 0); + ~WatchedNicknames_Config(); + + virtual void saveSettings(); + virtual void loadSettings(); + virtual void restorePageToDefaults(); + + virtual bool hasChanged(); + + signals: + void modified(); + + protected slots: + void checkIfEmptyListview(bool state); + void newNotify(); + void removeNotify(); + void entrySelected(QListViewItem* notifyEntry); + void networkChanged(const QString& newNetwork); + void nicknameChanged(const QString& newNickname); + void updateNetworkNames(); + + protected: + void enableEditWidgets(bool enabled); + QStringList currentNotifyList(); // for hasChanged() + void addNetworkBranch(Konversation::ServerGroupSettingsPtr group); + QListViewItem* getItemById(QListView* listView,int id); - bool newItemSelected; - QStringList m_oldNotifyList; + bool newItemSelected; + QStringList m_oldNotifyList; }; #endif diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/konversation/src/watchednicknames_preferencesui.ui /tmp/ZeUXpSU1gs/konversation-1.1/konversation/src/watchednicknames_preferencesui.ui --- konversation-1.0.1/konversation/src/watchednicknames_preferencesui.ui 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/konversation/src/watchednicknames_preferencesui.ui 2008-08-06 16:56:27.000000000 +0100 @@ -87,7 +87,7 @@ false - Update &interval: + &Update interval: kcfg_NotifyDelay @@ -141,7 +141,7 @@ false - &Show watched nicks online tab on application startup + Show watched nicks online tab on &application startup <qt>When checked, the <b>Nicks Online</b> window will be automatically opened when starting Konversation.</qt> @@ -152,7 +152,7 @@ kcfg_UseNotify - &Enable nickname watcher + Enable nic&kname watcher <qt> @@ -268,9 +268,7 @@ <qt> <p> When the nickname watcher is turned on, you will be notified when the nicknames appearing in the <b>Watched Networks/Nicknames</b> list come online or go offline.</p> -<p>You can also open the <b>Nicks Online</b> window to see the status of all the watched nicknames.</p> -) -</qt> +<p>You can also open the <b>Nicks Online</b> window to see the status of all the watched nicknames.</p></qt> @@ -348,6 +346,8 @@ + + kcfg_UseNotify @@ -392,6 +392,17 @@ setEnabled(bool) + + kcfg_UseNotify + kcfg_OpenWatchedNicksAtStartup + kcfg_NotifyDoubleClickAction + kcfg_NotifyDelay + notifyListView + networkDropdown + nicknameInput + newButton + removeButton + diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/Makefile.in /tmp/ZeUXpSU1gs/konversation-1.1/Makefile.in --- konversation-1.0.1/Makefile.in 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/Makefile.in 2008-08-06 16:57:56.000000000 +0100 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 483858 $ # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -51,7 +47,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = @@ -59,17 +55,21 @@ DIST_SOURCES = #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ #>- html-recursive info-recursive install-data-recursive \ -#>- install-exec-recursive install-info-recursive \ -#>- install-recursive installcheck-recursive installdirs-recursive \ -#>- pdf-recursive ps-recursive uninstall-info-recursive \ -#>- uninstall-recursive -#>+ 6 +#>- install-dvi-recursive install-exec-recursive \ +#>- install-html-recursive install-info-recursive \ +#>- install-pdf-recursive install-ps-recursive install-recursive \ +#>- installcheck-recursive installdirs-recursive pdf-recursive \ +#>- ps-recursive uninstall-recursive +#>+ 7 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive nmcheck-recursive bcheck-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -87,8 +87,6 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ ARTSCCONFIG = @ARTSCCONFIG@ @@ -128,7 +126,9 @@ FFLAGS = @FFLAGS@ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ GMSGFMT = @GMSGFMT@ +GREP = @GREP@ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -203,12 +203,14 @@ LIB_X11 = @LIB_X11@ LIB_XEXT = @LIB_XEXT@ LIB_XRENDER = @LIB_XRENDER@ +LIB_XSS = @LIB_XSS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ MCOPIDL = @MCOPIDL@ MEINPROC = @MEINPROC@ +MKDIR_P = @MKDIR_P@ MOC = @MOC@ MSGFMT = @MSGFMT@ NOOPT_CFLAGS = @NOOPT_CFLAGS@ @@ -222,6 +224,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ +PKG_CONFIG = @PKG_CONFIG@ QTDOCDIR = @QTDOCDIR@ QTE_NORTTI = @QTE_NORTTI@ QT_INCLUDES = @QT_INCLUDES@ @@ -241,24 +244,22 @@ VERSION = @VERSION@ WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ XMLLINT = @XMLLINT@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_INCLUDES = @X_INCLUDES@ X_LDFLAGS = @X_LDFLAGS@ X_PRE_LIBS = @X_PRE_LIBS@ X_RPATH = @X_RPATH@ -ac_ct_AR = @ac_ct_AR@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ all_includes = @all_includes@ all_libraries = @all_libraries@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -270,19 +271,18 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ -doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ -doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -include_ARTS_FALSE = @include_ARTS_FALSE@ -include_ARTS_TRUE = @include_ARTS_TRUE@ -include_x11_FALSE = @include_x11_FALSE@ -include_x11_TRUE = @include_x11_TRUE@ +htmldir = @htmldir@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -309,30 +309,30 @@ kde_wallpaperdir = @kde_wallpaperdir@ kde_widgetdir = @kde_widgetdir@ kdeinitdir = @kdeinitdir@ -konversation_SUBDIR_included_FALSE = @konversation_SUBDIR_included_FALSE@ -konversation_SUBDIR_included_TRUE = @konversation_SUBDIR_included_TRUE@ libdir = @libdir@ libexecdir = @libexecdir@ +localedir = @localedir@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -po_SUBDIR_included_FALSE = @po_SUBDIR_included_FALSE@ -po_SUBDIR_included_TRUE = @po_SUBDIR_included_TRUE@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ +psdir = @psdir@ qt_includes = @qt_includes@ qt_libraries = @qt_libraries@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target = @target@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ -unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ x_includes = @x_includes@ x_libraries = @x_libraries@ xdg_appsdir = @xdg_appsdir@ @@ -401,7 +401,7 @@ config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @@ -423,7 +423,6 @@ distclean-libtool: -rm -f libtool -uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -456,8 +455,7 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -501,8 +499,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -527,8 +525,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -538,13 +536,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -559,24 +556,22 @@ distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/admin - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -590,7 +585,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -598,6 +593,8 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -605,7 +602,7 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -615,6 +612,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -641,6 +642,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -680,7 +683,7 @@ $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -754,12 +757,20 @@ install-data-am: install-data-local +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -780,25 +791,27 @@ ps-am: -uninstall-am: uninstall-info-am uninstall-local +uninstall-am: uninstall-local -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-local install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am uninstall-local +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-local install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-local $(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in @cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4 @@ -885,11 +898,11 @@ uninstall-apidox: @if test "$(subdir)" != "."; then \ if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); then \ - rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \ + rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs/$(subdir); \ fi \ else \ if test -d $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; then \ - rm -rfv $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ + rm -rf $(DESTDIR)$(kde_htmldir)/en/$(PACKAGE)-apidocs; \ fi \ fi @@ -915,7 +928,7 @@ .NOEXPORT: #>+ 2 -KDE_DIST=COPYING-DOCS subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 VERSION Makefile.am.in +KDE_DIST=COPYING-DOCS subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 configure VERSION Makefile.am.in #>+ 2 docs-am: diff -Nru /tmp/yRHUpBy7R2/konversation-1.0.1/po/ar/konversation.po /tmp/ZeUXpSU1gs/konversation-1.1/po/ar/konversation.po --- konversation-1.0.1/po/ar/konversation.po 2006-10-06 17:43:29.000000000 +0100 +++ konversation-1.1/po/ar/konversation.po 2008-08-06 16:57:22.000000000 +0100 @@ -3,175 +3,242 @@ # # Youssef Chahibi , 2006. # محمد سعد Mohamed SAAD , 2006. +# Khaled Hosny msgid "" msgstr "" "Project-Id-Version: konversation\n" -"POT-Creation-Date: 2006-10-06 08:38+0200\n" -"PO-Revision-Date: 2006-10-04 20:09+0200\n" +"POT-Creation-Date: 2008-07-24 08:36+0200\n" +"PO-Revision-Date: 2006-12-31 17:24+0100\n" "Last-Translator: محمد سعد Mohamed SAAD \n" -"Language-Team: Arabic \n" +"Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: src/channeloptionsdialog.cpp:33 +#: src/channeloptionsdialog.cpp:38 #, c-format msgid "Channel Settings for %1" msgstr "إعدادات القناة ل‍ %1" -#: src/channeloptionsdialog.cpp:140 +#: src/channeloptionsdialog.cpp:148 msgid "&Hide Advanced Modes <<" msgstr "إ&خفاء الأنماط المتقدمة <<" -#: src/channeloptionsdialog.cpp:144 +#: src/channeloptionsdialog.cpp:152 msgid "&Show Advanced Modes >>" msgstr "إ&ظهار الأنماط المتقدمة >>" -#. i18n: file ./src/quickbuttons_preferencesui.ui line 174 -#: rc.cpp:25 rc.cpp:1187 src/alias_preferences.cpp:173 -#: src/autoreplace_preferences.cpp:287 src/highlight_preferences.cpp:248 +#. i18n: file ./src/quickbuttons_preferencesui.ui line 175 +#: rc.cpp:155 src/alias_preferences.cpp:173 +#: src/autoreplace_preferences.cpp:313 src/highlight_preferences.cpp:260 #: src/quickbuttons_preferences.cpp:212 -#: src/watchednicknames_preferences.cpp:285 +#: src/watchednicknames_preferences.cpp:286 #, no-c-format msgid "New" msgstr "جديد" -#: src/ircview.cpp:1183 src/ircview.cpp:1263 src/nicklistview.cpp:47 -#: src/nicksonline.cpp:869 src/nicksonline.cpp:884 src/query.cpp:77 +#: src/channel.cpp:1524 src/dcctransferpanelitem.cpp:86 +msgid "unknown" +msgstr "مجهول" + +#: src/dcctransferpanelitem.cpp:232 +msgid "Available information for file %1:" +msgstr "المعلومات المتوفرة للملف %1:" + +#: src/dcctransferpanelitem.cpp:234 src/dcctransferpanelitem.cpp:240 +#: src/dcctransferpanelitem.cpp:247 +msgid "File Information" +msgstr "معلومات الملف" + +#: src/dcctransferpanelitem.cpp:247 +msgid "No detailed information for this file found." +msgstr "لم توجد معلومات مفصلة عن هذا الملف." + +#: src/dcctransferpanelitem.cpp:265 +msgid "Send" +msgstr "ارسال" + +#: src/dcctransferpanelitem.cpp:267 src/dcctransferrecv.cpp:81 +msgid "Receive" +msgstr "استقبال" + +#: src/dcctransferpanelitem.cpp:313 +msgid "Queued" +msgstr "في الانتظار" + +#: src/dcctransferpanelitem.cpp:315 +msgid "Preparing" +msgstr "جاري الإستعداد" + +#: src/dcctransferpanelitem.cpp:317 +msgid "Awaiting" +msgstr "" + +#: src/dcctransferpanelitem.cpp:319 src/linkaddressbook/addressbook.cpp:108 +msgid "Connecting" +msgstr "جاري الاتصال" + +#: src/dcctransferpanelitem.cpp:321 +msgid "Receiving" +msgstr "استقبال" + +#: src/dcctransferpanelitem.cpp:323 +msgid "Sending" +msgstr "إرسال" + +#: src/dcctransferpanelitem.cpp:325 +msgid "Done" +msgstr "انتهى" + +#: src/dcctransferpanelitem.cpp:327 +msgid "Failed" +msgstr "فشل" + +#: src/dcctransferpanelitem.cpp:329 +msgid "Aborted" +msgstr "بطل" + +#: src/dcctransferpanelitem.cpp:387 +msgid "%1/sec" +msgstr "%1/ثانية" + +#: src/ircview.cpp:1394 src/ircview.cpp:1474 src/nicklistview.cpp:46 +#: src/nicksonline.cpp:875 src/nicksonline.cpp:890 src/query.cpp:82 msgid "&Whois" msgstr "&Whois" -#: src/ircview.cpp:1184 src/ircview.cpp:1264 src/nicklistview.cpp:48 -#: src/query.cpp:78 +#: src/ircview.cpp:1395 src/ircview.cpp:1475 src/nicklistview.cpp:47 +#: src/query.cpp:83 msgid "&Version" msgstr "&Version" -#: src/ircview.cpp:1185 src/ircview.cpp:1265 src/nicklistview.cpp:49 -#: src/query.cpp:79 +#: src/ircview.cpp:1396 src/ircview.cpp:1476 src/nicklistview.cpp:48 +#: src/query.cpp:84 msgid "&Ping" msgstr "&Ping" -#: src/ircview.cpp:1189 src/nicklistview.cpp:55 +#: src/ircview.cpp:1400 src/nicklistview.cpp:54 msgid "Give Op" -msgstr "منح الإدارة" +msgstr "منح صفة المعامل" -#: src/ircview.cpp:1190 src/nicklistview.cpp:56 +#: src/ircview.cpp:1401 src/nicklistview.cpp:55 msgid "Take Op" -msgstr "نزع الإدارة" +msgstr "سحب صفة المعامل" -#: src/nicklistview.cpp:57 +#: src/nicklistview.cpp:56 msgid "Give HalfOp" -msgstr "منح نصف الإدارة" +msgstr "منح صفة شبه المعامل" -#: src/nicklistview.cpp:58 +#: src/nicklistview.cpp:57 msgid "Take HalfOp" -msgstr "نزع نصف الإدارة" +msgstr "سحب صفة شبه المعامل" -#: src/ircview.cpp:1191 src/nicklistview.cpp:59 +#: src/ircview.cpp:1402 src/nicklistview.cpp:58 msgid "Give Voice" msgstr "منح الصوت" -#: src/ircview.cpp:1192 src/nicklistview.cpp:60 +#: src/ircview.cpp:1403 src/nicklistview.cpp:59 msgid "Take Voice" msgstr "نزع الصوت" -#: src/ircview.cpp:1193 src/nicklistview.cpp:61 +#: src/ircview.cpp:1404 src/nicklistview.cpp:60 msgid "Modes" msgstr "أنماط" -#: src/channel.cpp:1222 src/channel.cpp:1224 src/channel.cpp:1231 -#: src/channel.cpp:1237 src/channel.cpp:1253 src/channel.cpp:1255 -#: src/channel.cpp:1262 src/channel.cpp:1268 src/ircview.cpp:1195 -#: src/nicklistview.cpp:67 +#: src/channel.cpp:1378 src/channel.cpp:1380 src/channel.cpp:1387 +#: src/channel.cpp:1393 src/channel.cpp:1415 src/channel.cpp:1417 +#: src/channel.cpp:1424 src/channel.cpp:1430 src/ircview.cpp:1406 +#: src/nicklistview.cpp:66 msgid "Kick" msgstr "ركل" -#: src/ircview.cpp:1196 src/nicklistview.cpp:68 +#: src/ircview.cpp:1407 src/nicklistview.cpp:67 msgid "Kickban" msgstr "إقصاء بالركل" -#: src/ircview.cpp:1197 src/nicklistview.cpp:69 +#: src/ircview.cpp:1408 src/nicklistview.cpp:68 msgid "Ban Nickname" msgstr "إقصاء الاسم المستعار" -#: src/ircview.cpp:1199 src/nicklistview.cpp:71 +#: src/ircview.cpp:1410 src/nicklistview.cpp:70 msgid "Ban *!*@*.host" msgstr "إقصاء *!*@*.host" -#: src/ircview.cpp:1200 src/nicklistview.cpp:72 +#: src/ircview.cpp:1411 src/nicklistview.cpp:71 msgid "Ban *!*@domain" msgstr "إقصاء *!*@domain" -#: src/ircview.cpp:1201 src/nicklistview.cpp:73 +#: src/ircview.cpp:1412 src/nicklistview.cpp:72 msgid "Ban *!user@*.host" msgstr "إقصاء *!user@*.host" -#: src/ircview.cpp:1202 src/nicklistview.cpp:74 +#: src/ircview.cpp:1413 src/nicklistview.cpp:73 msgid "Ban *!user@domain" msgstr "إقصاء *!user@domain" -#: src/ircview.cpp:1204 src/nicklistview.cpp:76 +#: src/ircview.cpp:1415 src/nicklistview.cpp:75 msgid "Kickban *!*@*.host" msgstr "إقصاء*!*@*.host بالركل" -#: src/ircview.cpp:1205 src/nicklistview.cpp:77 +#: src/ircview.cpp:1416 src/nicklistview.cpp:76 msgid "Kickban *!*@domain" msgstr "إقصاء *!*@domain بالركل " -#: src/ircview.cpp:1206 src/nicklistview.cpp:78 +#: src/ircview.cpp:1417 src/nicklistview.cpp:77 msgid "Kickban *!user@*.host" msgstr "إقصاء *!user@*.host بالركل " -#: src/ircview.cpp:1207 src/nicklistview.cpp:79 +#: src/ircview.cpp:1418 src/nicklistview.cpp:78 msgid "Kickban *!user@domain" msgstr "إقصاء *!ser@domain بالركل " -#: src/ircview.cpp:1208 src/nicklistview.cpp:80 +#: src/ircview.cpp:1419 src/nicklistview.cpp:79 msgid "Kick / Ban" msgstr "ركل / إقصاء" -#: src/channel.cpp:556 src/ircview.cpp:1210 src/ircview.cpp:1268 -#: src/konvisettingsdialog.cpp:180 src/konvisettingsdialog.cpp:181 -#: src/nicklistview.cpp:83 src/outputfilter.cpp:1269 src/outputfilter.cpp:1341 -#: src/query.cpp:82 src/server.cpp:2990 src/warnings_preferences.cpp:114 +#: src/channel.cpp:623 src/ircview.cpp:1421 src/ircview.cpp:1479 +#: src/konvisettingsdialog.cpp:159 src/konvisettingsdialog.cpp:160 +#: src/nicklistview.cpp:82 src/outputfilter.cpp:1335 src/outputfilter.cpp:1407 +#: src/query.cpp:87 src/query.cpp:389 src/server.cpp:2901 +#: src/warnings_preferences.cpp:119 msgid "Ignore" msgstr "تجاهل" -#: src/channel.cpp:574 src/ircview.cpp:1211 src/ircview.cpp:1269 -#: src/nicklistview.cpp:84 src/query.cpp:83 src/query.cpp:361 -#: src/warnings_preferences.cpp:115 +#: src/channel.cpp:641 src/ircview.cpp:1422 src/ircview.cpp:1480 +#: src/nicklistview.cpp:83 src/query.cpp:88 src/query.cpp:410 +#: src/warnings_preferences.cpp:120 msgid "Unignore" msgstr "عدم التجاهل" -#: src/nicklistview.cpp:89 src/nicksonline.cpp:870 src/nicksonline.cpp:885 +#: src/nicklistview.cpp:88 src/nicksonline.cpp:876 src/nicksonline.cpp:891 msgid "Open &Query" -msgstr "فتح &نداء" +msgstr "إفتح &نداء" -#: src/nicklistview.cpp:91 +#: src/nicklistview.cpp:90 msgid "Open DCC &Chat" -msgstr "فتح محادثة ب‍ DCC" +msgstr "إفتح م&حادثة ب‍ DCC" -#: src/ircview.cpp:1220 src/ircview.cpp:1276 src/nicklistview.cpp:96 -#: src/query.cpp:90 +#: src/ircview.cpp:1431 src/ircview.cpp:1485 src/nicklistview.cpp:95 +#: src/query.cpp:93 msgid "Send &File..." -msgstr "إرسال م&لف..." +msgstr "أرسل م&لف..." -#: src/linkaddressbook/addressbook_base.cpp:503 src/nicklistview.cpp:99 -#: src/nicksonline.cpp:877 +#: src/linkaddressbook/addressbook_base.cpp:503 src/nicklistview.cpp:98 +#: src/nicksonline.cpp:883 msgid "&Send Email..." -msgstr "إ&رسال رسالة إلكترونية..." +msgstr "أ&رسل رسالة إلكترونية..." -#: src/nicklistview.cpp:104 +#: src/nicklistview.cpp:103 msgid "Addressbook Associations" -msgstr "ارتباطات مذكرة العناوين" +msgstr "إرتباطات مذكرة العناوين" -#: src/ircview.cpp:1224 src/ircview.cpp:1280 src/nicklistview.cpp:106 -#: src/query.cpp:94 +#: src/ircview.cpp:1435 src/ircview.cpp:1487 src/nicklistview.cpp:105 +#: src/query.cpp:95 msgid "Add to Watched Nicks" msgstr "إضافة إلى الاسماء المستعارة المراقبة" -#: src/nicklistview.cpp:149 +#: src/nicklistview.cpp:142 msgid "" "This shows all the people in the channel. The nick for each person is " "shown." @@ -248,231 +315,246 @@ "

الحوم على إسم مستعار سوف يريك وضعه الحالي كما سيريك أي معلومات عنه في دفتر " "العناوين. راجع كُتيّب Konversation لمعلومات أكثر." -#: src/nicklistview.cpp:278 +#: src/nicklistview.cpp:281 msgid "Edit Contact..." -msgstr "تحرير المراسِل..." +msgstr "حرر المراسِل..." -#: src/nicklistview.cpp:283 +#: src/nicklistview.cpp:286 msgid "Choose/Change Associations..." -msgstr "إختيار/تغيير الارتباطات..." +msgstr "إختر/ غيير الارتباطات..." -#: src/nicklistview.cpp:285 +#: src/nicklistview.cpp:288 msgid "Choose Contact..." -msgstr "اختيار المراسِل..." +msgstr "إختر المراسِل..." -#: src/nicklistview.cpp:287 +#: src/nicklistview.cpp:290 msgid "Change Association..." -msgstr "تغيير الارتباط..." +msgstr "غيير الارتباط..." -#: src/nicklistview.cpp:290 +#: src/nicklistview.cpp:293 msgid "Create New Contact..." msgstr "إنشاء مراسِل جديد..." -#: src/nicklistview.cpp:293 +#: src/nicklistview.cpp:296 msgid "Delete Association" msgstr "حذف الارتباط" #. i18n: file ./src/ignore_preferencesui.ui line 117 -#: rc.cpp:65 src/ignorelistviewitem.cpp:42 src/inputfilter.cpp:1652 -#: src/inputfilter.cpp:1656 +#: rc.cpp:251 src/channellistpanel.cpp:92 src/ignorelistviewitem.cpp:43 +#: src/inputfilter.cpp:1691 src/inputfilter.cpp:1695 #, no-c-format msgid "Channel" msgstr "قناة" #. i18n: file ./src/ignore_preferencesui.ui line 141 -#: rc.cpp:74 src/ignorelistviewitem.cpp:43 +#: rc.cpp:260 src/ignorelistviewitem.cpp:44 #, no-c-format msgid "Query" msgstr "نداء" #. i18n: file ./src/ignore_preferencesui.ui line 133 -#: rc.cpp:71 src/ignorelistviewitem.cpp:44 src/inputfilter.cpp:401 -#: src/inputfilter.cpp:463 src/inputfilter.cpp:643 src/inputfilter.cpp:1052 -#: src/outputfilter.cpp:631 +#: rc.cpp:257 src/ignorelistviewitem.cpp:45 src/inputfilter.cpp:416 +#: src/inputfilter.cpp:478 src/inputfilter.cpp:672 src/inputfilter.cpp:1111 +#: src/outputfilter.cpp:626 src/outputfilter.cpp:1578 #, no-c-format msgid "Notice" msgstr "إشعار" #. i18n: file ./src/ignore_preferencesui.ui line 109 -#: rc.cpp:62 src/dccchat.cpp:267 src/ignorelistviewitem.cpp:45 -#: src/inputfilter.cpp:199 src/inputfilter.cpp:206 src/inputfilter.cpp:222 -#: src/inputfilter.cpp:229 src/inputfilter.cpp:305 src/inputfilter.cpp:313 -#: src/inputfilter.cpp:333 src/inputfilter.cpp:428 src/inputfilter.cpp:438 -#: src/outputfilter.cpp:747 +#: rc.cpp:248 src/dccchat.cpp:244 src/ignorelistviewitem.cpp:46 +#: src/inputfilter.cpp:202 src/inputfilter.cpp:209 src/inputfilter.cpp:225 +#: src/inputfilter.cpp:232 src/inputfilter.cpp:363 src/inputfilter.cpp:371 +#: src/inputfilter.cpp:391 src/inputfilter.cpp:443 src/inputfilter.cpp:453 +#: src/outputfilter.cpp:775 #, no-c-format msgid "CTCP" msgstr "CTCP" #. i18n: file ./src/ignore_preferencesui.ui line 125 -#: rc.cpp:68 src/dccchat.cpp:170 src/dccchat.cpp:182 src/dccchat.cpp:221 -#: src/dccchat.cpp:355 src/dccchat.cpp:360 src/ignorelistviewitem.cpp:46 -#: src/inputfilter.cpp:296 src/konvisettingsdialog.cpp:193 -#: src/konvisettingsdialog.cpp:194 src/server.cpp:1856 src/server.cpp:1887 -#: src/server.cpp:1933 src/server.cpp:1963 src/server.cpp:1990 -#: src/server.cpp:1993 src/server.cpp:2000 src/server.cpp:2003 -#: src/server.cpp:2015 src/server.cpp:2022 +#: rc.cpp:254 src/dccchat.cpp:137 src/dccchat.cpp:147 src/dccchat.cpp:159 +#: src/dccchat.cpp:198 src/dccchat.cpp:339 src/dccchat.cpp:344 +#: src/ignorelistviewitem.cpp:47 src/inputfilter.cpp:300 +#: src/inputfilter.cpp:315 src/inputfilter.cpp:330 src/inputfilter.cpp:346 +#: src/inputfilter.cpp:354 src/konvisettingsdialog.cpp:172 +#: src/konvisettingsdialog.cpp:173 src/server.cpp:1710 src/server.cpp:1741 +#: src/server.cpp:1817 src/server.cpp:1852 src/server.cpp:1886 +#: src/server.cpp:1889 src/server.cpp:1905 src/server.cpp:1908 +#: src/server.cpp:1927 src/server.cpp:1934 #, no-c-format msgid "DCC" msgstr "DCC" -#: src/ignorelistviewitem.cpp:47 +#: src/ignorelistviewitem.cpp:48 msgid "Exception" msgstr "إستثناء" -#: src/konvisettingsdialog.cpp:132 src/konvisettingsdialog.cpp:133 -#: src/konvisettingsdialog.cpp:199 src/konvisettingsdialog.cpp:200 -#: src/viewtree.cpp:39 +#: src/konvisettingsdialog.cpp:111 src/konvisettingsdialog.cpp:112 +#: src/konvisettingsdialog.cpp:178 src/konvisettingsdialog.cpp:179 +#: src/viewtree.cpp:69 msgid "Tabs" msgstr "ألسنة" -#: src/nickinfo.cpp:106 +#: src/nickinfo.cpp:103 msgid "Today" msgstr "اليوم" -#: src/nickinfo.cpp:107 +#: src/nickinfo.cpp:104 msgid "Yesterday" msgstr "البارحة" -#: src/nickinfo.cpp:359 +#: src/nickinfo.cpp:356 msgid " (identified)" -msgstr " (معرف)" +msgstr " (معرّف)" #. i18n: file ./src/linkaddressbook/linkaddressbookui_base.ui line 96 -#: rc.cpp:1035 src/linkaddressbook/linkaddressbookui.cpp:81 -#: src/nickinfo.cpp:365 +#: rc.cpp:922 src/linkaddressbook/linkaddressbookui.cpp:82 +#: src/nickinfo.cpp:362 #, no-c-format msgid "Email" msgstr "بريد إلكتروني" -#: src/nickinfo.cpp:394 +#: src/nickinfo.cpp:391 msgid "Hostmask:" msgstr "قناع المضيف:" -#: src/nickinfo.cpp:399 +#: src/nickinfo.cpp:396 msgid "Away Message:" msgstr "رسالة الغياب:" -#: src/nickinfo.cpp:403 +#: src/nickinfo.cpp:400 msgid "(unknown)" msgstr "(مجهول)" -#: src/nickinfo.cpp:409 +#: src/nickinfo.cpp:406 msgid "Online Since:" msgstr "متصل منذ:" -#: src/autoreplace_preferences.cpp:39 +#. i18n: file ./src/highlight_preferencesui.ui line 175 +#: rc.cpp:880 src/autoreplace_preferences.cpp:49 +#: src/highlight_preferences.cpp:182 +#, no-c-format +msgid "Click to run Regular Expression Editor (KRegExpEditor)" +msgstr "انقر لإختيار محرر التعبير المنتظم (KRegExpEditor)" + +#: src/autoreplace_preferences.cpp:54 src/highlight_preferences.cpp:186 +#, fuzzy +msgid "The Regular Expression Editor (KRegExpEditor) is not installed" +msgstr "انقر لإختيار محرر التعبير المنتظم (KRegExpEditor)" + +#: src/autoreplace_preferences.cpp:58 msgid "Outgoing" msgstr "خارج" -#: src/autoreplace_preferences.cpp:40 +#: src/autoreplace_preferences.cpp:59 msgid "Incoming" msgstr "داخل" -#: src/autoreplace_preferences.cpp:41 +#: src/autoreplace_preferences.cpp:60 msgid "Both" -msgstr "معاً" +msgstr "كلاً من الإثنينً" #: src/joinchanneldialog.cpp:29 #, c-format msgid "Join Channel on %1" msgstr "الإنضمام إلى قناة في %1" -#: src/quickconnectdialog.cpp:27 +#: src/quickconnectdialog.cpp:28 msgid "Quick Connect" msgstr "إتصال سريع" -#: src/quickconnectdialog.cpp:37 +#: src/quickconnectdialog.cpp:38 msgid "&Server host:" -msgstr "مضيف ال&خادم:" +msgstr "ال&خادم المضيف:" -#: src/quickconnectdialog.cpp:38 +#: src/quickconnectdialog.cpp:39 msgid "Enter the host of the network here." msgstr "أدخل مضيف الشبكة هنا." -#: src/quickconnectdialog.cpp:44 src/serverdialog.cpp:41 +#: src/quickconnectdialog.cpp:45 src/serverdialog.cpp:41 msgid "&Port:" msgstr "الم&نفذ:" -#: src/quickconnectdialog.cpp:45 +#: src/quickconnectdialog.cpp:46 msgid "The port that the IRC server is using." msgstr "المنفذ الذي يستعمله خادم IRC." -#: src/quickconnectdialog.cpp:51 +#: src/quickconnectdialog.cpp:52 msgid "&Nick:" -msgstr "ال&اسم المستعار:" +msgstr "ال&إسم المستعار:" -#: src/quickconnectdialog.cpp:52 +#: src/quickconnectdialog.cpp:53 msgid "The nick you want to use." -msgstr "الاسم المستعار الذي تريد إستعماله." +msgstr "اإاسم المستعار الذي تريد إستعماله." -#: src/quickconnectdialog.cpp:58 +#: src/quickconnectdialog.cpp:59 msgid "P&assword:" msgstr "كلمة ال&مرور:" -#: src/quickconnectdialog.cpp:59 +#: src/quickconnectdialog.cpp:60 msgid "" "If the IRC server requires a password, enter it here (most servers do not " "require a password.)" msgstr "" -"إذا طلب خادم IRC كلمة مرور، أدخلها هنا ( معظم الخوادم لا يتطلّب كلمة مرور. )" +"إذا طلب خادم IRC كلمة مرور، أدخلها هنا ( معظم الخوادم لا تتطلّب كلمة مرور. )" -#: src/quickconnectdialog.cpp:66 +#: src/quickconnectdialog.cpp:67 msgid "&Use SSL" -msgstr "است&عمال SSL" +msgstr "إست&عمال SSL" -#: src/quickconnectdialog.cpp:82 src/serverlistdialog.cpp:107 +#: src/quickconnectdialog.cpp:83 src/serverlistdialog.cpp:107 msgid "C&onnect" -msgstr "إتّ&صل" +msgstr "إتّ&صال" -#: src/quickconnectdialog.cpp:82 src/serverlistdialog.cpp:107 +#: src/quickconnectdialog.cpp:83 src/serverlistdialog.cpp:107 msgid "Connect to the server" msgstr "إتصل بالخادم" -#: src/dccchat.cpp:147 -msgid "There is no vacant port for DCC Chat." -msgstr "لا يوجد أي منفذ شاغر من أجل محادثة DCC." +#: src/dccchat.cpp:137 +#, fuzzy, c-format +msgid "Could not open a socket for listening: %1" +msgstr "لا يمكن فتح مقبس" -#: src/dccchat.cpp:170 +#: src/dccchat.cpp:147 msgid "Offering DCC Chat connection to %1 on port %2..." -msgstr "عرض إتصال لمحاثة DCC على %1 في المنفذ %2..." +msgstr "تقديم إتصال محادثة DCC إلى %1 على المنفذ %2..." -#: src/dccchat.cpp:171 +#: src/dccchat.cpp:148 msgid "DCC chat with %1 on port %2." -msgstr "محادثة DCC مع %1 في المنفذ %2." +msgstr "محادثة DCC مع %1 على المنفذ %2." -#: src/dccchat.cpp:183 +#: src/dccchat.cpp:160 msgid "" "_: %1 = nickname, %2 = IP, %3 = port\n" "Establishing DCC Chat connection to %1 (%2:%3)..." msgstr "إنشاء إتصال محادثة DCC مع %1 (%2:%3)..." -#: src/dccchat.cpp:185 +#: src/dccchat.cpp:162 msgid "" "_: %1 = nickname, %2 = IP, %3 = port\n" "DCC chat with %1 on %2:%3." msgstr "محادثة DCC مع %1 على %2:%3." -#: src/dccchat.cpp:221 src/dccchat.cpp:355 +#: src/dccchat.cpp:198 src/dccchat.cpp:339 #, c-format msgid "Established DCC Chat connection to %1." msgstr "تمّ إنشاء إتصال محادثة DCC ب‍ %1" -#: src/dccchat.cpp:228 +#: src/dccchat.cpp:205 #, c-format msgid "Connection broken, error code %1." -msgstr "إنقطع الاتصال، رمز الخطأ %1." +msgstr "إنقطع الإتصال، رمز الخطأ %1." -#: src/dccchat.cpp:267 src/inputfilter.cpp:334 +#: src/dccchat.cpp:244 msgid "Received unknown CTCP-%1 request from %2" msgstr "استقبلتُ طلب CTCP-%1 من %2" -#: src/dccchat.cpp:339 +#: src/dccchat.cpp:323 msgid "Could not accept the client." -msgstr "لا يمكن قبول الزبون." +msgstr "لم أتمكن من قبول الزبون." -#: src/dccchat.cpp:418 +#: src/dccchat.cpp:413 msgid "Default ( %1 )" -msgstr "إقتراضي ( %1 )" +msgstr "الإقتراضي ( %1 )" #: src/serverlistdialog.cpp:105 msgid "Server List" @@ -480,7 +562,7 @@ #: src/serverlistdialog.cpp:107 msgid "Click here to connect to the selected IRC network and channel." -msgstr "انقر هنا للاتصال بشبكة IRC والقناة المنتقتين" +msgstr "أنقر هنا للاتصال بشبكة الـ IRC والقناة المنتقتين" #: src/serverlistdialog.cpp:112 msgid "" @@ -491,6 +573,10 @@ "the first time, the Freenode network and the #kde " "channel are already entered for you." msgstr "" +"يظهر هذا قائمة بشبكات IRC المعدّة. شبكة IRC هي مجموعة من الخوادم المتعاونة. " +"تحتاج فقط للإتصال بخادم واحد على الشبكة لتصبح متصلا بكامل شبكة IRC. بمجرد " +"اتصالك سينضم \"محادثتك\" تلقائيا للقنوات المعروضة. عند بدأ \"محادثتك\" للمرة " +"اﻷولى، ستكون شبكة Freenode وقناة #kde قد أدخلت بالفعل من أجلك." #: src/serverlistdialog.cpp:116 msgid "Network" @@ -505,7 +591,7 @@ msgstr "القنوات" #. i18n: file ./src/alias_preferencesui.ui line 128 -#: rc.cpp:137 rc.cpp:337 src/serverlistdialog.cpp:127 +#: rc.cpp:317 rc.cpp:514 src/serverlistdialog.cpp:127 #, no-c-format msgid "&New..." msgstr "&جديد..." @@ -515,52 +601,59 @@ "Click here to define a new Network, including the server to connect to, and the " "Channels to automatically join once connected." msgstr "" -"انقر هنا لتعريف شبكة جديدة، بما فيه الخادم المتصل به والقنوات المنضم إليها آليا " -"بعيد الاتصال." +"أنقر هنا لتعريف شبكة جديدة، بما فيه الخادم المتصل به والقنوات المنضم إليها " +"تلقائياً بعد الإتصال." -#: src/ircinput.cpp:476 src/serverlistdialog.cpp:129 +#. i18n: file ./src/servergroupdialogui.ui line 88 +#: rc.cpp:281 src/ircinput.cpp:482 src/serverlistdialog.cpp:129 +#, no-c-format msgid "&Edit..." -msgstr "&تحرير..." +msgstr "&حرّر..." + +#: src/serverlistdialog.cpp:132 +#, fuzzy +msgid "Show at application startup" +msgstr "اتصال عند بدء التطبيق" -#: src/serverlistdialog.cpp:202 +#: src/serverlistdialog.cpp:213 msgid "New Network" -msgstr "شبكة جديدة" +msgstr "الشبكة الجديدة" -#: src/serverlistdialog.cpp:226 +#: src/serverlistdialog.cpp:233 msgid "Edit Network" -msgstr "تحرير الشبكة" +msgstr "حرّر الشبكة" -#: src/serverlistdialog.cpp:285 +#: src/serverlistdialog.cpp:290 msgid "" "You cannot delete %1.\n" "\n" "The network %2 needs to have at least one server." msgstr "" -"لا يمكن حذف %1.\n" +"لا تسطيع محو %1.\n" "\n" -"تتطلب الشبكة %2 خادما واحدا على الأقل." +"تتطلب الشبكة %2 خادماً واحداً على الأقل." -#: src/serverlistdialog.cpp:290 +#: src/serverlistdialog.cpp:295 msgid "" "You cannot delete the selected servers.\n" "\n" "The network %1 needs to have at least one server." msgstr "" -"لا يمكن حذف الخوادم المنتقاة.\n" +"لا يمكنك محو الخوادم المنتقاة.\n" "\n" -"تتطلب الشبكة %1 خادما واحدا على الأقل." +"تتطلب الشبكة %1 خادماً واحداً على الأقل." -#: src/serverlistdialog.cpp:305 +#: src/serverlistdialog.cpp:310 msgid "Do you really want to delete the selected entries?" -msgstr "هل تريد حقا أن تحذف المدخلات المنتقاة؟" +msgstr "هل تريد حقا محو الخانات المنتقاة ؟" -#: src/serverlistdialog.cpp:307 +#: src/serverlistdialog.cpp:312 msgid "Do you really want to delete %1?" -msgstr "هل تريد حقا أن تحذف %1؟" +msgstr "هل تريد حقا أن تحذف %1 ؟" #: src/logfilereader.cpp:50 msgid "Show last:" -msgstr "إظهار آخر:" +msgstr "إظهار الأخير:" #: src/logfilereader.cpp:52 msgid "" @@ -569,72 +662,145 @@ "setting." msgstr "" "إستعمل هذا الصندوق لتعيين الحجم الأقصى لملف تسجيل الوقائع. لن يُأخذ هذا التغيير " -"بعين الإعتبار إلى عند إعادة تشغيل Konversation. لكل سجل وقائع تعيينات مختلِفة " -"منفصلة." +"بعين الإعتبار إلا عند إعادة تشغيل \"محادثتك\". لكل سجل وقائع تعيينات مختلِفة " +"منفردة." #: src/logfilereader.cpp:54 msgid " KB" -msgstr "KB" +msgstr " ك. بايت" -#: src/logfilereader.cpp:57 src/logfilereader.cpp:113 +#: src/logfilereader.cpp:58 src/logfilereader.cpp:135 msgid "Clear Logfile" -msgstr "محو السجل" +msgstr "أمحي سجل الوقائع" -#: src/logfilereader.cpp:61 +#: src/logfilereader.cpp:62 msgid "" "The messages in the log file are displayed here. The oldest messages are at the " "top and the most recent are at the bottom." -msgstr "تعرض الرسائل الموجودة في الشجل هنا. توجد أقدمها أعلاه وأحدثها أسفله." +msgstr "" +"تعرض الرسائل الموجودة في ملف سجل الوقائع هنا. توجد أقدمها أعلاه وأحدثها أسفله." -#: src/logfilereader.cpp:112 +#: src/logfilereader.cpp:134 msgid "" "Do you really want to permanently discard all log information of this file?" -msgstr "هل تريد حقا أن تبعد كل معلموات السجل من هذا الملف؟" +msgstr "هل تريد حقا رمي كل معلموات سجل الوقائع من هذا الملف ؟" -#: src/logfilereader.cpp:125 +#: src/logfilereader.cpp:147 msgid "" "Note: By saving the logfile you will save all data in the file, not only the " "part you can see in this viewer." msgstr "" -"ملاحظة: يحفظ حفظ السجل كل بيانات الملف وليس فقط الجزء الذي تقرأه في هذا " -"المعاين." +"ملاحظة: بحفظ ملف سجل الوقائع ستقوم بحفظ كل بيانات الملف ، وليس فقط الجزء الذي " +"تراه في هذا المعاين." -#: src/logfilereader.cpp:126 +#: src/logfilereader.cpp:148 msgid "Save Logfile" -msgstr "حفظ السجل" +msgstr "إحفظ سجل الوقائع" -#: src/logfilereader.cpp:132 +#: src/logfilereader.cpp:154 msgid "Choose Destination Folder" -msgstr "اختيار المجلد " +msgstr "إختر المجلد الهدف" + +#: src/connectionmanager.cpp:204 src/connectionmanager.cpp:211 +#: src/outputfilter.cpp:1489 src/server.cpp:204 src/server.cpp:366 +#: src/server.cpp:415 src/server.cpp:546 src/server.cpp:556 src/server.cpp:710 +msgid "Info" +msgstr "معلومات" + +#: src/connectionmanager.cpp:205 +#, fuzzy +msgid "Trying to connect to %1 in %2 seconds." +msgstr "تقديم إتصال محادثة DCC إلى %1 على المنفذ %2..." + +#: src/connectionmanager.cpp:212 +msgid "Trying to reconnect to %1 in %2 seconds." +msgstr "" + +#: src/connectionmanager.cpp:222 +#, fuzzy +msgid "Reconnection attempts exceeded." +msgstr "محاولات إعادة الإتصال:" + +#: src/connectionmanager.cpp:439 +#, fuzzy +msgid "" +"You are already connected to %1. Do you want to open another connection?" +msgstr "إنك متصل من قبل ب‍ %1. هل تريد فك الاتصال من %2 والاتصال ب‍ %3؟" + +#: src/connectionmanager.cpp:441 src/connectionmanager.cpp:461 +#, c-format +msgid "Already connected to %1" +msgstr "متصل من قيل ب‍ %1" + +#: src/connectionmanager.cpp:442 +#, fuzzy +msgid "Create connection" +msgstr "إتصال" + +#: src/connectionmanager.cpp:455 +#, fuzzy +msgid "" +"You are presently connected to %1 via '%2' (port %3). Do you want to switch to " +"'%4' (port %5) instead?" +msgstr "إنك متصل من قبل ب‍ %1. هل تريد فك الاتصال من %2 والاتصال ب‍ %3؟" + +#: src/connectionmanager.cpp:462 +#, fuzzy +msgid "Switch Server" +msgstr "تحرير الخادم" + +#: src/connectionmanager.cpp:502 +msgid "Please fill in your Ident.
" +msgstr "الرجاء إملاء هوية.
" + +#: src/connectionmanager.cpp:505 +msgid "Please fill in your Real name.
" +msgstr "الرجاء إملاء اسمك الحقيقي.
" + +#: src/connectionmanager.cpp:508 +msgid "Please provide at least one Nickname.
" +msgstr "الرجاء إعطاء اسم مستعار واحد على الأقل." + +#: src/connectionmanager.cpp:515 +msgid "Your identity \"%1\" is not set up correctly:
%2" +msgstr "هويتك \"%1\" ليست مُعِدة بِشكل سليم:
%2" + +#: src/connectionmanager.cpp:517 +msgid "Identity Settings" +msgstr "إعدادات الهوية" + +#: src/connectionmanager.cpp:518 +msgid "Edit Identity..." +msgstr "تحرير الهوية..." -#: src/identitydialog.cpp:41 +#: src/identitydialog.cpp:43 msgid "Identities" -msgstr "هويات" +msgstr "الهويات" -#: src/identitydialog.cpp:46 +#: src/identitydialog.cpp:48 msgid "&Identity:" msgstr "ال&هوية:" -#: src/identitydialog.cpp:66 +#: src/identitydialog.cpp:68 msgid "Duplicate" msgstr "ازدواج" -#: src/identitydialog.cpp:71 +#: src/identitydialog.cpp:73 msgid "Rename" msgstr "إعادة تسمية" #. i18n: file ./src/chatwindowbehaviour_preferences.ui line 27 -#: rc.cpp:1044 src/identitydialog.cpp:81 src/konvisettingsdialog.cpp:138 -#: src/konvisettingsdialog.cpp:139 +#: rc.cpp:931 src/identitydialog.cpp:83 src/konvisettingsdialog.cpp:117 +#: src/konvisettingsdialog.cpp:118 #, no-c-format msgid "General" msgstr "عام" -#: src/identitydialog.cpp:84 +#: src/identitydialog.cpp:86 msgid "&Real name:" msgstr "الاسم ال&حقيقي:" -#: src/identitydialog.cpp:86 +#: src/identitydialog.cpp:88 msgid "" "Enter your real name here. IRC is not intended to keep you hidden from your " "friends or enemies. Keep this in mind if you are tempted to behave maliciously. " @@ -642,14 +808,18 @@ "out there, but the PC you use can always be traced so you will never be truly " "anonymous." msgstr "" +"أدخل إسمك الحقيقي هنا. IRC ليس ﻹخفائك من أصدقائك أو أعدائك. ضع هذا في اﻹعتبار " +"عندما تنوي التصرف بشكل سيء. اختيار \"اسم حقيقي\" مزيف قد يكون طريقة جيدة ﻹخفاء " +"حقيقتك عن الموجودين، لكن من الممكن تتبع حاسوبك مما يعني أنك لا يمكن أن تكون " +"مجهول الهوية بحق." #. i18n: file ./src/channeloptionsui.ui line 53 -#: rc.cpp:749 src/identitydialog.cpp:89 +#: rc.cpp:631 src/identitydialog.cpp:91 #, no-c-format msgid "Nickname" msgstr "الاسم المستعار" -#: src/identitydialog.cpp:94 +#: src/identitydialog.cpp:96 msgid "" "This is your list of nicknames. A nickname is the name that other users will " "know you by. You may use any name you desire. The first character must be a " @@ -660,28 +830,32 @@ "nickname. Enter alternate nicknames for yourself. If your first choice is " "rejected by the server, Konversation will try the alternate nicknames." msgstr "" +"هذه قائمة بأسماؤك المستعارة. الإسم المستعار هو اﻹسم الذي سيعرفك به المستخدمين " +"اﻵخرين. يمكن استخدام أي اسم تريده. يجب أن يكون المحرف اﻷول حرفا.\n" +"\n" +"حيث أن اﻷسماء المستعارة يجب أن تكون فريدة عبر كامل شبكة IRC، ربما يرفض الخادم " +"اﻹسم الذي اخترته ﻷن شخصا آخر يستخدم هذا الإسم المستعار. أدخل أسماء مستعارة أخرى " +"لك. لو رفض الخادم اختيارك اﻷول، سيجرب \"محادثتك\" اﻹسم المستعار التالي." -#. i18n: file ./src/servergroupdialogui.ui line 138 -#: rc.cpp:104 rc.cpp:116 src/identitydialog.cpp:95 +#. i18n: file ./src/servergroupdialogui.ui line 218 +#: rc.cpp:299 src/identitydialog.cpp:97 #, no-c-format msgid "Add..." msgstr "إضافة..." -#. i18n: file ./src/servergroupdialogui.ui line 101 -#: rc.cpp:95 rc.cpp:107 rc.cpp:119 src/identitydialog.cpp:96 -#, no-c-format +#: src/identitydialog.cpp:98 msgid "Edit..." msgstr "تحرير..." -#: src/identitydialog.cpp:123 +#: src/identitydialog.cpp:127 msgid "Auto Identify" -msgstr "تعريف آلي" +msgstr "تعريف تلقائي" -#: src/identitydialog.cpp:127 +#: src/identitydialog.cpp:131 msgid "Ser&vice:" msgstr "الخ&دمة:" -#: src/identitydialog.cpp:128 +#: src/identitydialog.cpp:132 msgid "" "Service name can be nickserv or a network dependant name like " "nickserv@services.dal.net" @@ -689,21 +863,21 @@ "إسم الخدمة يمكن ان يكون إسم مستعار للخدمة " "أو إسم معتمد على الشبكة مثل إسم مستعار@services.dal.net" -#: src/identitydialog.cpp:132 +#: src/identitydialog.cpp:136 msgid "Pa&ssword:" msgstr "كلمة الم&رور:" -#: src/identitydialog.cpp:151 +#: src/identitydialog.cpp:155 msgid "" "_: Tab name\n" "Away" msgstr "غائب" -#: src/identitydialog.cpp:154 -msgid "Insert remember &line when going away" -msgstr "إدراج &سطر التذكر عند الغياب" +#: src/identitydialog.cpp:158 +msgid "Mark the last position in chat windows when going away" +msgstr "" -#: src/identitydialog.cpp:155 +#: src/identitydialog.cpp:159 msgid "" "If you check this box, whenever you perform an /away " "command, a horizontal line will appear in the channel, marking the point where " @@ -713,11 +887,11 @@ "تدخِل الأمر /away غائب . لن يرى المستخدمون الآخرون لِلــ IRC هذا الخط " "الأفقي." -#: src/identitydialog.cpp:157 +#: src/identitydialog.cpp:161 msgid "Away nickname:" msgstr "الاسم المستعار عند الغياب:" -#: src/identitydialog.cpp:159 +#: src/identitydialog.cpp:163 msgid "" "Enter a nickname that indicates you are away. Whenever you perform an " "/away msg command in any channel joined with this Identity, Konversation " @@ -727,16 +901,54 @@ "automatically change your nickname back to the original. If you do not wish to " "automatically change your nickname when going away, leave blank." msgstr "" +"ادخل اسما مستعارا يوضح أنك غائب. عندما تؤدي أمر /away msg " +"في أي قناة انضممت إليها بهذه الهوية، سيغير \"محادثتك\" اسمك المستعار إلى هذا " +"اﻹسم. سيعرف اﻵخرون أنك بعيد عن حاسوبك. عندما تؤدي أمر /away " +"في أي قناة أنت غائب فيها، سيغير \"محادثتك\" اسمك المستعار آليا إلى اﻹسم اﻷصلي. " +"إذا لم ترغب في تغير اسمك آليا عند غيابك، اتركها خالية." + +#: src/identitydialog.cpp:166 +msgid "Automatic Away" +msgstr "" + +#: src/identitydialog.cpp:172 +msgid "" +"If you check this box, Konversation will automatically set all connections " +"using this Identity away when the screensaver starts or after a period of user " +"inactivity configured below." +msgstr "" + +#: src/identitydialog.cpp:174 +msgid "Set away after" +msgstr "" -#: src/identitydialog.cpp:162 -msgid "Messages" -msgstr "رسائل" - -#: src/identitydialog.cpp:168 -msgid "Show a&way messages" -msgstr "إظهار رسائل الغياب" +#: src/identitydialog.cpp:176 +#, fuzzy +msgid " minutes" +msgstr " أسطر" + +#: src/identitydialog.cpp:177 +msgid "of user inactivity" +msgstr "" + +#: src/identitydialog.cpp:180 +#, fuzzy +msgid "Automatically return on activity" +msgstr "متابعة التنزيل ت&لقائياً" + +#: src/identitydialog.cpp:181 +msgid "" +"If you check this box, Konversation will automatically cancel away for all " +"connections using this Identity when the screensaver stops or new user activity " +"is detected." +msgstr "" + +#: src/identitydialog.cpp:197 +#, fuzzy +msgid "Away Messages" +msgstr "رسالة الغياب:" -#: src/identitydialog.cpp:169 +#: src/identitydialog.cpp:203 #, c-format msgid "" "If you check this box, Konversation will automatically send the Away message to " @@ -744,24 +956,27 @@ ". Whenever you perform an /away command, the Return message will be " "displayed in all channels joined with this Identity." msgstr "" +"إذا اخترت هذا المربع. سيرسل \"محادثتك\" تلقائيا رسالة غياب لقل القنوات التي " +"انضممت إليها بهذه الهوية. ستستبدل %sبـ msg. عندما تؤدي أمر " +"/away، ستعرض رسالة عودة في كل القنوات التي انضممت إليها بهذه الهوية." -#: src/identitydialog.cpp:172 +#: src/identitydialog.cpp:205 msgid "Away &message:" -msgstr "رسالة &غياب:" +msgstr "رسالة ال&غياب:" -#: src/identitydialog.cpp:176 +#: src/identitydialog.cpp:209 msgid "Re&turn message:" -msgstr "رسالة &عودة:" +msgstr "رسالة ال&عودة:" -#: src/identitydialog.cpp:205 +#: src/identitydialog.cpp:238 msgid "Advanced" msgstr "متقدم" -#: src/identitydialog.cpp:208 +#: src/identitydialog.cpp:241 msgid "&Pre-shell command:" msgstr "&أمر قبل الصدفة:" -#: src/identitydialog.cpp:210 +#: src/identitydialog.cpp:243 msgid "" "Here you can enter a command to be executed before connection to server starts" "
If you have multiple servers in this identity this command will be executed " @@ -771,11 +986,11 @@ "
إذا كان لديك عِدة خوادِم تعمل بِهذه الهوية سيتم تنفيذ هذا الأمر على كل من " "الخوادِم." -#: src/identitydialog.cpp:213 +#: src/identitydialog.cpp:246 msgid "I&dent:" -msgstr "م&عرف:" +msgstr "الم&عرف:" -#: src/identitydialog.cpp:215 +#: src/identitydialog.cpp:248 msgid "" "When you connect, many servers query your computer for an IDENT response. If " "you computer is not running an IDENT server, this response is sent by " @@ -784,11 +999,11 @@ "العديد من الخوادِم يطلب من جهازك جواب IDENT عندما تبدء الإتصال. إذا كان جهازك " "لا ينفذ خادِم IDENT ، سيقوم البرنامج بِلرد. لا فراغات مسموحة." -#: src/identitydialog.cpp:219 +#: src/identitydialog.cpp:252 msgid "&Encoding:" -msgstr "&ترميز:" +msgstr "ال&ترميز:" -#: src/identitydialog.cpp:221 +#: src/identitydialog.cpp:254 msgid "" "This setting affects how characters you type are encoded for sending to the " "server. It also affects how messages are displayed. When you first open " @@ -796,20 +1011,34 @@ "system. If you seem to be having trouble seeing other user's messages " "correctly, try changing this setting." msgstr "" +"يؤثر هذا اﻹعداد على كيفية ترميز المحارف التي تكتبها ﻹرسالها للخادم. كما تؤثر " +"على كيفية عرض الرسائل. عند فتحك \"لمحادثتك\" للمرة اﻷولى، سيحصل على هذه القيمة " +"تلقائيا من نظام التشغيل. إذا حدث وواجهت مشاكل في عرض رسائل اﻵخرين بشكل صحيح، " +"جرب تغيير هذا اﻹعداد." + +#: src/identitydialog.cpp:259 +#, fuzzy +msgid "&Quit reason:" +msgstr "سبب ال&ذهاب:" -#: src/identitydialog.cpp:226 +#: src/identitydialog.cpp:261 +#, fuzzy +msgid "Whenever you leave a server, this message is shown to others." +msgstr "عند مغادرتك قناة ما، تظهر هذه الرسالة" + +#: src/identitydialog.cpp:264 msgid "&Part reason:" msgstr "سبب ال&ذهاب:" -#: src/identitydialog.cpp:228 +#: src/identitydialog.cpp:266 msgid "Whenever you leave a channel, this message is sent to the channel." msgstr "عند مغادرتك قناة ما، تظهر هذه الرسالة" -#: src/identitydialog.cpp:231 +#: src/identitydialog.cpp:269 msgid "&Kick reason:" msgstr "سبب الر&كل:" -#: src/identitydialog.cpp:233 +#: src/identitydialog.cpp:271 msgid "" "Whenever you are kicked from a channel (usually by an IRC operator), this " "message is sent to the channel." @@ -817,52 +1046,56 @@ "في كل مرة يتم ركلك من القناة ( عادتاً من قِبل معامل الــ IRC ) يجري إرسال هذه " "الرسالة إلى القناة." -#: src/identitydialog.cpp:271 +#: src/identitydialog.cpp:312 msgid "Change identity information" -msgstr "تغيير معلومات الهوية:" +msgstr "غيير معلومات الهوية:" -#: src/editnotifydialog.cpp:91 src/identitydialog.cpp:272 +#: src/editnotifydialog.cpp:89 src/identitydialog.cpp:313 #: src/servergroupdialog.cpp:101 msgid "Discards all changes made" msgstr "تلغي كل التغييرات" -#: src/identitydialog.cpp:283 src/identitydialog.cpp:427 +#: src/identitydialog.cpp:327 src/identitydialog.cpp:489 msgid "You must add at least one nick to the identity." -msgstr "عليك إضافة اسم مستعار أقل إلى هويتك" +msgstr "عليك إضافة إسم مستعار واحِد على الأقل إلى هويتك." + +#: src/identitydialog.cpp:334 src/identitydialog.cpp:496 +msgid "Please enter a real name." +msgstr "" -#: src/identitydialog.cpp:325 +#: src/identitydialog.cpp:380 msgid "Add Nickname" -msgstr "إضافة اسم مستعار" +msgstr "إضافة إسم مستعار" #. i18n: file ./src/watchednicknames_preferencesui.ui line 212 -#: rc.cpp:317 src/identitydialog.cpp:325 src/identitydialog.cpp:337 +#: rc.cpp:496 src/identitydialog.cpp:380 src/identitydialog.cpp:392 #, no-c-format msgid "Nickname:" -msgstr "الاسم المستعار:" +msgstr "الإسم المستعار:" -#: src/identitydialog.cpp:337 +#: src/identitydialog.cpp:392 msgid "Edit Nickname" -msgstr "تحرير الاسم المستعار:" +msgstr "حرر الإسم المستعار:" -#: src/identitydialog.cpp:441 +#: src/identitydialog.cpp:511 msgid "Add Identity" msgstr "إضافة هوية" -#: src/identitydialog.cpp:441 src/identitydialog.cpp:466 -#: src/identitydialog.cpp:530 +#: src/identitydialog.cpp:511 src/identitydialog.cpp:536 +#: src/identitydialog.cpp:600 msgid "Identity name:" -msgstr "اسم الهوية" +msgstr "إسم الهوية" -#: src/identitydialog.cpp:456 src/identitydialog.cpp:475 -#: src/identitydialog.cpp:544 +#: src/identitydialog.cpp:526 src/identitydialog.cpp:545 +#: src/identitydialog.cpp:614 msgid "You need to give the identity a name." msgstr "عليك تسمية الهوية." -#: src/identitydialog.cpp:466 +#: src/identitydialog.cpp:536 msgid "Rename Identity" msgstr "إعادة تسمية الهوية" -#: src/identitydialog.cpp:507 +#: src/identitydialog.cpp:577 msgid "" "This identity is in use, if you remove it the network settings using it will " "fall back to the default identity. Should it be deleted anyway?" @@ -870,441 +1103,454 @@ "هذه الهوية هي قيد الإستعمال ، إذا محوتها سترجع تعيينات الشبكة إلى الهوية " "الإفتراضية. هل تريد محوها حتماً ؟" -#: src/identitydialog.cpp:512 +#: src/identitydialog.cpp:582 msgid "Are you sure you want to delete all information for this identity?" msgstr "هل انت اكيد انك تريد محو كل المعلومات لِهذه الهوية ؟" -#: src/identitydialog.cpp:515 +#: src/identitydialog.cpp:585 msgid "Delete Identity" msgstr "حذف الهوية" -#: src/identitydialog.cpp:530 +#: src/identitydialog.cpp:600 msgid "Duplicate Identity" msgstr "إزدواج الهوية" -#: src/nicklistbehavior_preferences.cpp:64 +#: src/nicklistbehavior_preferences.cpp:63 msgid "Normal Users" msgstr "مستخدمون عاديون" -#: src/nicklistbehavior_preferences.cpp:65 +#: src/nicklistbehavior_preferences.cpp:64 msgid "Voice (+v)" msgstr "صوت (+v)" -#: src/nicklistbehavior_preferences.cpp:66 +#: src/nicklistbehavior_preferences.cpp:65 msgid "Halfops (+h)" msgstr "نصف مديرين (+h)" -#: src/nicklistbehavior_preferences.cpp:67 +#: src/nicklistbehavior_preferences.cpp:66 msgid "Operators (+o)" msgstr "مديرون (+o)" -#: src/nicklistbehavior_preferences.cpp:68 +#: src/nicklistbehavior_preferences.cpp:67 msgid "Channel Admins (+p)" msgstr "مشرفون على القناة (+p)" -#: src/nicklistbehavior_preferences.cpp:69 +#: src/nicklistbehavior_preferences.cpp:68 msgid "Channel Owners (+q)" msgstr "مالكو القناة (+q)" -#: src/insertchardialog.cpp:22 +#: src/insertchardialog.cpp:23 msgid "Insert Character" msgstr "إدراج محرف" -#: src/insertchardialog.cpp:26 +#: src/insertchardialog.cpp:27 msgid "Insert a character" msgstr "إدراج محرف" -#: src/konvibookmarkhandler.cpp:67 +#: src/konvibookmarkhandler.cpp:68 msgid "Konversation Bookmarks Editor" msgstr "محرر علامات محادثك" -#: src/konversationapplication.cpp:254 src/server.cpp:1416 src/server.cpp:2999 -#: src/server.cpp:3004 -msgid "DCOP" -msgstr "DCOP" - -#: src/konversationapplication.cpp:262 -msgid "Please fill in your Ident.
" -msgstr "الرجاء إملاء هوية.
" - -#: src/konversationapplication.cpp:265 -msgid "Please fill in your Real name.
" -msgstr "الرجاء إملاء اسمك الحقيقي.
" - -#: src/konversationapplication.cpp:268 -msgid "Please provide at least one Nickname.
" -msgstr "الرجاء إعطاء اسم مستعار واحد على الأقل." - -#: src/konversationapplication.cpp:275 -msgid "Your identity \"%1\" is not set up correctly:
%2" -msgstr "هويتك \"%1\" ليست مُعِدة بِشكل سليم:
%2" - -#: src/konversationapplication.cpp:277 -msgid "Identity Settings" -msgstr "إعدادات الهوية" - -#: src/konversationapplication.cpp:278 -msgid "Edit Identity..." -msgstr "تحرير الهوية..." - -#: src/konversationapplication.cpp:337 -msgid "" -"You are already connected to %1. Do you want to disconnect from '%2' and " -"connect to '%3' instead?" -msgstr "إنك متصل من قبل ب‍ %1. هل تريد فك الاتصال من %2 والاتصال ب‍ %3؟" +#: src/dcccommon.cpp:92 +msgid "No vacant port" +msgstr "لا منفذ فارغ" -#: src/konversationapplication.cpp:341 -#, c-format -msgid "Already connected to %1" -msgstr "متصل من قيل ب‍ %1" +#: src/dcccommon.cpp:104 +msgid "Could not open a socket" +msgstr "لا يمكن فتح مقبس" -#: src/konversationapplication.cpp:342 src/statuspanel.cpp:280 -msgid "Disconnect" -msgstr "قطع الاتصال" +#: src/konversationapplication.cpp:271 src/server.cpp:1270 src/server.cpp:2910 +#: src/server.cpp:2915 +msgid "DCOP" +msgstr "DCOP" -#: src/ircview.cpp:100 src/viewcontainer.cpp:571 +#: src/ircview.cpp:112 src/viewcontainer.cpp:525 msgid "Find Text..." msgstr "بحث عن نص..." -#: src/ircview.cpp:236 src/topiclabel.cpp:342 +#: src/ircview.cpp:258 src/topiclabel.cpp:358 msgid "Copy URL to Clipboard" msgstr "نسخ الوصلة إلى الحافظة" -#: src/ircview.cpp:237 src/topiclabel.cpp:343 +#: src/ircview.cpp:259 src/topiclabel.cpp:359 msgid "Add to Bookmarks" msgstr "إضافة إلى العلامات" -#: src/ircview.cpp:247 +#: src/ircview.cpp:260 +#, fuzzy +msgid "Save Link As..." +msgstr "&إحفظ اللائحة..." + +#: src/ircview.cpp:270 #, c-format msgid "Open a query with %1" msgstr "فتح حوار خاص ب‍ %1" -#: src/ircview.cpp:264 src/topiclabel.cpp:364 +#: src/ircview.cpp:287 src/topiclabel.cpp:380 #, c-format msgid "Join the channel %1" msgstr "انضمام إلى القناة %1" -#: src/inputfilter.cpp:1022 src/inputfilter.cpp:1028 src/inputfilter.cpp:1034 -#: src/ircview.cpp:789 +#: src/inputfilter.cpp:1081 src/inputfilter.cpp:1087 src/inputfilter.cpp:1093 +#: src/ircview.cpp:936 msgid "MOTD" msgstr "كلمة الترحيب اليومية" -#: src/ircview.cpp:806 src/outputfilter.cpp:1043 src/server.cpp:2376 -#: src/server.cpp:2418 +#: src/ircview.cpp:953 src/outputfilter.cpp:1108 src/server.cpp:2301 +#: src/server.cpp:2319 msgid "Notify" msgstr "إنذار" -#: src/channel.cpp:1117 src/channel.cpp:1129 src/ircview.cpp:825 -#: src/server.cpp:2989 +#: src/channel.cpp:1268 src/channel.cpp:1285 src/ircview.cpp:973 +#: src/server.cpp:2900 msgid "Join" msgstr "انضمام" -#: src/channel.cpp:1159 src/channel.cpp:1161 src/channel.cpp:1181 -#: src/channel.cpp:1183 src/ircview.cpp:830 +#: src/channel.cpp:1315 src/channel.cpp:1317 src/channel.cpp:1337 +#: src/channel.cpp:1339 src/ircview.cpp:978 msgid "Part" msgstr "مغادرة" -#: src/ircview.cpp:1217 +#: src/ircview.cpp:1428 msgid "Open Query" msgstr "فتح حوار خاص" -#: src/ircview.cpp:1289 src/topiclabel.cpp:220 +#: src/ircview.cpp:1496 src/topiclabel.cpp:229 msgid "&Join" msgstr "&انضمام" -#: src/ircview.cpp:1290 src/topiclabel.cpp:221 +#: src/ircview.cpp:1497 src/topiclabel.cpp:230 msgid "Get &user list" msgstr "حصول على قائمة ال&مستخدمين" -#: src/ircview.cpp:1291 src/topiclabel.cpp:222 +#: src/ircview.cpp:1498 src/topiclabel.cpp:231 msgid "Get &topic" msgstr "الحصول على الم&وضوع" -#: src/ircview.cpp:1341 +#: src/ircview.cpp:1548 msgid "No matches found for \"%1\"." msgstr "لا مطابقات من أجل \"%1\"." -#: src/konversationmainwindow.cpp:124 +#: src/ircview.cpp:1778 +#, fuzzy +msgid "Save Link As" +msgstr "&إحفظ اللائحة..." + +#: src/konversationmainwindow.cpp:134 msgid "&Server List..." msgstr "قائمة ال&خوادم..." -#: src/konversationmainwindow.cpp:125 +#: src/konversationmainwindow.cpp:135 msgid "Manage networks and servers" msgstr "إدارة الشبكات والخوادم" -#: src/konversationmainwindow.cpp:126 +#: src/konversationmainwindow.cpp:136 msgid "Quick &Connect..." msgstr "اتصال &سريع..." -#: src/konversationmainwindow.cpp:127 +#: src/konversationmainwindow.cpp:137 msgid "Type in the address of a new IRC server to connect to" msgstr "اكتب عنوان خادم IRC جديد تريد الاتصال به:" -#: src/konversationmainwindow.cpp:129 +#: src/konversationmainwindow.cpp:139 msgid "&Reconnect" msgstr "إ&عادة اتصال" -#: src/konversationmainwindow.cpp:131 +#: src/konversationmainwindow.cpp:141 msgid "Reconnect to the current server." msgstr "إعادة الاتصال بالخادم الحالي." -#: src/konversationmainwindow.cpp:133 +#: src/konversationmainwindow.cpp:143 msgid "&Disconnect" msgstr "&قطع الاتصال" -#: src/konversationmainwindow.cpp:135 +#: src/konversationmainwindow.cpp:145 msgid "Disconnect from the current server." msgstr "فك التصال من الخادم الحالي.4" -#: src/konversationmainwindow.cpp:137 +#: src/konversationmainwindow.cpp:147 msgid "&Identities..." msgstr "&هويّات..." -#: src/konversationmainwindow.cpp:138 +#: src/konversationmainwindow.cpp:148 msgid "Manage your nick, away and other identity settings" msgstr "إدارة اسمك المستعار وحالة الغياب وإعدادات أخرى للهويّة" -#: src/konversationmainwindow.cpp:140 +#: src/konversationmainwindow.cpp:150 msgid "&Watched Nicks Online" msgstr "الأسماء المستعارة الم&راقبة المتصلة" -#: src/konversationmainwindow.cpp:141 +#: src/konversationmainwindow.cpp:151 msgid "&DCC Status" msgstr "حالة &DCC" -#: src/konversationmainwindow.cpp:142 src/konversationmainwindow.cpp:503 -#: src/viewcontainer.cpp:603 +#: src/konversationmainwindow.cpp:152 src/konversationmainwindow.cpp:547 +#: src/viewcontainer.cpp:560 msgid "&Open Logfile" msgstr "&فتح السجل" -#: src/konversationmainwindow.cpp:144 +#: src/konversationmainwindow.cpp:154 msgid "Open the known history for this channel in a new tab" msgstr "فتح التاريخ المعلوم لهذه القناة في لسان جديد" -#: src/konversationmainwindow.cpp:146 src/viewcontainer.cpp:672 +#: src/konversationmainwindow.cpp:156 src/viewcontainer.cpp:581 msgid "&Channel Settings..." msgstr "إعدادات ال&قناة..." -#: src/konversationmainwindow.cpp:148 +#: src/konversationmainwindow.cpp:158 msgid "Open the channel settings dialog for this tab" msgstr "فتح حوار إعدادات القناة لهذا اللسان" -#: src/konversationmainwindow.cpp:150 src/viewcontainer.cpp:594 +#: src/konversationmainwindow.cpp:160 src/viewcontainer.cpp:551 msgid "Channel &List" -msgstr "&قائمة القنوات" +msgstr "لائ&حة القنوات" -#: src/konversationmainwindow.cpp:152 +#: src/konversationmainwindow.cpp:162 msgid "Show a list of all the known channels on this server" -msgstr "يعرض قائمة للقنوات المعروفة في هذا الخادم" +msgstr "" -#: src/konversationmainwindow.cpp:154 +#: src/konversationmainwindow.cpp:164 msgid "&URL Catcher" msgstr "لاقت وصلات &URL" -#: src/konversationmainwindow.cpp:155 +#: src/konversationmainwindow.cpp:165 msgid "List all URLs that have been mentioned recently in a new tab" msgstr "سرد كل وصلات URL التي ذكرت مؤخرا في لسان جديد" -#: src/konversationmainwindow.cpp:159 +#: src/konversationmainwindow.cpp:169 msgid "New &Konsole" msgstr "م&طراف Konsole جديد" -#: src/konversationmainwindow.cpp:160 +#: src/konversationmainwindow.cpp:170 msgid "Open a terminal in a new tab" msgstr "فتح طرفية في لسان جديد" -#: src/konversationmainwindow.cpp:168 +#: src/konversationmainwindow.cpp:178 msgid "&Next Tab" msgstr "اللسان ال&تالي" -#: src/konversationmainwindow.cpp:172 +#: src/konversationmainwindow.cpp:182 msgid "&Previous Tab" msgstr "اللسان ال&سابق" -#: src/konversationmainwindow.cpp:176 +#: src/konversationmainwindow.cpp:186 msgid "Close &Tab" msgstr "غلق ال&لسان" -#: src/konversationmainwindow.cpp:181 src/viewcontainer.cpp:161 +#: src/konversationmainwindow.cpp:188 +#, fuzzy +msgid "Next Active Tab" +msgstr "اللسان ال&تالي" + +#: src/konversationmainwindow.cpp:194 src/viewcontainer.cpp:195 msgid "Move Tab Up" msgstr "تحريك اللسان للأعلى" -#: src/konversationmainwindow.cpp:185 src/viewcontainer.cpp:169 +#: src/konversationmainwindow.cpp:198 src/viewcontainer.cpp:203 msgid "Move Tab Down" msgstr "تحريك اللسان نحو الأسفل" -#: src/konversationmainwindow.cpp:195 src/konversationmainwindow.cpp:204 -#: src/viewcontainer.cpp:270 +#: src/konversationmainwindow.cpp:208 src/konversationmainwindow.cpp:217 +#: src/viewcontainer.cpp:304 msgid "Move Tab Right" msgstr "تحريك اللسان لليمين" -#: src/konversationmainwindow.cpp:197 src/konversationmainwindow.cpp:202 -#: src/viewcontainer.cpp:262 +#: src/konversationmainwindow.cpp:210 src/konversationmainwindow.cpp:215 +#: src/viewcontainer.cpp:296 msgid "Move Tab Left" msgstr "تحريك اللسان لليسار" -#: src/konversationmainwindow.cpp:214 src/konversationmainwindow.cpp:509 +#: src/konversationmainwindow.cpp:227 +#, fuzzy +msgid "Rejoin Channel" +msgstr "&إنضِمام إلى قناة" + +#: src/konversationmainwindow.cpp:230 src/konversationmainwindow.cpp:553 msgid "Enable Notifications" msgstr "تمكين التنبيهات" -#: src/konversationmainwindow.cpp:217 +#: src/konversationmainwindow.cpp:233 +#, fuzzy +msgid "Join on Connect" +msgstr "&إنضِمام إلى قناة" + +#: src/konversationmainwindow.cpp:236 msgid "Set Encoding" msgstr "إختيار الترميز" -#: src/konversationmainwindow.cpp:225 -msgid "Switch To" -msgstr "تبديل إلى" - -#: src/konversationmainwindow.cpp:234 +#: src/konversationmainwindow.cpp:249 #, c-format msgid "Go to Tab %1" msgstr "إذهب إلى اللسان %1" -#: src/konversationmainwindow.cpp:239 +#: src/konversationmainwindow.cpp:254 +#, fuzzy +msgid "Clear &Marker Lines" +msgstr "م&حو اللائحة" + +#: src/konversationmainwindow.cpp:255 +#, fuzzy +msgid "Clear marker lines in the current tab" +msgstr "محو محتويات اللسان الحالي" + +#: src/konversationmainwindow.cpp:257 msgid "&Clear Window" msgstr "&محو النافذة" -#: src/konversationmainwindow.cpp:240 +#: src/konversationmainwindow.cpp:258 msgid "Clear the contents of the current tab" msgstr "محو محتويات اللسان الحالي" -#: src/konversationmainwindow.cpp:242 +#: src/konversationmainwindow.cpp:260 msgid "Clear &All Windows" msgstr "محو &كل النوافذ" -#: src/konversationmainwindow.cpp:243 +#: src/konversationmainwindow.cpp:261 msgid "Clear the contents of all open tabs" msgstr "محو محتويات كل الألسنة المفتوحة" -#: src/konversationmainwindow.cpp:246 src/konversationmainwindow.cpp:510 -#: src/server.cpp:3055 -msgid "Set &Away Globally" -msgstr "حالة &غياب عامة" +#: src/konversationmainwindow.cpp:264 +msgid "Global Away" +msgstr "" -#: src/konversationmainwindow.cpp:250 +#: src/konversationmainwindow.cpp:268 msgid "&Join Channel..." msgstr "ان&ضمام إلى القناة..." -#: src/konversationmainwindow.cpp:259 src/konversationmainwindow.cpp:511 +#: src/konversationmainwindow.cpp:279 src/konversationmainwindow.cpp:555 msgid "&IRC Color..." msgstr "لون &IRC..." -#: src/konversationmainwindow.cpp:260 +#: src/konversationmainwindow.cpp:280 msgid "Set the color of your current IRC message" msgstr "ضبط لون رسالتك IRC الحالية" -#: src/konversationmainwindow.cpp:262 src/konversationmainwindow.cpp:513 -msgid "&Remember Line" +#: src/konversationmainwindow.cpp:282 src/konversationmainwindow.cpp:557 +#, fuzzy +msgid "&Marker Line" msgstr "&تذكر السطر" -#: src/konversationmainwindow.cpp:263 +#: src/konversationmainwindow.cpp:283 msgid "Insert a horizontal line into the current tab that only you can see" msgstr "إدراج سطر أفقي في اللسان الحالي لا يراه إلا أنت" -#: src/konversationmainwindow.cpp:265 src/konversationmainwindow.cpp:512 +#: src/konversationmainwindow.cpp:285 src/konversationmainwindow.cpp:556 msgid "Special &Character..." msgstr "&رموز خاصة..." -#: src/konversationmainwindow.cpp:266 +#: src/konversationmainwindow.cpp:286 msgid "Insert any character into your current IRC message" msgstr "إدراج أي محرف في رسالتك IRC" -#: src/konversationmainwindow.cpp:269 +#: src/konversationmainwindow.cpp:289 msgid "Close &All Open Queries" msgstr "غلق &كل المساءلات المفتوحة" -#: src/konversationmainwindow.cpp:272 +#: src/konversationmainwindow.cpp:292 msgid "Hide Nicklist" msgstr "إخفاء قائمة الأسماء المستعارة" -#: src/konversationmainwindow.cpp:329 -msgid "Are you sure you want to quit Konversation?" -msgstr " هل انت أكيد انك تريد الإنتهاء من Konversation ؟ " +#: src/konversationmainwindow.cpp:354 +#, fuzzy +msgid "" +"You have active DCC file transfers. Are you sure you want to quit " +"Konversation?" +msgstr " هل انت أكيد انك تريد الإنتهاء من \"محادثتك\" ؟ " -#: src/konversationmainwindow.cpp:330 +#: src/konversationmainwindow.cpp:355 src/konversationmainwindow.cpp:364 msgid "Confirm Quit" msgstr "تأكيد الإنتهاء" -#: src/konversationmainwindow.cpp:357 +#: src/konversationmainwindow.cpp:363 +msgid "Are you sure you want to quit Konversation?" +msgstr " هل انت أكيد انك تريد الإنتهاء من \"محادثتك\" ؟ " + +#: src/konversationmainwindow.cpp:395 msgid "" "

Closing the main window will keep Konversation running in the system tray. " "Use Quit from the Konversation menu to quit the application.

" msgstr "" -"

إغلاق النافِذة الرئيسية سيجعل Konversation يتابع الإجراء في صينية النظام. " -"إستعمِل إنهاء في قائمة Konversation لإنهاء التطبيق.

" +"

إغلاق النافِذة الرئيسية سيجعل \"محادثتك\" يتابع الإجراء في صينية النظام. " +"إستعمِل إنهاء في قائمة \"محادثتك\" لإنهاء التطبيق.

" -#: src/konversationmainwindow.cpp:359 +#: src/konversationmainwindow.cpp:397 msgid "Docking in System Tray" msgstr "وضع في صحن النظام" -#: src/konversationmainwindow.cpp:446 +#: src/konversationmainwindow.cpp:490 msgid "" "This will hide the menu bar completely. You can show it again by typing " "%1." msgstr "" " سيخفي هذا شريط القائمة تماماً. يمكنك إظهاره مجدداً عند كِتابة %1." -#: src/konversationmainwindow.cpp:495 +#: src/konversationmainwindow.cpp:539 msgid "Toggle Notifications" msgstr "قلب التنبيهات" -#: src/konversationmainwindow.cpp:496 +#: src/konversationmainwindow.cpp:540 msgid "Toggle Away Globally" msgstr "قلب الغياب العام" -#: src/konversationmainwindow.cpp:497 +#: src/konversationmainwindow.cpp:541 msgid "Insert &IRC Color..." msgstr "إدارج لون &IRC..." -#: src/konversationmainwindow.cpp:498 +#: src/konversationmainwindow.cpp:542 msgid "Insert Special &Character..." msgstr "إدراح م&حرف خاص..." -#: src/konversationmainwindow.cpp:499 -msgid "Insert &Remember Line" -msgstr "إدارج سطر ت&ذكير" +#: src/konversationmainwindow.cpp:543 +#, fuzzy +msgid "Insert &Marker Line" +msgstr "إدارج سطر ت&ذكاري" -#: src/konversationmainwindow.cpp:501 +#: src/konversationmainwindow.cpp:545 msgid "&Channel List" -msgstr "قاءمة &قنوات" +msgstr "لائحة ال&قنوات" + +#: src/konversationmainwindow.cpp:554 +msgid "Set &Away Globally" +msgstr "حالة &غياب عامة" -#: src/outputfilter.cpp:353 +#: src/outputfilter.cpp:320 msgid "Raw" msgstr "خام" -#: src/outputfilter.cpp:400 +#: src/outputfilter.cpp:337 +#, c-format +msgid "Usage: %1queuetuner [on | off]" +msgstr "" + +#: src/outputfilter.cpp:383 msgid "Usage: %1JOIN [password]" msgstr "الاستعمال: %1JOIN [كلمة-المرور]" -#: src/outputfilter.cpp:424 +#: src/outputfilter.cpp:416 msgid "Usage: %1KICK [reason]" msgstr "الاستعمال: %1KICK [السبب]" -#: src/outputfilter.cpp:442 +#: src/outputfilter.cpp:434 msgid "%1KICK only works from within channels." -msgstr "لا يعمل الركل %1KICK إلا من داخل القنوات" +msgstr "" -#: src/outputfilter.cpp:462 +#: src/outputfilter.cpp:454 msgid "%1PART without parameters only works from within a channel or a query." msgstr "لا يعمل المغادرة %1PART بدون معلمة إلا من داخل قناة أو مساءلة." -#: src/outputfilter.cpp:492 +#: src/outputfilter.cpp:484 msgid "%1PART without channel name only works from within a channel." msgstr "لا تعمل المغادرة %1PART بدون اسم قناة إلا من داخل قناة." -#: src/outputfilter.cpp:514 +#: src/outputfilter.cpp:506 msgid "%1TOPIC without parameters only works from within a channel." msgstr "لا يعمل تحديد الموضوع %1TOPIC بدون معلمات إلا من داخل قناة." -#: src/outputfilter.cpp:556 +#: src/outputfilter.cpp:548 msgid "%1TOPIC without channel name only works from within a channel." msgstr "لا يعمل تحديد الموضوع %1TOPIC بدون اسم قناة إلا من داخل قناة." -#: src/konvdcop.cpp:65 src/outputfilter.cpp:569 src/server.cpp:810 -msgid "Gone away for now." -msgstr "غائب حاليا." - -#: src/outputfilter.cpp:596 +#: src/outputfilter.cpp:575 msgid "" "%1NAMES with no target may disconnect you from the server. Specify '*' if you " "really want this." @@ -1312,233 +1558,271 @@ "قد يؤدي استعمال %1NAMES دون هدف إلى فك اتصالك بالخادم. حدد '*' إذا كنت تريد هذا " "حقا." -#: src/outputfilter.cpp:627 +#: src/outputfilter.cpp:596 +#, c-format +msgid "" +"Usage: %1close [window] closes the named channel or query tab, or the current " +"tab if none specified." +msgstr "" + +#: src/outputfilter.cpp:622 msgid "Usage: %1NOTICE " msgstr "الاستعمال: %1NOTICE <المستقبِل> <الرسالة>" -#: src/outputfilter.cpp:633 +#: src/outputfilter.cpp:628 msgid "" "_: %1 is the message, %2 the recipient nickname\n" "Sending notice \"%2\" to %1." msgstr "إرسال الإشعار \"%2\" إلى %1." -#: src/outputfilter.cpp:739 src/outputfilter.cpp:744 +#: src/outputfilter.cpp:647 +#, fuzzy +msgid "Usage: %1ME text" +msgstr "الاستعمال: %1AME text" + +#: src/outputfilter.cpp:767 src/outputfilter.cpp:772 msgid "Sending CTCP-%1 request to %2." msgstr "جاري إرسال طلب CTCP-%1 إلى %2." -#: src/outputfilter.cpp:849 +#: src/outputfilter.cpp:877 msgid "File \"%1\" does not exist." msgstr "الملف \"%1\" غير موجود." -#: src/outputfilter.cpp:854 +#: src/outputfilter.cpp:882 msgid "Usage: %1DCC [SEND nickname filename]" msgstr "الاستعمال %1DCC [SEND nickname filename]" -#: src/outputfilter.cpp:866 +#: src/outputfilter.cpp:894 msgid "Usage: %1DCC [CHAT nickname]" msgstr "الاستعمال: %1DCC [CHAT nickname]" -#: src/outputfilter.cpp:871 +#: src/outputfilter.cpp:899 msgid "Unrecognized command %1DCC %2. Possible commands are SEND, CHAT, CLOSE." msgstr "الأمر %1DCC %2 غير معروف. الأوامر الممكنة هي SEND و CHAT و CLOSE." -#: src/outputfilter.cpp:935 +#: src/outputfilter.cpp:996 msgid "Usage: %1INVITE [channel]" msgstr "الاستعمال: %1INVITE [channel]" -#: src/outputfilter.cpp:950 +#: src/outputfilter.cpp:1011 +#, fuzzy msgid "%1INVITE without channel name works only from within channels." -msgstr "لا يعمل التضييف %1INVITE بدون اسم قناة إلا من داخل القنوات." +msgstr "." -#: src/outputfilter.cpp:962 +#: src/outputfilter.cpp:1023 msgid "%1 is not a channel." msgstr "%1 ليست قناة." -#: src/outputfilter.cpp:976 +#: src/outputfilter.cpp:1037 #, c-format msgid "Usage: %1EXEC