ports/119020: unbroke net/vyqchat with gcc 4.2
Dima Panov
fluffy at fluffy.khv.ru
Wed Dec 26 00:40:02 UTC 2007
>Number: 119020
>Category: ports
>Synopsis: unbroke net/vyqchat with gcc 4.2
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 26 00:40:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Dima Panov
>Release: FreeBSD 8.0-800006-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 8.0-800006-CURRENT #0: Mon Dec 24 18:38:41 VLAT 2007
root at Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot
>Description:
net/vyqchat is broken with gcc 4.2
this patch contains dozen of fixes from svn
>How-To-Repeat:
>Fix:
--- vyqchat.diff begins here ---
diff -urN vyqchat.orig/Makefile vyqchat/Makefile
--- vyqchat.orig/Makefile 2007-12-26 10:27:54.000000000 +1000
+++ vyqchat/Makefile 2007-12-26 10:28:22.000000000 +1000
@@ -37,10 +37,4 @@
LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile
.endif
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN= Does not compile with GCC 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN vyqchat.orig/files/patch-vyqchat-gcc42 vyqchat/files/patch-vyqchat-gcc42
--- vyqchat.orig/files/patch-vyqchat-gcc42 1970-01-01 10:00:00.000000000 +1000
+++ vyqchat/files/patch-vyqchat-gcc42 2007-11-05 01:23:54.000000000 +1000
@@ -0,0 +1,2603 @@
+diff -urN vyqchat-0.2.8/ChangeLog vyqchat-0.2.9/ChangeLog
+--- ChangeLog 2005-07-20 02:13:16.000000000 +1100
++++ ChangeLog 2006-05-17 07:46:38.000000000 +1100
+@@ -1,3 +1,11 @@
++2006-05-xx: 0.2.9 -- lots of fixes
++ -- OpenSSL is now optional (new --with-openssl
++ flag for configure added)
++ -- new hotkey - Ctrl+Enter - for message window
++ -- experimental multicast support (needs testing)
++ -- bnv_have_qt updated (compilation on x86_64 should
++ be possible now)
++
+ 2005-07-19: 0.2.8 -- presence notify packet is sent to requester only,
+ not to all; this should stop flood alerts
+ -- fixed bug with zombie processes in libao and arts
+diff -urN vyqchat-0.2.8/Makefile.in vyqchat-0.2.9/Makefile.in
+--- Makefile.in 2005-07-20 02:52:16.000000000 +1100
++++ Makefile.in 2006-05-17 07:31:25.000000000 +1100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -137,6 +137,7 @@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+diff -urN vyqchat-0.2.8/README vyqchat-0.2.9/README
+--- README 2005-07-19 05:54:08.000000000 +1100
++++ README 2006-05-17 07:24:59.000000000 +1100
+@@ -1,4 +1,4 @@
+-VyQChat v.0.2.7
++VyQChat v.0.2.9
+ (w)by Pawel Stolowski <yogin at linux.bydg.org>
+ Released under terms of GNU General Public License
+
+@@ -17,17 +17,17 @@
+ - gcc C++ compiler
+ - make
+ - Qt 3.3.x
+-- OpenSSL library
+ - XFree-libs
+ Make sure you have headers for these packages installed too (usually named -devel in many
+ distros).
+
+-And optionally for sound support:
++And optionally:
++- OpenSSL library (currently used to obtain random bytes only)
+ - libsndfile
+ - libao (for oss, alsa, aRts, esd... support through libao)
+ - aRts library (for built-in aRts sound support)
+
+-Current version of VyQChat has been tested under Fedora Core 3 with qt 3.3.3.
++Current version of VyQChat has been tested under Fedora Core 5 with qt 3.3.3.
+
+ 3. Installation
+
+diff -urN vyqchat-0.2.8/README-KEYS vyqchat-0.2.9/README-KEYS
+--- README-KEYS 2005-07-19 05:54:08.000000000 +1100
++++ README-KEYS 2006-05-17 07:23:19.000000000 +1100
+@@ -22,4 +22,4 @@
+ Ctrl+A - Away mode
+ Ctrl+F - Offline mode
+
+-Alt+S - Send message (in message window)
++Ctrl+Enter (or Alt+S) - Send message (in message window)
+diff -urN vyqchat-0.2.8/THANKS vyqchat-0.2.9/THANKS
+--- THANKS 2005-07-19 05:54:08.000000000 +1100
++++ THANKS 2006-05-17 07:47:50.000000000 +1100
+@@ -2,5 +2,7 @@
+ ----------
+ Vasily Krysin <sead at mail.ru> - for exhaustive Vypress Chat protocol description
+ Konstantin Vyatkin from Vypress Research - for Vypress Chat 1.9.x protocol description
+-Genix, Mustafa Ogun - for translations
+-Victor Semionov - for many bugreports and suggestions
++Genix - for translation and patches
++Mustafa Ogun - for translations
++Alexey Illarionov - for many fixes
++Victor Semionov - for many bugreports, fixes and suggestions
+diff -urN vyqchat-0.2.8/acinclude.m4 vyqchat-0.2.9/acinclude.m4
+--- acinclude.m4 2005-06-25 07:32:33.000000000 +1100
++++ acinclude.m4 2006-05-11 07:10:30.000000000 +1100
+@@ -1,4 +1,4 @@
+-dnl @synopsis BNV_HAVE_QT [--with-Qt-dir=DIR] [--with-Qt-lib=LIB]
++dnl @synopsis BNV_HAVE_QT [--with-Qt-dir=DIR] [--with-Qt-lib-dir=DIR] [--with-Qt-lib=LIB]
+ dnl @synopsis BNV_HAVE_QT [--with-Qt-include-dir=DIR] [--with-Qt-bin-dir=DIR] [--with-Qt-lib-dir=DIR] [--with-Qt-lib=LIB]
+ dnl
+ dnl @summary Search for Trolltech's Qt GUI framework.
+@@ -76,20 +76,38 @@
+ dnl other variables are set to the empty string.
+ dnl
+ dnl @category InstalledPackages
+-dnl @author Bastiaan Veelo <Bastiaan.N.Veelo at ntnu.no>
+-dnl @version 2005-01-24
++dnl @author Bastiaan Veelo <Bastiaan at Veelo.net>
++dnl @version 2006-03-12
+ dnl @license AllPermissive
+
+-dnl Copyright (C) 2001, 2002, 2003, 2005, Bastiaan Veelo
++dnl Copyright (C) 2001, 2002, 2003, 2005, 2006 Bastiaan Veelo
++
++dnl THANKS! This code includes bug fixes and contributions made by:
++dnl Tim McClarren,
++dnl Dennis R. Weilert,
++dnl Qingning Huo,
++dnl Brian Mingus,
++dnl Jens Hannemann,
++dnl Pavel Roskin,
++dnl Scott J. Bertin.
++
++dnl ChangeLog
++dnl 2006-03-12 * Hide output of ls and fix an m4 quoting problem (due to Scott J. Bertin).
++dnl 2006-02-13 * Check compiler return value instead of parsing the error stream,
++dnl which detected warnings as false negatives (due to Jens Hannemann).
++dnl 2006-02-02 * Spelling of "Success".
++dnl * Fixed unsave test for $bnv_qt_lib without quotes.
++dnl * Put dnl in front of all comments.
++dnl * Changed -l$bnv_qt_lib_dir into -L$bnv_qt_lib_dir (all due to Pavel Roskin).
++dnl 2006-01-19 * Support for 64bit architectures.
++dnl * Updated documentation.
++dnl 2006-01-18: * Fix "cat: bnv_qt_test.c: No such file or directory" (due to Jens Hannemann).
++dnl * Hide output of failing ls.
++dnl 2006-01-11: * Check in /Developer on Mac OS X; Check in $QTDIR (due to Brian Mingus).
+
+ dnl Calls BNV_PATH_QT_DIRECT (contained in this file) as a subroutine.
+ AC_DEFUN([BNV_HAVE_QT],
+ [
+- dnl THANKS! This code includes bug fixes and contributions made by:
+- dnl Tim McClarren,
+- dnl Dennis R. Weilert,
+- dnl Qingning Huo.
+-
+ AC_REQUIRE([AC_PROG_CXX])
+ AC_REQUIRE([AC_PATH_X])
+ AC_REQUIRE([AC_PATH_XTRA])
+@@ -97,10 +115,11 @@
+ AC_MSG_CHECKING(for Qt)
+
+ AC_ARG_WITH([Qt-dir],
+- [ --with-Qt-dir=DIR DIR is equal to \$QTDIR if you have followed the
++ [ --with-Qt-dir=DIR DIR is equal to $QTDIR if you have followed the
+ installation instructions of Trolltech. Header
+ files are in DIR/include, binary utilities are
+- in DIR/bin and the library is in DIR/lib])
++ in DIR/bin. The library is in DIR/lib, unless
++ --with-Qt-lib-dir is also set.])
+ AC_ARG_WITH([Qt-include-dir],
+ [ --with-Qt-include-dir=DIR
+ Qt header files are in DIR])
+@@ -186,7 +205,7 @@
+ fi # $have_qt reflects the system status
+ if test x"$have_qt" = xyes; then
+ QT_CXXFLAGS="-I$bnv_qt_include_dir"
+- if test $bnv_qt_lib = "qt-mt"; then
++ if test x"$bnv_qt_lib" = xqt-mt; then
+ QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
+ fi
+ QT_DIR="$bnv_qt_dir"
+@@ -271,37 +290,33 @@
+ EOF
+
+ bnv_cv_qt_test_result="failure"
+- bnv_try_1="$QT_MOC bnv_qt_test.h -o moc_bnv_qt_test.$ac_ext >/dev/null 2>bnv_qt_test_1.out"
++ bnv_try_1="$QT_MOC bnv_qt_test.h -o moc_bnv_qt_test.$ac_ext >/dev/null 2>/dev/null"
+ AC_TRY_EVAL(bnv_try_1)
+- bnv_err_1=`grep -v '^ *+' bnv_qt_test_1.out | grep -v "^bnv_qt_test.h\$"`
+- if test x"$bnv_err_1" != x; then
++ if test x"$ac_status" != x0; then
+ echo "$bnv_err_1" >&AC_FD_CC
+ echo "configure: could not run $QT_MOC on:" >&AC_FD_CC
+ cat bnv_qt_test.h >&AC_FD_CC
+ else
+- bnv_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_bnv_qt_test.o moc_bnv_qt_test.$ac_ext >/dev/null 2>bnv_qt_test_2.out"
++ bnv_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_bnv_qt_test.o moc_bnv_qt_test.$ac_ext >/dev/null 2>/dev/null"
+ AC_TRY_EVAL(bnv_try_2)
+- bnv_err_2=`grep -v '^ *+' bnv_qt_test_2.out | grep -v "^bnv_qt_test.{$ac_ext}\$"`
+- if test x"$bnv_err_2" != x; then
++ if test x"$ac_status" != x0; then
+ echo "$bnv_err_2" >&AC_FD_CC
+ echo "configure: could not compile:" >&AC_FD_CC
+- cat bnv_qt_test.$ac_ext >&AC_FD_CC
++ cat moc_bnv_qt_test.$ac_ext >&AC_FD_CC
+ else
+- bnv_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o bnv_qt_main.o bnv_qt_main.$ac_ext >/dev/null 2>bnv_qt_test_3.out"
++ bnv_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o bnv_qt_main.o bnv_qt_main.$ac_ext >/dev/null 2>/dev/null"
+ AC_TRY_EVAL(bnv_try_3)
+- bnv_err_3=`grep -v '^ *+' bnv_qt_test_3.out | grep -v "^bnv_qt_main.{$ac_ext}\$"`
+- if test x"$bnv_err_3" != x; then
++ if test x"$ac_status" != x0; then
+ echo "$bnv_err_3" >&AC_FD_CC
+ echo "configure: could not compile:" >&AC_FD_CC
+ cat bnv_qt_main.$ac_ext >&AC_FD_CC
+ else
+- bnv_try_4="$CXX $QT_LIBS $LIBS -o bnv_qt_main bnv_qt_main.o moc_bnv_qt_test.o >/dev/null 2>bnv_qt_test_4.out"
++ bnv_try_4="$CXX $QT_LIBS $LIBS -o bnv_qt_main bnv_qt_main.o moc_bnv_qt_test.o >/dev/null 2>/dev/null"
+ AC_TRY_EVAL(bnv_try_4)
+- bnv_err_4=`grep -v '^ *+' bnv_qt_test_4.out`
+- if test x"$bnv_err_4" != x; then
++ if test x"$ac_status" != x0; then
+ echo "$bnv_err_4" >&AC_FD_CC
+ else
+- bnv_cv_qt_test_result="succes"
++ bnv_cv_qt_test_result="success"
+ fi
+ fi
+ fi
+@@ -315,14 +330,13 @@
+ fi
+
+ rm -f bnv_qt_test.h moc_bnv_qt_test.$ac_ext moc_bnv_qt_test.o \
+- bnv_qt_main.$ac_ext bnv_qt_main.o bnv_qt_main \
+- bnv_qt_test_1.out bnv_qt_test_2.out bnv_qt_test_3.out bnv_qt_test_4.out
++ bnv_qt_main.$ac_ext bnv_qt_main.o bnv_qt_main
+ fi
+ ])
+
+ dnl Internal subroutine of BNV_HAVE_QT
+ dnl Set bnv_qt_dir bnv_qt_include_dir bnv_qt_bin_dir bnv_qt_lib_dir bnv_qt_lib
+-AC_DEFUN(BNV_PATH_QT_DIRECT,
++AC_DEFUN([BNV_PATH_QT_DIRECT],
+ [
+ ## Binary utilities ##
+ if test x"$with_Qt_bin_dir" != x; then
+@@ -337,10 +351,12 @@
+ # Look for the header file in a standard set of common directories.
+ bnv_include_path_list="
+ /usr/include
++ `ls -dr ${QTDIR}/include 2>/dev/null`
+ `ls -dr /usr/include/qt* 2>/dev/null`
+ `ls -dr /usr/lib/qt*/include 2>/dev/null`
+ `ls -dr /usr/local/qt*/include 2>/dev/null`
+ `ls -dr /opt/qt*/include 2>/dev/null`
++ `ls -dr /Developer/qt*/include 2>/dev/null`
+ "
+ for bnv_dir in $bnv_include_path_list; do
+ if test -r "$bnv_dir/$qt_direct_test_header"; then
+@@ -361,19 +377,21 @@
+ # Are these headers located in a traditional Trolltech installation?
+ # That would be $bnv_qt_include_dir stripped from its last element:
+ bnv_possible_qt_dir=`dirname $bnv_qt_include_dir`
+- if test -x $bnv_possible_qt_dir/bin/moc &&
+- ls $bnv_possible_qt_dir/lib/libqt* > /dev/null; then
++ if (test -x $bnv_possible_qt_dir/bin/moc) &&
++ ((ls $bnv_possible_qt_dir/lib/libqt* > /dev/null 2>/dev/null) ||
++ (ls $bnv_possible_qt_dir/lib64/libqt* > /dev/null 2>/dev/null)); then
+ # Then the rest is a piece of cake
+ bnv_qt_dir=$bnv_possible_qt_dir
+ bnv_qt_bin_dir="$bnv_qt_dir/bin"
+- ### Start patch Dennis Weilert
+- #bnv_qt_lib_dir="$bnv_qt_dir/lib"
+ if test x"$with_Qt_lib_dir" != x; then
+ bnv_qt_lib_dir="$with_Qt_lib_dir"
+ else
+- bnv_qt_lib_dir="$bnv_qt_dir/lib"
++ if (test -d $bnv_qt_dir/lib64); then
++ bnv_qt_lib_dir="$bnv_qt_dir/lib64"
++ else
++ bnv_qt_lib_dir="$bnv_qt_dir/lib"
++ fi
+ fi
+- ### End patch Dennis Weilert
+ # Only look for lib if the user did not supply it already
+ if test x"$bnv_qt_lib" = xNO; then
+ bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p |
+@@ -416,7 +434,7 @@
+ AC_TRY_LINK([#include <$qt_direct_test_header>],
+ $qt_direct_test_main,
+ [
+- # Succes.
++ # Success.
+ # We can link with no special library directory.
+ bnv_qt_lib_dir=
+ ], [
+@@ -427,7 +445,7 @@
+ AC_TRY_LINK([#include <$qt_direct_test_header>],
+ $qt_direct_test_main,
+ [
+- # Succes.
++ # Success.
+ # We can link with no special library directory.
+ bnv_qt_lib_dir=
+ ], [
+@@ -438,7 +456,7 @@
+ AC_TRY_LINK([#include <$qt_direct_test_header>],
+ $qt_direct_test_main,
+ [
+- # Succes.
++ # Success.
+ # We can link with no special library directory.
+ bnv_qt_lib_dir=
+ ], [
+@@ -448,18 +466,23 @@
+ bnv_dir_list="
+ `echo $bnv_qt_includes | sed ss/includess`
+ /lib
++ /usr/lib64
+ /usr/lib
++ /usr/local/lib64
+ /usr/local/lib
++ /opt/lib64
+ /opt/lib
++ `ls -dr /usr/lib64/qt* 2>/dev/null`
++ `ls -dr /usr/lib64/qt*/lib64 2>/dev/null`
+ `ls -dr /usr/lib/qt* 2>/dev/null`
+ `ls -dr /usr/local/qt* 2>/dev/null`
+ `ls -dr /opt/qt* 2>/dev/null`
+ "
+ for bnv_dir in $bnv_dir_list; do
+- if ls $bnv_dir/libqt*; then
++ if ls $bnv_dir/libqt* >/dev/null 2>/dev/null; then
+ # Gamble that it's the first one...
+ bnv_qt_lib="`ls $bnv_dir/libqt* | sed -n 1p |
+- sed s@$bnv_dir/lib@@ | sed s/[.].*//`"
++ sed s@$bnv_dir/lib@@ | sed s/[[.]].*//`"
+ bnv_qt_lib_dir="$bnv_dir"
+ break
+ fi
+@@ -469,7 +492,7 @@
+ AC_TRY_LINK([#include <$qt_direct_test_header>],
+ $qt_direct_test_main,
+ [
+- # Succes.
++ # Success.
+ # We can link with no special library directory.
+ bnv_qt_lib_dir=
+ ], [
+@@ -479,7 +502,7 @@
+ ])
+ ])
+ if test x"$bnv_qt_lib_dir" != x; then
+- bnv_qt_LIBS="-l$bnv_qt_lib_dir $LIBS"
++ bnv_qt_LIBS="-L$bnv_qt_lib_dir $LIBS"
+ else
+ bnv_qt_LIBS="$LIBS"
+ fi
+diff -urN vyqchat-0.2.8/aclocal.m4 vyqchat-0.2.9/aclocal.m4
+--- aclocal.m4 2005-07-20 02:52:07.000000000 +1100
++++ aclocal.m4 2006-05-17 07:31:23.000000000 +1100
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005 Free Software Foundation, Inc.
+@@ -19,7 +19,7 @@
+ dnl XIPH_PATH_AO([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+ dnl Test for libao, and define AO_CFLAGS and AO_LIBS
+ dnl
+-AC_DEFUN(XIPH_PATH_AO,
++AC_DEFUN([XIPH_PATH_AO],
+ [dnl
+ dnl Get the cflags and libraries
+ dnl
+@@ -124,63 +124,162 @@
+ rm -f conf.aotest
+ ])
+
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++#
++# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
++#
++# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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.
+
+-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+-dnl also defines GSTUFF_PKG_ERRORS on error
+-AC_DEFUN([PKG_CHECK_MODULES], [
+- succeeded=no
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
++
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists. Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++ m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++ $3])dnl
++fi])
++
++
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$PKG_CONFIG"; then
++ if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ else
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++ [pkg_failed=yes])
++ fi
++else
++ pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
+
+- if test -z "$PKG_CONFIG"; then
+- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+- fi
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- PKG_CONFIG_MIN_VERSION=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- AC_MSG_CHECKING(for $2)
+-
+- if $PKG_CONFIG --exists "$2" ; then
+- AC_MSG_RESULT(yes)
+- succeeded=yes
+-
+- AC_MSG_CHECKING($1_CFLAGS)
+- $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+- AC_MSG_RESULT($$1_CFLAGS)
+-
+- AC_MSG_CHECKING($1_LIBS)
+- $1_LIBS=`$PKG_CONFIG --libs "$2"`
+- AC_MSG_RESULT($$1_LIBS)
+- else
+- $1_CFLAGS=""
+- $1_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+- ifelse([$4], ,echo $$1_PKG_ERRORS,)
++
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
++
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
++
++if test $pkg_failed = yes; then
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+- AC_SUBST($1_CFLAGS)
+- AC_SUBST($1_LIBS)
+- else
+- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
++ ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
+
+- if test $succeeded = yes; then
+- ifelse([$3], , :, [$3])
+- else
+- ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+- fi
+-])
++$$1_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++_PKG_TEXT
++])],
++ [$4])
++elif test $pkg_failed = untried; then
++ ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
++_PKG_TEXT
+
++To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++ [$4])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
+
+ # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+ #
+@@ -199,7 +298,7 @@
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.5])])
++ [AM_AUTOMAKE_VERSION([1.9.6])])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+diff -urN vyqchat-0.2.8/configure vyqchat-0.2.9/configure
+--- configure 2005-07-20 02:52:18.000000000 +1100
++++ configure 2006-05-17 07:31:26.000000000 +1100
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59 for VyQChat 0.2.8.
++# Generated by GNU Autoconf 2.59 for VyQChat 0.2.9.
+ #
+-# Report bugs to <yogin at linux.bydg.org>.
++# Report bugs to <pawel.stolowski at wp.pl>.
+ #
+ # Copyright (C) 2003 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+@@ -269,9 +269,9 @@
+ # Identity of this package.
+ PACKAGE_NAME='VyQChat'
+ PACKAGE_TARNAME='vyqchat'
+-PACKAGE_VERSION='0.2.8'
+-PACKAGE_STRING='VyQChat 0.2.8'
+-PACKAGE_BUGREPORT='yogin at linux.bydg.org'
++PACKAGE_VERSION='0.2.9'
++PACKAGE_STRING='VyQChat 0.2.9'
++PACKAGE_BUGREPORT='pawel.stolowski at wp.pl'
+
+ ac_default_prefix=/usr/local
+ # Factoring default headers for most tests.
+@@ -311,7 +311,7 @@
+ # include <unistd.h>
+ #endif"
+
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS 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 CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP PKG_CONFIG SNDFILE_CFLAGS SNDFILE_LIBS AO_CFLAGS AO_LIBS artscfg OPENSSL_CFLAGS OPENSSL_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS QT_CXXFLAGS QT_DIR QT_LIBS QT_U!
IC QT_MOC LIBAO_LIBS ARTS_CFLAGS ARTS_LIBS LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS 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 CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP PKG_CONFIG ac_pt_PKG_CONFIG SNDFILE_CFLAGS SNDFILE_LIBS AO_CFLAGS AO_LIBS artscfg OPENSSL_CFLAGS OPENSSL_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS QT_CXXFLAGS QT!
_DIR QT_LIBS QT_UIC QT_MOC LIBAO_LIBS ARTS_CFLAGS ARTS_LIBS LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
+@@ -780,6 +780,26 @@
+ ac_env_CPP_value=$CPP
+ ac_cv_env_CPP_set=${CPP+set}
+ ac_cv_env_CPP_value=$CPP
++ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
++ac_env_PKG_CONFIG_value=$PKG_CONFIG
++ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
++ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
++ac_env_SNDFILE_CFLAGS_set=${SNDFILE_CFLAGS+set}
++ac_env_SNDFILE_CFLAGS_value=$SNDFILE_CFLAGS
++ac_cv_env_SNDFILE_CFLAGS_set=${SNDFILE_CFLAGS+set}
++ac_cv_env_SNDFILE_CFLAGS_value=$SNDFILE_CFLAGS
++ac_env_SNDFILE_LIBS_set=${SNDFILE_LIBS+set}
++ac_env_SNDFILE_LIBS_value=$SNDFILE_LIBS
++ac_cv_env_SNDFILE_LIBS_set=${SNDFILE_LIBS+set}
++ac_cv_env_SNDFILE_LIBS_value=$SNDFILE_LIBS
++ac_env_OPENSSL_CFLAGS_set=${OPENSSL_CFLAGS+set}
++ac_env_OPENSSL_CFLAGS_value=$OPENSSL_CFLAGS
++ac_cv_env_OPENSSL_CFLAGS_set=${OPENSSL_CFLAGS+set}
++ac_cv_env_OPENSSL_CFLAGS_value=$OPENSSL_CFLAGS
++ac_env_OPENSSL_LIBS_set=${OPENSSL_LIBS+set}
++ac_env_OPENSSL_LIBS_value=$OPENSSL_LIBS
++ac_cv_env_OPENSSL_LIBS_set=${OPENSSL_LIBS+set}
++ac_cv_env_OPENSSL_LIBS_value=$OPENSSL_LIBS
+
+ #
+ # Report the --help message.
+@@ -788,7 +808,7 @@
+ # Omit some internal or obsolete options to make the list less imposing.
+ # This message is too long to be a string in the A/UX 3.1 sh.
+ cat <<_ACEOF
+-\`configure' configures VyQChat 0.2.8 to adapt to many kinds of systems.
++\`configure' configures VyQChat 0.2.9 to adapt to many kinds of systems.
+
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+
+@@ -854,7 +874,7 @@
+
+ if test -n "$ac_init_help"; then
+ case $ac_init_help in
+- short | recursive ) echo "Configuration of VyQChat 0.2.8:";;
++ short | recursive ) echo "Configuration of VyQChat 0.2.9:";;
+ esac
+ cat <<\_ACEOF
+
+@@ -871,14 +891,16 @@
+ --with-sndfile use libsndfile
+ --with-arts aRts sound support
+ --with-libao libao sound support
++ --with-openssl use OpenSSL
+ --with-ao=PFX Prefix where libao is installed (optional)
+ --with-ao-libraries=DIR Directory where libao library is installed (optional)
+ --with-ao-includes=DIR Directory where libao header files are installed (optional)
+ --with-x use the X Window System
+- --with-Qt-dir=DIR DIR is equal to \$QTDIR if you have followed the
++ --with-Qt-dir=DIR DIR is equal to $QTDIR if you have followed the
+ installation instructions of Trolltech. Header
+ files are in DIR/include, binary utilities are
+- in DIR/bin and the library is in DIR/lib
++ in DIR/bin. The library is in DIR/lib, unless
++ --with-Qt-lib-dir is also set.
+ --with-Qt-include-dir=DIR
+ Qt header files are in DIR
+ --with-Qt-bin-dir=DIR Qt utilities such as moc and uic are in DIR
+@@ -895,11 +917,20 @@
+ CC C compiler command
+ CFLAGS C compiler flags
+ CPP C preprocessor
++ PKG_CONFIG path to pkg-config utility
++ SNDFILE_CFLAGS
++ C compiler flags for SNDFILE, overriding pkg-config
++ SNDFILE_LIBS
++ linker flags for SNDFILE, overriding pkg-config
++ OPENSSL_CFLAGS
++ C compiler flags for OPENSSL, overriding pkg-config
++ OPENSSL_LIBS
++ linker flags for OPENSSL, overriding pkg-config
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+
+-Report bugs to <yogin at linux.bydg.org>.
++Report bugs to <pawel.stolowski at wp.pl>.
+ _ACEOF
+ fi
+
+@@ -995,7 +1026,7 @@
+ test -n "$ac_init_help" && exit 0
+ if $ac_init_version; then
+ cat <<\_ACEOF
+-VyQChat configure 0.2.8
++VyQChat configure 0.2.9
+ generated by GNU Autoconf 2.59
+
+ Copyright (C) 2003 Free Software Foundation, Inc.
+@@ -1009,7 +1040,7 @@
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+
+-It was created by VyQChat $as_me 0.2.8, which was
++It was created by VyQChat $as_me 0.2.9, which was
+ generated by GNU Autoconf 2.59. Invocation command line was
+
+ $ $0 $@
+@@ -1652,7 +1683,7 @@
+
+ # Define the identity of the package.
+ PACKAGE=vyqchat
+- VERSION=0.2.8
++ VERSION=0.2.9
+
+
+ cat >>confdefs.h <<_ACEOF
+@@ -3974,9 +4005,9 @@
+ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+-## ----------------------------------- ##
+-## Report this to yogin at linux.bydg.org ##
+-## ----------------------------------- ##
++## ------------------------------------ ##
++## Report this to pawel.stolowski at wp.pl ##
++## ------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+@@ -4495,16 +4526,24 @@
+ ac_libao=yes
+ fi;
+
++# Check whether --with-openssl or --without-openssl was given.
++if test "${with_openssl+set}" = set; then
++ withval="$with_openssl"
++ ac_ssl=$withval
++else
++ ac_ssl=no
++fi;
++
+ #
+ # sndfile
+ if test "x$ac_sndfile" = "xyes"
+ then
+
+- succeeded=no
+
+- 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
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}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
+@@ -4529,7 +4568,6 @@
+ done
+ done
+
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+ esac
+ fi
+@@ -4543,58 +4581,137 @@
+ echo "${ECHO_T}no" >&6
+ fi
+
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++ ac_pt_PKG_CONFIG=$PKG_CONFIG
++ # 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_ac_pt_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $ac_pt_PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_ac_pt_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
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- PKG_CONFIG_MIN_VERSION=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- echo "$as_me:$LINENO: checking for sndfile >= 1.0.5" >&5
+-echo $ECHO_N "checking for sndfile >= 1.0.5... $ECHO_C" >&6
++ ;;
++esac
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+- if $PKG_CONFIG --exists "sndfile >= 1.0.5" ; then
+- echo "$as_me:$LINENO: result: yes" >&5
++if test -n "$ac_pt_PKG_CONFIG"; then
++ echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
++else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++ PKG_CONFIG=$ac_pt_PKG_CONFIG
++else
++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++fi
++
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=0.9.0
++ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+- succeeded=yes
++ else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++ PKG_CONFIG=""
++ fi
+
+- echo "$as_me:$LINENO: checking SNDFILE_CFLAGS" >&5
+-echo $ECHO_N "checking SNDFILE_CFLAGS... $ECHO_C" >&6
+- SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile >= 1.0.5"`
+- echo "$as_me:$LINENO: result: $SNDFILE_CFLAGS" >&5
+-echo "${ECHO_T}$SNDFILE_CFLAGS" >&6
+-
+- echo "$as_me:$LINENO: checking SNDFILE_LIBS" >&5
+-echo $ECHO_N "checking SNDFILE_LIBS... $ECHO_C" >&6
+- SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile >= 1.0.5"`
+- echo "$as_me:$LINENO: result: $SNDFILE_LIBS" >&5
+-echo "${ECHO_T}$SNDFILE_LIBS" >&6
+- else
+- SNDFILE_CFLAGS=""
+- SNDFILE_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- SNDFILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sndfile >= 1.0.5"`
++fi
+
+- fi
++pkg_failed=no
++echo "$as_me:$LINENO: checking for SNDFILE" >&5
++echo $ECHO_N "checking for SNDFILE... $ECHO_C" >&6
+
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SNDFILE_CFLAGS"; then
++ pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.5\"") >&5
++ ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile >= 1.0.5" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SNDFILE_LIBS"; then
++ pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.5\"") >&5
++ ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile >= 1.0.5" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
+
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
+
+- if test $succeeded = yes; then
+- ac_sndfile=yes
+- else
+- ac_sndfile=no
+- fi
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sndfile >= 1.0.5"`
++ else
++ SNDFILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sndfile >= 1.0.5"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$SNDFILE_PKG_ERRORS" >&5
+
++ ac_sndfile=no
++elif test $pkg_failed = untried; then
++ ac_sndfile=no
++else
++ SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
++ SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
++ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++ ac_sndfile=yes
++fi
+ fi
+
+ if test "x$ac_sndfile" = "xno"
+@@ -5052,108 +5169,87 @@
+ fi
+ fi
+
++if test "x$ac_ssl" = "xyes"
++then
+
++pkg_failed=no
++echo "$as_me:$LINENO: checking for OPENSSL" >&5
++echo $ECHO_N "checking for OPENSSL... $ECHO_C" >&6
+
+- succeeded=no
+-
+- 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
++if test -n "$PKG_CONFIG"; then
++ if test -n "$OPENSSL_CFLAGS"; then
++ pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl >= 0.9.6\"") >&5
++ ($PKG_CONFIG --exists --print-errors "openssl >= 0.9.6") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 0.9.6" 2>/dev/null`
+ 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
+ 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
++ if test -n "$OPENSSL_LIBS"; then
++ pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl >= 0.9.6\"") >&5
++ ($PKG_CONFIG --exists --print-errors "openssl >= 0.9.6") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 0.9.6" 2>/dev/null`
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
+ fi
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- PKG_CONFIG_MIN_VERSION=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- echo "$as_me:$LINENO: checking for openssl >= 0.9.6" >&5
+-echo $ECHO_N "checking for openssl >= 0.9.6... $ECHO_C" >&6
+
+- if $PKG_CONFIG --exists "openssl >= 0.9.6" ; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+- succeeded=yes
++if test $pkg_failed = yes; then
+
+- echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5
+-echo $ECHO_N "checking OPENSSL_CFLAGS... $ECHO_C" >&6
+- OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 0.9.6"`
+- echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5
+-echo "${ECHO_T}$OPENSSL_CFLAGS" >&6
+-
+- echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5
+-echo $ECHO_N "checking OPENSSL_LIBS... $ECHO_C" >&6
+- OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 0.9.6"`
+- echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5
+-echo "${ECHO_T}$OPENSSL_LIBS" >&6
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl >= 0.9.6"`
+ else
+- OPENSSL_CFLAGS=""
+- OPENSSL_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl >= 0.9.6"`
+-
++ OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl >= 0.9.6"`
+ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$OPENSSL_PKG_ERRORS" >&5
+
++ ac_ssl=no
++elif test $pkg_failed = untried; then
++ ac_ssl=no
++else
++ OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
++ OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
++ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++ ac_ssl=yes
++fi
++ if test "x$HAVE_OPENSSL" = "xno"
++ then
+
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_OPENSSL 1
++_ACEOF
+
+- else
+- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
+-
+- if test $succeeded = yes; then
+- ac_ssl=yes
+- else
+- ac_ssl=no
+- fi
+-
+-if test "x$HAVE_OPENSSL" = "xno"
+-then
+- { { echo "$as_me:$LINENO: error: \"OpenSSL not found!\"" >&5
+-echo "$as_me: error: \"OpenSSL not found!\"" >&2;}
+- { (exit 1); exit 1; }; };
++ { echo "$as_me:$LINENO: \"OpenSSL not found -- will be disabled\"" >&5
++echo "$as_me: \"OpenSSL not found -- will be disabled\"" >&6;};
++ fi
+ fi
+
+ echo "$as_me:$LINENO: checking for X" >&5
+@@ -5251,7 +5347,7 @@
+ /usr/openwin/share/include'
+
+ if test "$ac_x_includes" = no; then
+- # Guess where to find include files, by looking for Intrinsic.h.
++ # Guess where to find include files, by looking for Xlib.h.
+ # First, try using that file with no special directory specified.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+@@ -5259,7 +5355,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <X11/Intrinsic.h>
++#include <X11/Xlib.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -5286,7 +5382,7 @@
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ for ac_dir in $ac_x_header_dirs; do
+- if test -r "$ac_dir/X11/Intrinsic.h"; then
++ if test -r "$ac_dir/X11/Xlib.h"; then
+ ac_x_includes=$ac_dir
+ break
+ fi
+@@ -5307,11 +5403,11 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <X11/Intrinsic.h>
++#include <X11/Xlib.h>
+ int
+ main ()
+ {
+-XtMalloc (0)
++XrmInitialize ()
+ ;
+ return 0;
+ }
+@@ -6549,7 +6645,6 @@
+
+
+
+-
+ echo "$as_me:$LINENO: checking for Qt" >&5
+ echo $ECHO_N "checking for Qt... $ECHO_C" >&6
+
+@@ -6654,10 +6749,12 @@
+ # Look for the header file in a standard set of common directories.
+ bnv_include_path_list="
+ /usr/include
++ `ls -dr ${QTDIR}/include 2>/dev/null`
+ `ls -dr /usr/include/qt* 2>/dev/null`
+ `ls -dr /usr/lib/qt*/include 2>/dev/null`
+ `ls -dr /usr/local/qt*/include 2>/dev/null`
+ `ls -dr /opt/qt*/include 2>/dev/null`
++ `ls -dr /Developer/qt*/include 2>/dev/null`
+ "
+ for bnv_dir in $bnv_include_path_list; do
+ if test -r "$bnv_dir/$qt_direct_test_header"; then
+@@ -6677,19 +6774,21 @@
+ # Are these headers located in a traditional Trolltech installation?
+ # That would be $bnv_qt_include_dir stripped from its last element:
+ bnv_possible_qt_dir=`dirname $bnv_qt_include_dir`
+- if test -x $bnv_possible_qt_dir/bin/moc &&
+- ls $bnv_possible_qt_dir/lib/libqt* > /dev/null; then
++ if (test -x $bnv_possible_qt_dir/bin/moc) &&
++ ((ls $bnv_possible_qt_dir/lib/libqt* > /dev/null 2>/dev/null) ||
++ (ls $bnv_possible_qt_dir/lib64/libqt* > /dev/null 2>/dev/null)); then
+ # Then the rest is a piece of cake
+ bnv_qt_dir=$bnv_possible_qt_dir
+ bnv_qt_bin_dir="$bnv_qt_dir/bin"
+- ### Start patch Dennis Weilert
+- #bnv_qt_lib_dir="$bnv_qt_dir/lib"
+ if test x"$with_Qt_lib_dir" != x; then
+ bnv_qt_lib_dir="$with_Qt_lib_dir"
+ else
+- bnv_qt_lib_dir="$bnv_qt_dir/lib"
++ if (test -d $bnv_qt_dir/lib64); then
++ bnv_qt_lib_dir="$bnv_qt_dir/lib64"
++ else
++ bnv_qt_lib_dir="$bnv_qt_dir/lib"
++ fi
+ fi
+- ### End patch Dennis Weilert
+ # Only look for lib if the user did not supply it already
+ if test x"$bnv_qt_lib" = xNO; then
+ bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p |
+@@ -6767,7 +6866,7 @@
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+- # Succes.
++ # Success.
+ # We can link with no special library directory.
+ bnv_qt_lib_dir=
+
+@@ -6818,7 +6917,7 @@
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+- # Succes.
++ # Success.
+ # We can link with no special library directory.
+ bnv_qt_lib_dir=
+
+@@ -6869,7 +6968,7 @@
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+- # Succes.
++ # Success.
+ # We can link with no special library directory.
+ bnv_qt_lib_dir=
+
+@@ -6884,18 +6983,23 @@
+ bnv_dir_list="
+ `echo $bnv_qt_includes | sed ss/includess`
+ /lib
++ /usr/lib64
+ /usr/lib
++ /usr/local/lib64
+ /usr/local/lib
++ /opt/lib64
+ /opt/lib
++ `ls -dr /usr/lib64/qt* 2>/dev/null`
++ `ls -dr /usr/lib64/qt*/lib64 2>/dev/null`
+ `ls -dr /usr/lib/qt* 2>/dev/null`
+ `ls -dr /usr/local/qt* 2>/dev/null`
+ `ls -dr /opt/qt* 2>/dev/null`
+ "
+ for bnv_dir in $bnv_dir_list; do
+- if ls $bnv_dir/libqt*; then
++ if ls $bnv_dir/libqt* >/dev/null 2>/dev/null; then
+ # Gamble that it's the first one...
+ bnv_qt_lib="`ls $bnv_dir/libqt* | sed -n 1p |
+- sed s@$bnv_dir/lib@@ | sed s/..*//`"
++ sed s@$bnv_dir/lib@@ | sed s/[.].*//`"
+ bnv_qt_lib_dir="$bnv_dir"
+ break
+ fi
+@@ -6940,7 +7044,7 @@
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+- # Succes.
++ # Success.
+ # We can link with no special library directory.
+ bnv_qt_lib_dir=
+
+@@ -6967,7 +7071,7 @@
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test x"$bnv_qt_lib_dir" != x; then
+- bnv_qt_LIBS="-l$bnv_qt_lib_dir $LIBS"
++ bnv_qt_LIBS="-L$bnv_qt_lib_dir $LIBS"
+ else
+ bnv_qt_LIBS="$LIBS"
+ fi
+@@ -6995,7 +7099,7 @@
+ fi # $have_qt reflects the system status
+ if test x"$have_qt" = xyes; then
+ QT_CXXFLAGS="-I$bnv_qt_include_dir"
+- if test $bnv_qt_lib = "qt-mt"; then
++ if test x"$bnv_qt_lib" = xqt-mt; then
+ QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT"
+ fi
+ QT_DIR="$bnv_qt_dir"
+@@ -7090,53 +7194,49 @@
+ EOF
+
+ bnv_cv_qt_test_result="failure"
+- bnv_try_1="$QT_MOC bnv_qt_test.h -o moc_bnv_qt_test.$ac_ext >/dev/null 2>bnv_qt_test_1.out"
++ bnv_try_1="$QT_MOC bnv_qt_test.h -o moc_bnv_qt_test.$ac_ext >/dev/null 2>/dev/null"
+ { (eval echo "$as_me:$LINENO: \"$bnv_try_1\"") >&5
+ (eval $bnv_try_1) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+- bnv_err_1=`grep -v '^ *+' bnv_qt_test_1.out | grep -v "^bnv_qt_test.h\$"`
+- if test x"$bnv_err_1" != x; then
++ if test x"$ac_status" != x0; then
+ echo "$bnv_err_1" >&5
+ echo "configure: could not run $QT_MOC on:" >&5
+ cat bnv_qt_test.h >&5
+ else
+- bnv_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_bnv_qt_test.o moc_bnv_qt_test.$ac_ext >/dev/null 2>bnv_qt_test_2.out"
++ bnv_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_bnv_qt_test.o moc_bnv_qt_test.$ac_ext >/dev/null 2>/dev/null"
+ { (eval echo "$as_me:$LINENO: \"$bnv_try_2\"") >&5
+ (eval $bnv_try_2) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+- bnv_err_2=`grep -v '^ *+' bnv_qt_test_2.out | grep -v "^bnv_qt_test.{$ac_ext}\$"`
+- if test x"$bnv_err_2" != x; then
++ if test x"$ac_status" != x0; then
+ echo "$bnv_err_2" >&5
+ echo "configure: could not compile:" >&5
+- cat bnv_qt_test.$ac_ext >&5
++ cat moc_bnv_qt_test.$ac_ext >&5
+ else
+- bnv_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o bnv_qt_main.o bnv_qt_main.$ac_ext >/dev/null 2>bnv_qt_test_3.out"
++ bnv_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o bnv_qt_main.o bnv_qt_main.$ac_ext >/dev/null 2>/dev/null"
+ { (eval echo "$as_me:$LINENO: \"$bnv_try_3\"") >&5
+ (eval $bnv_try_3) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+- bnv_err_3=`grep -v '^ *+' bnv_qt_test_3.out | grep -v "^bnv_qt_main.{$ac_ext}\$"`
+- if test x"$bnv_err_3" != x; then
++ if test x"$ac_status" != x0; then
+ echo "$bnv_err_3" >&5
+ echo "configure: could not compile:" >&5
+ cat bnv_qt_main.$ac_ext >&5
+ else
+- bnv_try_4="$CXX $QT_LIBS $LIBS -o bnv_qt_main bnv_qt_main.o moc_bnv_qt_test.o >/dev/null 2>bnv_qt_test_4.out"
++ bnv_try_4="$CXX $QT_LIBS $LIBS -o bnv_qt_main bnv_qt_main.o moc_bnv_qt_test.o >/dev/null 2>/dev/null"
+ { (eval echo "$as_me:$LINENO: \"$bnv_try_4\"") >&5
+ (eval $bnv_try_4) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+- bnv_err_4=`grep -v '^ *+' bnv_qt_test_4.out`
+- if test x"$bnv_err_4" != x; then
++ if test x"$ac_status" != x0; then
+ echo "$bnv_err_4" >&5
+ else
+- bnv_cv_qt_test_result="succes"
++ bnv_cv_qt_test_result="success"
+ fi
+ fi
+ fi
+@@ -7156,8 +7256,7 @@
+ fi
+
+ rm -f bnv_qt_test.h moc_bnv_qt_test.$ac_ext moc_bnv_qt_test.o \
+- bnv_qt_main.$ac_ext bnv_qt_main.o bnv_qt_main \
+- bnv_qt_test_1.out bnv_qt_test_2.out bnv_qt_test_3.out bnv_qt_test_4.out
++ bnv_qt_main.$ac_ext bnv_qt_main.o bnv_qt_main
+ fi
+
+ if test "x$have_qt" = "xno"
+@@ -7559,7 +7658,7 @@
+ } >&5
+ cat >&5 <<_CSEOF
+
+-This file was extended by VyQChat $as_me 0.2.8, which was
++This file was extended by VyQChat $as_me 0.2.9, which was
+ generated by GNU Autoconf 2.59. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+@@ -7622,7 +7721,7 @@
+
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+-VyQChat config.status 0.2.8
++VyQChat config.status 0.2.9
+ configured by $0, generated by GNU Autoconf 2.59,
+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+@@ -7872,6 +7971,7 @@
+ s, at CPP@,$CPP,;t t
+ s, at EGREP@,$EGREP,;t t
+ s, at PKG_CONFIG@,$PKG_CONFIG,;t t
++s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
+ s, at SNDFILE_CFLAGS@,$SNDFILE_CFLAGS,;t t
+ s, at SNDFILE_LIBS@,$SNDFILE_LIBS,;t t
+ s, at AO_CFLAGS@,$AO_CFLAGS,;t t
+diff -urN vyqchat-0.2.8/configure.in vyqchat-0.2.9/configure.in
+--- configure.in 2005-07-20 02:51:41.000000000 +1100
++++ configure.in 2006-05-17 07:30:51.000000000 +1100
+@@ -1,6 +1,6 @@
+ # Process this file with autoconf to produce a configure script.
+-AC_INIT(VyQChat, 0.2.8, yogin at linux.bydg.org)
+-AM_INIT_AUTOMAKE(vyqchat, 0.2.8)
++AC_INIT(VyQChat, 0.2.9, pawel.stolowski at wp.pl)
++AM_INIT_AUTOMAKE(vyqchat, 0.2.9)
+ AC_CONFIG_HEADERS([src/config.h])
+ AC_PREFIX_DEFAULT([/usr/local])
+
+@@ -25,6 +25,7 @@
+ AC_ARG_WITH(libsndfile,AC_HELP_STRING([--with-sndfile],[use libsndfile]),[ac_sndfile=$withval],[ac_sndfile=yes])
+ AC_ARG_WITH(arts,AC_HELP_STRING([--with-arts],[aRts sound support]),[ac_arts=$withval],[ac_arts=yes])
+ AC_ARG_WITH(sound,AC_HELP_STRING([--with-libao],[libao sound support]),[ac_libao=$withval],[ac_libao=yes])
++AC_ARG_WITH(openssl,AC_HELP_STRING([--with-openssl],[use OpenSSL]),[ac_ssl=$withval],[ac_ssl=no])
+
+ #
+ # sndfile
+@@ -63,11 +64,14 @@
+ fi
+ fi
+
+-
+-PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.6, ac_ssl=yes,ac_ssl=no)
+-if test "x$HAVE_OPENSSL" = "xno"
++if test "x$ac_ssl" = "xyes"
+ then
+- AC_MSG_ERROR("OpenSSL not found!", 1);
++ PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.6, ac_ssl=yes,ac_ssl=no)
++ if test "x$HAVE_OPENSSL" = "xno"
++ then
++ AC_DEFINE(HAVE_OPENSSL,1,[use OpenSSL])
++ AC_MSG_NOTICE("OpenSSL not found -- will be disabled");
++ fi
+ fi
+
+ BNV_HAVE_QT
+diff -urN vyqchat-0.2.8/gfx/Makefile vyqchat-0.2.9/gfx/Makefile
+--- gfx/Makefile 2005-07-20 02:52:41.000000000 +1100
++++ gfx/Makefile 2006-05-17 07:32:07.000000000 +1100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # gfx/Makefile. Generated from Makefile.in by configure.
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -59,22 +59,22 @@
+ AMDEP_FALSE = #
+ AMDEP_TRUE =
+ AMTAR = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run tar
+-AO_CFLAGS = -I/home/yogin/tmp//include
+-AO_LIBS = -L/home/yogin/tmp//lib -lao -ldl
+-ARTS_CFLAGS = -I/usr/include/kde/artsc -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+-ARTS_LIBS = -L/usr/lib -ldl -lartsc -lpthread -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
++AO_CFLAGS = -I/home/yogin/tmp/include
++AO_LIBS = -L/home/yogin/tmp/lib -lao -ldl
++ARTS_CFLAGS = -I/usr/include/kde/artsc -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
++ARTS_LIBS = -L/usr/lib64 -ldl -lartsc -lpthread -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
+ AUTOCONF = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run autoconf
+ AUTOHEADER = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run autoheader
+ AUTOMAKE = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run automake-1.9
+ AWK = gawk
+ CC = gcc
+ CCDEPMODE = depmode=gcc3
+-CFLAGS = -march=athlon-xp -O2 -fomit-frame-pointer
++CFLAGS = -march=athlon64 -O2 -fomit-frame-pointer
+ CPP = gcc -E
+-CPPFLAGS = -march=athlon-xp -O2 -fomit-frame-pointer
++CPPFLAGS = -march=athlon64 -O2 -fomit-frame-pointer
+ CXX = g++
+ CXXDEPMODE = depmode=gcc3
+-CXXFLAGS = -march=athlon-xp -O2 -fomit-frame-pointer
++CXXFLAGS = -march=athlon64 -O2 -fomit-frame-pointer
+ CYGPATH_W = echo
+ DEFS = -DHAVE_CONFIG_H
+ DEPDIR = .deps
+@@ -94,34 +94,35 @@
+ LTLIBOBJS =
+ MAKEINFO = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run makeinfo
+ OBJEXT = o
+-OPENSSL_CFLAGS = -I/usr/kerberos/include
+-OPENSSL_LIBS = -L/usr/kerberos/lib -lssl -lcrypto -lgssapi_krb5 -lkrb5 -lcom_err -lk5crypto -lresolv -ldl -lz
++OPENSSL_CFLAGS =
++OPENSSL_LIBS =
+ PACKAGE = vyqchat
+-PACKAGE_BUGREPORT = yogin at linux.bydg.org
++PACKAGE_BUGREPORT = pawel.stolowski at wp.pl
+ PACKAGE_NAME = VyQChat
+-PACKAGE_STRING = VyQChat 0.2.8
++PACKAGE_STRING = VyQChat 0.2.9
+ PACKAGE_TARNAME = vyqchat
+-PACKAGE_VERSION = 0.2.8
++PACKAGE_VERSION = 0.2.9
+ PATH_SEPARATOR = :
+ PKG_CONFIG = /usr/bin/pkg-config
+-QT_CXXFLAGS = -I/usr/lib/qt-3.3/include -DQT_THREAD_SUPPORT
+-QT_DIR = /usr/lib/qt-3.3
+-QT_LIBS = -L/usr/lib/qt-3.3/lib -lqt-mt -lSM -lICE -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi
+-QT_MOC = /usr/lib/qt-3.3/bin/moc
+-QT_UIC = /usr/lib/qt-3.3/bin/uic
++QT_CXXFLAGS = -I/usr/lib64/qt-3.3/include -DQT_THREAD_SUPPORT
++QT_DIR = /usr/lib64/qt-3.3
++QT_LIBS = -L/usr/lib64/qt-3.3/lib -lqt-mt -lSM -lICE -lX11 -lXext -lXmu -lXt -lXi
++QT_MOC = /usr/lib64/qt-3.3/bin/moc
++QT_UIC = /usr/lib64/qt-3.3/bin/uic
+ SET_MAKE =
+ SHELL = /bin/sh
+ SNDFILE_CFLAGS =
+ SNDFILE_LIBS = -lsndfile
+ STRIP =
+-VERSION = 0.2.8
+-X_CFLAGS = -I/usr/X11R6/include
++VERSION = 0.2.9
++X_CFLAGS =
+ X_EXTRA_LIBS =
+-X_LIBS = -L/usr/X11R6/lib
++X_LIBS =
+ X_PRE_LIBS = -lSM -lICE
+ ac_ct_CC = gcc
+ ac_ct_CXX = g++
+ ac_ct_STRIP =
++ac_pt_PKG_CONFIG = /usr/bin/pkg-config
+ am__fastdepCC_FALSE = #
+ am__fastdepCC_TRUE =
+ am__fastdepCXX_FALSE = #
+@@ -146,7 +147,7 @@
+ mandir = ${prefix}/man
+ mkdir_p = mkdir -p --
+ oldincludedir = /usr/include
+-prefix = /home/yogin/tmp/
++prefix = /home/yogin/tmp
+ program_transform_name = s,x,x,
+ sbindir = ${exec_prefix}/sbin
+ sharedstatedir = ${prefix}/com
+diff -urN vyqchat-0.2.8/gfx/Makefile.in vyqchat-0.2.9/gfx/Makefile.in
+--- gfx/Makefile.in 2005-07-20 02:52:12.000000000 +1100
++++ gfx/Makefile.in 2006-05-17 07:31:24.000000000 +1100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -122,6 +122,7 @@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+diff -urN vyqchat-0.2.8/gfx/crystal/Makefile vyqchat-0.2.9/gfx/crystal/Makefile
+--- gfx/crystal/Makefile 2005-07-20 02:52:41.000000000 +1100
++++ gfx/crystal/Makefile 2006-05-17 07:32:07.000000000 +1100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # gfx/crystal/Makefile. Generated from Makefile.in by configure.
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -60,22 +60,22 @@
+ AMDEP_FALSE = #
+ AMDEP_TRUE =
+ AMTAR = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run tar
+-AO_CFLAGS = -I/home/yogin/tmp//include
+-AO_LIBS = -L/home/yogin/tmp//lib -lao -ldl
+-ARTS_CFLAGS = -I/usr/include/kde/artsc -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+-ARTS_LIBS = -L/usr/lib -ldl -lartsc -lpthread -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
++AO_CFLAGS = -I/home/yogin/tmp/include
++AO_LIBS = -L/home/yogin/tmp/lib -lao -ldl
++ARTS_CFLAGS = -I/usr/include/kde/artsc -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
++ARTS_LIBS = -L/usr/lib64 -ldl -lartsc -lpthread -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
+ AUTOCONF = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run autoconf
+ AUTOHEADER = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run autoheader
+ AUTOMAKE = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run automake-1.9
+ AWK = gawk
+ CC = gcc
+ CCDEPMODE = depmode=gcc3
+-CFLAGS = -march=athlon-xp -O2 -fomit-frame-pointer
++CFLAGS = -march=athlon64 -O2 -fomit-frame-pointer
+ CPP = gcc -E
+-CPPFLAGS = -march=athlon-xp -O2 -fomit-frame-pointer
++CPPFLAGS = -march=athlon64 -O2 -fomit-frame-pointer
+ CXX = g++
+ CXXDEPMODE = depmode=gcc3
+-CXXFLAGS = -march=athlon-xp -O2 -fomit-frame-pointer
++CXXFLAGS = -march=athlon64 -O2 -fomit-frame-pointer
+ CYGPATH_W = echo
+ DEFS = -DHAVE_CONFIG_H
+ DEPDIR = .deps
+@@ -95,34 +95,35 @@
+ LTLIBOBJS =
+ MAKEINFO = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run makeinfo
+ OBJEXT = o
+-OPENSSL_CFLAGS = -I/usr/kerberos/include
+-OPENSSL_LIBS = -L/usr/kerberos/lib -lssl -lcrypto -lgssapi_krb5 -lkrb5 -lcom_err -lk5crypto -lresolv -ldl -lz
++OPENSSL_CFLAGS =
++OPENSSL_LIBS =
+ PACKAGE = vyqchat
+-PACKAGE_BUGREPORT = yogin at linux.bydg.org
++PACKAGE_BUGREPORT = pawel.stolowski at wp.pl
+ PACKAGE_NAME = VyQChat
+-PACKAGE_STRING = VyQChat 0.2.8
++PACKAGE_STRING = VyQChat 0.2.9
+ PACKAGE_TARNAME = vyqchat
+-PACKAGE_VERSION = 0.2.8
++PACKAGE_VERSION = 0.2.9
+ PATH_SEPARATOR = :
+ PKG_CONFIG = /usr/bin/pkg-config
+-QT_CXXFLAGS = -I/usr/lib/qt-3.3/include -DQT_THREAD_SUPPORT
+-QT_DIR = /usr/lib/qt-3.3
+-QT_LIBS = -L/usr/lib/qt-3.3/lib -lqt-mt -lSM -lICE -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi
+-QT_MOC = /usr/lib/qt-3.3/bin/moc
+-QT_UIC = /usr/lib/qt-3.3/bin/uic
++QT_CXXFLAGS = -I/usr/lib64/qt-3.3/include -DQT_THREAD_SUPPORT
++QT_DIR = /usr/lib64/qt-3.3
++QT_LIBS = -L/usr/lib64/qt-3.3/lib -lqt-mt -lSM -lICE -lX11 -lXext -lXmu -lXt -lXi
++QT_MOC = /usr/lib64/qt-3.3/bin/moc
++QT_UIC = /usr/lib64/qt-3.3/bin/uic
+ SET_MAKE =
+ SHELL = /bin/sh
+ SNDFILE_CFLAGS =
+ SNDFILE_LIBS = -lsndfile
+ STRIP =
+-VERSION = 0.2.8
+-X_CFLAGS = -I/usr/X11R6/include
++VERSION = 0.2.9
++X_CFLAGS =
+ X_EXTRA_LIBS =
+-X_LIBS = -L/usr/X11R6/lib
++X_LIBS =
+ X_PRE_LIBS = -lSM -lICE
+ ac_ct_CC = gcc
+ ac_ct_CXX = g++
+ ac_ct_STRIP =
++ac_pt_PKG_CONFIG = /usr/bin/pkg-config
+ am__fastdepCC_FALSE = #
+ am__fastdepCC_TRUE =
+ am__fastdepCXX_FALSE = #
+@@ -147,7 +148,7 @@
+ mandir = ${prefix}/man
+ mkdir_p = mkdir -p --
+ oldincludedir = /usr/include
+-prefix = /home/yogin/tmp/
++prefix = /home/yogin/tmp
+ program_transform_name = s,x,x,
+ sbindir = ${exec_prefix}/sbin
+ sharedstatedir = ${prefix}/com
+diff -urN vyqchat-0.2.8/gfx/crystal/Makefile.in vyqchat-0.2.9/gfx/crystal/Makefile.in
+--- gfx/crystal/Makefile.in 2005-07-20 02:52:12.000000000 +1100
++++ gfx/crystal/Makefile.in 2006-05-17 07:31:24.000000000 +1100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -123,6 +123,7 @@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+diff -urN vyqchat-0.2.8/gfx/default/.svn/entries vyqchat-0.2.9/gfx/default/.svn/entries
+--- gfx/default/.svn/entries 2005-07-19 05:54:07.000000000 +1100
++++ gfx/default/.svn/entries 2006-05-16 07:01:56.000000000 +1100
+@@ -100,7 +100,7 @@
+ <entry
+ committed-rev="82"
+ name="COPYING"
+- text-time="2005-07-18T18:54:07.000000Z"
++ text-time="2006-04-05T18:04:22.000000Z"
+ committed-date="2005-07-18T18:52:23.286359Z"
+ checksum="05a1e91b6743117270fe1201dd07f228"
+ kind="file"
+@@ -163,18 +163,18 @@
+ prop-time="2005-07-18T18:54:07.000000Z"/>
+ <entry
+ committed-rev="82"
+- name="channel.png"
++ name="massmessage.png"
+ text-time="2005-07-18T18:54:07.000000Z"
+ committed-date="2005-07-18T18:52:23.286359Z"
+- checksum="3e7aaff888db4a4c851fa760e6d24c7e"
++ checksum="d5c0c5d3acac86ba0c55470273850560"
+ kind="file"
+ prop-time="2005-07-18T18:54:07.000000Z"/>
+ <entry
+ committed-rev="82"
+- name="massmessage.png"
++ name="channel.png"
+ text-time="2005-07-18T18:54:07.000000Z"
+ committed-date="2005-07-18T18:52:23.286359Z"
+- checksum="d5c0c5d3acac86ba0c55470273850560"
++ checksum="3e7aaff888db4a4c851fa760e6d24c7e"
+ kind="file"
+ prop-time="2005-07-18T18:54:07.000000Z"/>
+ <entry
+@@ -187,18 +187,18 @@
+ prop-time="2005-07-18T18:54:07.000000Z"/>
+ <entry
+ committed-rev="82"
+- name="channel_normal.xcf"
++ name="priv.xcf"
+ text-time="2005-07-18T18:54:07.000000Z"
+ committed-date="2005-07-18T18:52:23.286359Z"
+- checksum="540bccc7c3ed459b2cbb59fa4ab6cd7b"
++ checksum="46f423ee0879b59030c5713e3663ce83"
+ kind="file"
+ prop-time="2005-07-18T18:54:07.000000Z"/>
+ <entry
+ committed-rev="82"
+- name="priv.xcf"
++ name="channel_normal.xcf"
+ text-time="2005-07-18T18:54:07.000000Z"
+ committed-date="2005-07-18T18:52:23.286359Z"
+- checksum="46f423ee0879b59030c5713e3663ce83"
++ checksum="540bccc7c3ed459b2cbb59fa4ab6cd7b"
+ kind="file"
+ prop-time="2005-07-18T18:54:07.000000Z"/>
+ <entry
+@@ -243,18 +243,18 @@
+ prop-time="2005-07-18T18:54:07.000000Z"/>
+ <entry
+ committed-rev="82"
+- name="info.png"
++ name="themeinfo"
+ text-time="2005-07-18T18:54:07.000000Z"
+ committed-date="2005-07-18T18:52:23.286359Z"
+- checksum="2930b53e0b80ebd21d1af7680baa34cb"
++ checksum="d0a59dc2711592cccc3ed1863546b2d8"
+ kind="file"
+ prop-time="2005-07-18T18:54:07.000000Z"/>
+ <entry
+ committed-rev="82"
+- name="themeinfo"
++ name="info.png"
+ text-time="2005-07-18T18:54:07.000000Z"
+ committed-date="2005-07-18T18:52:23.286359Z"
+- checksum="d0a59dc2711592cccc3ed1863546b2d8"
++ checksum="2930b53e0b80ebd21d1af7680baa34cb"
+ kind="file"
+ prop-time="2005-07-18T18:54:07.000000Z"/>
+ </wc-entries>
+diff -urN vyqchat-0.2.8/gfx/default/Makefile vyqchat-0.2.9/gfx/default/Makefile
+--- gfx/default/Makefile 2005-07-20 02:52:41.000000000 +1100
++++ gfx/default/Makefile 2006-05-17 07:32:07.000000000 +1100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # gfx/default/Makefile. Generated from Makefile.in by configure.
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -61,22 +61,22 @@
+ AMDEP_FALSE = #
+ AMDEP_TRUE =
+ AMTAR = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run tar
+-AO_CFLAGS = -I/home/yogin/tmp//include
+-AO_LIBS = -L/home/yogin/tmp//lib -lao -ldl
+-ARTS_CFLAGS = -I/usr/include/kde/artsc -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+-ARTS_LIBS = -L/usr/lib -ldl -lartsc -lpthread -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
++AO_CFLAGS = -I/home/yogin/tmp/include
++AO_LIBS = -L/home/yogin/tmp/lib -lao -ldl
++ARTS_CFLAGS = -I/usr/include/kde/artsc -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
++ARTS_LIBS = -L/usr/lib64 -ldl -lartsc -lpthread -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
+ AUTOCONF = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run autoconf
+ AUTOHEADER = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run autoheader
+ AUTOMAKE = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run automake-1.9
+ AWK = gawk
+ CC = gcc
+ CCDEPMODE = depmode=gcc3
+-CFLAGS = -march=athlon-xp -O2 -fomit-frame-pointer
++CFLAGS = -march=athlon64 -O2 -fomit-frame-pointer
+ CPP = gcc -E
+-CPPFLAGS = -march=athlon-xp -O2 -fomit-frame-pointer
++CPPFLAGS = -march=athlon64 -O2 -fomit-frame-pointer
+ CXX = g++
+ CXXDEPMODE = depmode=gcc3
+-CXXFLAGS = -march=athlon-xp -O2 -fomit-frame-pointer
++CXXFLAGS = -march=athlon64 -O2 -fomit-frame-pointer
+ CYGPATH_W = echo
+ DEFS = -DHAVE_CONFIG_H
+ DEPDIR = .deps
+@@ -96,34 +96,35 @@
+ LTLIBOBJS =
+ MAKEINFO = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run makeinfo
+ OBJEXT = o
+-OPENSSL_CFLAGS = -I/usr/kerberos/include
+-OPENSSL_LIBS = -L/usr/kerberos/lib -lssl -lcrypto -lgssapi_krb5 -lkrb5 -lcom_err -lk5crypto -lresolv -ldl -lz
++OPENSSL_CFLAGS =
++OPENSSL_LIBS =
+ PACKAGE = vyqchat
+-PACKAGE_BUGREPORT = yogin at linux.bydg.org
++PACKAGE_BUGREPORT = pawel.stolowski at wp.pl
+ PACKAGE_NAME = VyQChat
+-PACKAGE_STRING = VyQChat 0.2.8
++PACKAGE_STRING = VyQChat 0.2.9
+ PACKAGE_TARNAME = vyqchat
+-PACKAGE_VERSION = 0.2.8
++PACKAGE_VERSION = 0.2.9
+ PATH_SEPARATOR = :
+ PKG_CONFIG = /usr/bin/pkg-config
+-QT_CXXFLAGS = -I/usr/lib/qt-3.3/include -DQT_THREAD_SUPPORT
+-QT_DIR = /usr/lib/qt-3.3
+-QT_LIBS = -L/usr/lib/qt-3.3/lib -lqt-mt -lSM -lICE -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi
+-QT_MOC = /usr/lib/qt-3.3/bin/moc
+-QT_UIC = /usr/lib/qt-3.3/bin/uic
++QT_CXXFLAGS = -I/usr/lib64/qt-3.3/include -DQT_THREAD_SUPPORT
++QT_DIR = /usr/lib64/qt-3.3
++QT_LIBS = -L/usr/lib64/qt-3.3/lib -lqt-mt -lSM -lICE -lX11 -lXext -lXmu -lXt -lXi
++QT_MOC = /usr/lib64/qt-3.3/bin/moc
++QT_UIC = /usr/lib64/qt-3.3/bin/uic
+ SET_MAKE =
+ SHELL = /bin/sh
+ SNDFILE_CFLAGS =
+ SNDFILE_LIBS = -lsndfile
+ STRIP =
+-VERSION = 0.2.8
+-X_CFLAGS = -I/usr/X11R6/include
++VERSION = 0.2.9
++X_CFLAGS =
+ X_EXTRA_LIBS =
+-X_LIBS = -L/usr/X11R6/lib
++X_LIBS =
+ X_PRE_LIBS = -lSM -lICE
+ ac_ct_CC = gcc
+ ac_ct_CXX = g++
+ ac_ct_STRIP =
++ac_pt_PKG_CONFIG = /usr/bin/pkg-config
+ am__fastdepCC_FALSE = #
+ am__fastdepCC_TRUE =
+ am__fastdepCXX_FALSE = #
+@@ -148,7 +149,7 @@
+ mandir = ${prefix}/man
+ mkdir_p = mkdir -p --
+ oldincludedir = /usr/include
+-prefix = /home/yogin/tmp/
++prefix = /home/yogin/tmp
+ program_transform_name = s,x,x,
+ sbindir = ${exec_prefix}/sbin
+ sharedstatedir = ${prefix}/com
+diff -urN vyqchat-0.2.8/gfx/default/Makefile.in vyqchat-0.2.9/gfx/default/Makefile.in
+--- gfx/default/Makefile.in 2005-07-20 02:52:13.000000000 +1100
++++ gfx/default/Makefile.in 2006-05-17 07:31:24.000000000 +1100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -124,6 +124,7 @@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+diff -urN vyqchat-0.2.8/src/Makefile.in vyqchat-0.2.9/src/Makefile.in
+--- src/Makefile.in 2005-07-20 02:52:15.000000000 +1100
++++ src/Makefile.in 2006-05-17 07:31:25.000000000 +1100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -15,8 +15,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(dist_vyqchat_SOURCES) $(nodist_vyqchat_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -163,6 +161,7 @@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+diff -urN vyqchat-0.2.8/src/appwin.cpp vyqchat-0.2.9/src/appwin.cpp
+--- src/appwin.cpp 2007-11-05 01:16:48.000000000 +1000
++++ src/appwin.cpp 2006-05-17 03:43:35.000000000 +1100
+@@ -1067,7 +1067,7 @@
+
+ void MainWindow::on_vc_imhere(const QHostAddress &source, const QString &updater, const QString &responder, char status, char winstate)/*{{{*/
+ {
+- std::cout << responder << std::endl;
++ //std::cout << responder << std::endl;
+ if (!userslist->exists(responder))
+ {
+ userslist->addUser(responder, status, source);
+@@ -1078,7 +1078,7 @@
+
+ void MainWindow::on_vc_imhere(const QHostAddress &source, const QString &updater, const QString &responder, char status, char winstate, char gender, Q_INT16 color)/*{{{*/
+ {
+- std::cout << responder << std::endl;
++ //std::cout << responder << std::endl;
+ if (!userslist->exists(responder))
+ userslist->addUser(responder, status, source, gender);
+ else
+@@ -1310,15 +1310,23 @@
+ {
+ if (userslist->setStatus(who, status))
+ {
+- tmp.sprintf("%s%s enters %s mode", timestring().latin1(),
+- static_cast<const char*>(who.utf8()),
+- status_lut[status - STATUS_NORMAL]);
+- chattab->write(MAIN_CHANNEL, tmp, special_color);
+- if ((status!=STATUS_NORMAL) && !answer.isEmpty())
++ if (!answer.isEmpty())
++ {
++ if (status!=STATUS_NORMAL)
++ {
++ tmp.sprintf("%s%s enters %s mode: %s", timestring().latin1(),
++ static_cast<const char*>(who.utf8()),
++ status_lut[status - STATUS_NORMAL],
++ static_cast<const char *>(answer.utf8()));
++ }
++ else
+ {
+- tmp.sprintf("%s", static_cast<const char*>(answer.utf8()));
+- chattab->write(MAIN_CHANNEL, tmp, special_color);
++ tmp.sprintf("%s%s returns to %s mode", timestring().latin1(),
++ static_cast<const char*>(who.utf8()),
++ status_lut[0]);
+ }
++ chattab->write(MAIN_CHANNEL, tmp, special_color);
++ }
+ }
+ }/*}}}*/
+
+diff -urN vyqchat-0.2.8/src/config.h.in vyqchat-0.2.9/src/config.h.in
+--- src/config.h.in 2005-07-20 02:52:43.000000000 +1100
++++ src/config.h.in 2006-05-17 07:34:11.000000000 +1100
+@@ -30,6 +30,9 @@
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+
++/* use OpenSSL */
++#undef HAVE_OPENSSL
++
+ /* use libsndfile */
+ #undef HAVE_SNDFILE
+
+diff -urN vyqchat-0.2.8/src/msgrcvwin.cpp vyqchat-0.2.9/src/msgrcvwin.cpp
+--- src/msgrcvwin.cpp 2005-07-19 05:54:08.000000000 +1100
++++ src/msgrcvwin.cpp 2006-05-17 07:21:24.000000000 +1100
+@@ -28,6 +28,7 @@
+ msg->setTextFormat(PlainText);
+ msg->setFocusPolicy(NoFocus);
+ rpl->setTextFormat(PlainText);
++ rpl->installEventFilter(this);
+ rpl->setFocus();
+ l1->addWidget(msg);
+ l1->addWidget(rpl);
+@@ -54,6 +55,22 @@
+ {
+ }/*}}}*/
+
++bool MessageRcvWindow::eventFilter(QObject *target, QEvent *event)
++{
++ if (target == rpl) {
++ if (event->type() == QEvent::KeyPress) {
++ QKeyEvent *keyEvent = (QKeyEvent *)event;
++ if (((keyEvent->key() == Qt::Key_Enter) || (keyEvent->key() == Qt::Key_Return))
++ && (keyEvent->state() & Qt::ControlButton)) {
++ replyPressed();
++ return true;
++ }
++ }
++ }
++ return QWidget::eventFilter(target, event);
++}
++
++
+ /*-----------------------------------------------------------------------------------------------------
+ *
+ * S L O T S
+diff -urN vyqchat-0.2.8/src/msgrcvwin.h vyqchat-0.2.9/src/msgrcvwin.h
+--- src/msgrcvwin.h 2005-07-19 05:54:08.000000000 +1100
++++ src/msgrcvwin.h 2006-05-17 07:21:24.000000000 +1100
+@@ -38,6 +38,7 @@
+ public:
+ MessageRcvWindow(const QString &from, const QString &msg);
+ virtual ~MessageRcvWindow();
++ bool eventFilter(QObject *target, QEvent *event);
+ };
+
+ #endif
+diff -urN vyqchat-0.2.8/src/msgsndwin.cpp vyqchat-0.2.9/src/msgsndwin.cpp
+--- src/msgsndwin.cpp 2005-07-19 05:54:08.000000000 +1100
++++ src/msgsndwin.cpp 2006-05-17 07:21:24.000000000 +1100
+@@ -24,6 +24,7 @@
+ QBoxLayout *l1 = new QVBoxLayout(this);
+ msg = new QTextEdit(this);
+ msg->setTextFormat(PlainText);
++ msg->installEventFilter(this);
+ l1->addWidget(msg);
+
+ QBoxLayout *bl = new QHBoxLayout(l1);
+@@ -43,6 +44,23 @@
+ {
+ }/*}}}*/
+
++
++bool MessageSndWindow::eventFilter(QObject *target, QEvent *event)
++{
++ if (target == msg) {
++ if (event->type() == QEvent::KeyPress) {
++ QKeyEvent *keyEvent = (QKeyEvent *)event;
++ if (((keyEvent->key() == Qt::Key_Enter) || (keyEvent->key() == Qt::Key_Return))
++ && (keyEvent->state() & Qt::ControlButton)) {
++ sendPressed();
++ return true;
++ }
++ }
++ }
++ return QWidget::eventFilter(target, event);
++}
++
++
+ /*-----------------------------------------------------------------------------------------------------
+ *
+ * S L O T S
+diff -urN vyqchat-0.2.8/src/msgsndwin.h vyqchat-0.2.9/src/msgsndwin.h
+--- src/msgsndwin.h 2005-07-19 05:54:08.000000000 +1100
++++ src/msgsndwin.h 2006-05-17 07:21:24.000000000 +1100
+@@ -36,6 +36,7 @@
+ public:
+ MessageSndWindow(const QString &to);
+ virtual ~MessageSndWindow();
++ bool eventFilter(QObject *target, QEvent *event);
+ };
+
+ #endif
+diff -urN vyqchat-0.2.8/src/settings.h vyqchat-0.2.9/src/settings.h
+--- src/settings.h 2005-07-19 05:54:08.000000000 +1100
++++ src/settings.h 2006-05-11 07:21:53.000000000 +1100
+@@ -88,7 +88,7 @@
+
+ //
+ // Get methods
+- const UUID& Settings::getUUID() const { return uuid; }
++ const UUID& getUUID() const { return uuid; }
+ const QString& getIconThemeName() const { return icontheme; }
+ const QString& getNick() const { return nick; }
+ char getGender() const { return gender; }
+diff -urN vyqchat-0.2.8/src/settingsdlg.cpp vyqchat-0.2.9/src/settingsdlg.cpp
+--- src/settingsdlg.cpp 2007-11-05 01:16:48.000000000 +1000
++++ src/settingsdlg.cpp 2006-05-17 07:18:32.000000000 +1100
+@@ -1,7 +1,7 @@
+ /*
+ * This file is a part of VyQChat.
+ *
+- * Copyright (C) 2002-2004 Pawel Stolowski <yogin at linux.bydg.org>
++ * Copyright (C) 2002-2006 Pawel Stolowski <yogin at linux.bydg.org>
+ *
+ * VyQChat is free software; you can redestribute it and/or modify it
+ * under terms of GNU General Public License by Free Software Foundation.
+@@ -103,7 +103,7 @@
+ QButtonGroup *bgrp1 = new QButtonGroup(2, Qt::Horizontal, p);
+ bt_broadcast = new QRadioButton(tr("Use Broadcast"), bgrp1);
+ bt_multicast = new QRadioButton(tr("Use Multicast"), bgrp1);
+- bt_multicast->setDisabled(true); //multicast doesn't work yet
++ //bt_multicast->setDisabled(true); //leave multicast enabled for testing
+ grid1->addMultiCellWidget(bgrp1, 5, 5, 0, 1);
+ if (settings->getNetworkMethod() == 0)
+ bt_broadcast->setChecked(true);
+@@ -431,6 +431,9 @@
+ settings->setUseSystray(b_systray->isChecked());
+ emit systraySettingsChanged();
+ }
++
++ if (settings->getConfirmExit() != b_confirmexit->isChecked())
++ settings->setConfirmExit(b_confirmexit->isChecked());
+
+ if (netcfgchanged)
+ emit networkSettingsChanged();
+diff -urN vyqchat-0.2.8/src/sound.h vyqchat-0.2.9/src/sound.h
+--- src/sound.h 2005-07-19 05:54:08.000000000 +1100
++++ src/sound.h 2006-05-11 07:21:36.000000000 +1100
+@@ -47,7 +47,7 @@
+ bool reload_samples(Settings &settings);
+ static bool init(Settings *settings);
+ static void close();
+- static const QString& Sound::error();
++ static const QString& error();
+ static void play(VyEvent evt);
+ };
+
+diff -urN vyqchat-0.2.8/src/user.cpp vyqchat-0.2.9/src/user.cpp
+--- src/user.cpp 2007-11-05 01:16:48.000000000 +1000
++++ src/user.cpp 2005-07-19 05:54:08.000000000 +1100
+@@ -42,9 +42,7 @@
+
+ int User::height(const QListBox *lb) const/*{{{*/
+ {
+- int h1 = lb->fontMetrics().height();
+- int h2 = Icons::icon_user.pixmap(QIconSet::Small, true).height();
+- return QMAX(h1, h2);
++ return QMAX(lb->fontMetrics().height(), Icons::icon_user.pixmap(QIconSet::Small, true).height());
+ }/*}}}*/
+
+ int User::width(const QListBox *lb) const/*{{{*/
+diff -urN vyqchat-0.2.8/src/user.h vyqchat-0.2.9/src/user.h
+--- src/user.h 2005-07-19 06:03:01.000000000 +1100
++++ src/user.h 2006-05-11 07:21:24.000000000 +1100
+@@ -38,7 +38,7 @@
+ }
+ return false;
+ }
+- bool User::setStatus(char s) { status=s; return true; }
++ bool setStatus(char s) { status=s; return true; }
+ void setNick(const QString &nick) { setText(nick); }
+ int incDeadCounter() { if (dcnt<1) dcnt++; return dcnt; }
+ int decDeadCounter() { return --dcnt; }
+diff -urN vyqchat-0.2.8/src/uuid.cpp vyqchat-0.2.9/src/uuid.cpp
+--- src/uuid.cpp 2007-11-05 01:16:48.000000000 +1000
++++ src/uuid.cpp 2006-05-17 03:23:28.000000000 +1100
+@@ -12,8 +12,12 @@
+
+ #include "uuid.h"
+ #include <qstring.h>
++#ifdef HAVE_OPENSSL
++#include <openssl/rand.h>
++#else
+ #include <unistd.h>
+ #include <fcntl.h>
++#endif
+
+ UUID::UUID(): QByteArray(UUID_LEN)/*{{{*/
+ {
+@@ -36,9 +40,13 @@
+
+ void UUID::generate()/*{{{*/
+ {
++#ifdef HAVE_OPENSSL
++ RAND_bytes((unsigned char *)data(), UUID_LEN);
++#else
+ int rfd = open("/dev/random", O_RDONLY);
+ read(rfd, (void *)data(), UUID_LEN);
+ close(rfd);
++#endif
+ }/*}}}*/
+
+ void UUID::set(const unsigned char *data)/*{{{*/
+@@ -83,7 +91,7 @@
+ {
+ const unsigned char c = at(i);
+ if (c < 16)
+- r += '0';
++ r += QString("0");
+ r += QString::number(c, 16);
+ }
+ return r;
+diff -urN vyqchat-0.2.8/src/vcprotocol.cpp vyqchat-0.2.9/src/vcprotocol.cpp
+--- src/vcprotocol.cpp 2007-11-05 01:16:48.000000000 +1000
++++ src/vcprotocol.cpp 2006-05-17 08:01:16.000000000 +1100
+@@ -20,7 +20,6 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
+-#include <time.h>
+ #include <iostream>
+
+ //
+@@ -247,7 +246,7 @@
+ char buffer[VY_MAXPACKETSIZE];
+ int len = recvfrom(recvsd, buffer, VY_MAXPACKETSIZE, 0, (struct sockaddr *)&saddr, &slen);
+ source.setAddress(ntohl(saddr.sin_addr.s_addr));
+- std::cout << source.toString() << std::endl;
++ //std::cout << source.toString() << std::endl;
+ decode(buffer, len, source);
+ }/*}}}*/
+
+@@ -269,7 +268,7 @@
+ return (usercodec[a]) ? utfcodec : ansicodec;
+ }/*}}}*/
+
+-bool VCProtocol::get(QCString *str, char *buffer, int &pos, const int p_len)/*{{{*/
++bool VCProtocol::get(QCString *str, const char *buffer, int &pos, const int p_len)/*{{{*/
+ {
+ const int spos = pos;
+ for (;pos<p_len; pos++)
+@@ -284,14 +283,14 @@
+ return false;
+ }/*}}}*/
+
+-bool VCProtocol::get(QString *str, char *buffer, int &pos, const int p_len, QTextCodec *tc)/*{{{*/
++bool VCProtocol::get(QString *str, const char *buffer, int &pos, const int p_len, QTextCodec *tc)/*{{{*/
+ {
+ const int spos = pos;
+ for (;pos<p_len; pos++)
+ {
+ if (buffer[pos] == 0)
+ {
+- *str = tc->toUnicode(reinterpret_cast<char *>(buffer + spos));
++ *str = tc->toUnicode(reinterpret_cast<const char *>(buffer + spos));
+ ++pos;
+ return true;
+ }
+@@ -299,7 +298,7 @@
+ return false;
+ }/*}}}*/
+
+-bool VCProtocol::get(char *c, char *buffer, int &pos, const int p_len)/*{{{*/
++bool VCProtocol::get(char *c, const char *buffer, int &pos, const int p_len)/*{{{*/
+ {
+ if (pos < p_len)
+ {
+@@ -309,7 +308,7 @@
+ return false;
+ }/*}}}*/
+
+-bool VCProtocol::get(UUID *uuid, char *buffer, int &pos, const int p_len)/*{{{*/
++bool VCProtocol::get(UUID *uuid, const char *buffer, int &pos, const int p_len)/*{{{*/
+ {
+ pos += UUID_LEN;
+ if (pos < p_len)
+@@ -320,7 +319,7 @@
+ return false;
+ }/*}}}*/
+
+-bool VCProtocol::get(Q_INT16 *s, char *buffer, int &pos, const int p_len)/*{{{*/
++bool VCProtocol::get(Q_INT16 *s, const char *buffer, int &pos, const int p_len)/*{{{*/
+ {
+ if ((pos + sizeof(Q_INT16)) < p_len)
+ {
+@@ -331,7 +330,7 @@
+ return false;
+ }/*}}}*/
+
+-bool VCProtocol::get(Q_INT32 *s, char *buffer, int &pos, const int p_len)/*{{{*/
++bool VCProtocol::get(Q_INT32 *s, const char *buffer, int &pos, const int p_len)/*{{{*/
+ {
+ if ((pos + sizeof(Q_INT32)) < p_len)
+ {
+@@ -344,22 +343,21 @@
+ return false;
+ }/*}}}*/
+
+-bool VCProtocol::decode(char *p_data, int p_len, const QHostAddress &source)/*{{{*/
++bool VCProtocol::decode(const char *p_data, int p_len, const QHostAddress &source)/*{{{*/
+ {
+ if (*p_data != 'X') //check if it is vypress chat packet
+ return false;
+
+- const char *p_id = p_data; //packet signature start
+- p_data += 10; //skip packet id
+- char b = *(p_data++);
++ int pos = 0;
++ pos += 10; //skip packet id
++ char b = p_data[pos++];
+
+- std::cout << b << std::endl;
++ //std::cout << b << std::endl;
+
+ QString from, to, channel, text, host, computer, ip, name, channels, software, time;
+ char status, gender, codepage, ractive, c;
+ UUID uuid;
+ Q_INT32 version, color;
+- int pos = 0;
+
+ QTextCodec *codec = codecForUser(source);
+
+@@ -374,9 +372,10 @@
+ break;
+ /* IM HERE
+ * updater :: responder :: status + remote active :: (version + gender + uuid :: 0000 + cp + color)*/
+- case VY_IMHERE:
+- get(&to, p_data, pos, p_len, codec);
+- get(&from, p_data, pos, p_len, codec);
++ case VY_IMHERE: {
++ QCString a_to, a_from; //raw ansi strings, we don't know codec yet
++ get(&a_to, p_data, pos, p_len);
++ get(&a_from, p_data, pos, p_len);
+ get(&status, p_data, pos, p_len);
+ if (!get(&ractive, p_data, pos, p_len))
+ return false;
+@@ -391,12 +390,15 @@
+ get(&tmp, p_data, pos, p_len); //...
+ get(&codepage, p_data, pos, p_len);
+ get(&color, p_data, pos, p_len);
+- setUserCodecUTF(source, codepage);
+- emit sig_vc_imhere(source, to, from, status, ractive, gender, color);
++ codec = setUserCodecUTF(source, codepage);
++ emit sig_vc_imhere(source, codec->toUnicode(a_to)
++ , codec->toUnicode(a_from), status, ractive, gender, color);
+ }
+ else
+- emit sig_vc_imhere(source, to, from, status, ractive);
++ emit sig_vc_imhere(source, codec->toUnicode(a_to)
++ , codec->toUnicode(a_from), status, ractive);
+ break;
++ }
+ /* SIMPLE CHAT
+ * channel :: author :: text */
+ case VY_SAY:
+@@ -426,7 +428,7 @@
+ /* BEEP
+ */
+ case VY_BEEP:
+- b = *(p_data++);
++ b = p_data[pos++];
+ switch (b)
+ {
+ /* BEEP SIGNAL
+@@ -460,20 +462,23 @@
+ return false;
+ if (get(&c, p_data, pos, p_len)) //succeeds for vypresschat >= 1.9.x
+ {
+- if (channel == MAIN_CHANNEL)
++ if (a_channel == MAIN_CHANNEL)
+ {
+ get(&version, p_data, pos, p_len);
+ get(&uuid, p_data, pos, p_len);
++ get(&c, p_data, pos, p_len); //zero byte
+ get(&codepage, p_data, pos, p_len);
+ if (!get(&color, p_data, pos, p_len))
+ return false;
++ get(&c, p_data, pos, p_len); //zero byte
++ codec = setUserCodecUTF(source, codepage);
+ }
+ else
+ {
+- if (!get(&codepage, p_data, pos, p_len))
++ //it is not a codepage
++ if (!get(&c, p_data, pos, p_len))
+ return false;
+ }
+- codec = setUserCodecUTF(source, codepage);
+ }
+ emit sig_vc_join(source, codec->toUnicode(a_from), codec->toUnicode(a_channel), status, gender);
+ break;
+@@ -489,7 +494,7 @@
+ break;
+ /* PRIVATE */
+ case VY_PRIVATE:
+- b = *(p_data++);
++ b = p_data[pos++];
+ get(&from, p_data, pos, p_len, codec);
+ get(&to, p_data, pos, p_len, codec);
+ switch (b)
+@@ -531,7 +536,7 @@
+ get(&to, p_data, pos, p_len, codec);
+ if (!get(&text, p_data, pos, p_len, codec))
+ return false;
+- sig.duplicate(p_id, 10);
++ sig.duplicate(p_data, 10);
+ emit sig_vc_message(source, sig, from, to, text);
+ break;
+ }
+@@ -558,7 +563,7 @@
+ get(&to, p_data, pos, p_len, codec);
+ if (!get(&text, p_data, pos, p_len, codec))
+ return false;
+- sig.duplicate(p_id, 10);
++ sig.duplicate(p_data, 10);
+ emit sig_vc_massmessage(source, sig, from, to, text);
+ break;
+ }
+@@ -583,7 +588,7 @@
+ /* PING / PONG
+ * to :: from :: time */
+ case VY_PING:
+- b = *(p_data++);
++ b = p_data[pos++];
+ get(&to, p_data, pos, p_len, codec);
+ get(&from, p_data, pos, p_len, codec);
+ get(&time, p_data, pos, p_len, codec);
+@@ -643,6 +648,13 @@
+ return false;
+ emit sig_vc_changestatus(from, status, gender, text);
+ break;
++ /* ACTIVITY CHANGE
++ * from :: status */
++ case VY_CHANGEACTIV:
++ get(&from, p_data, pos, p_len, codec);
++ get(&status, p_data, pos, p_len);
++ emit sig_vc_changestatus(from, status, 0, QString(""));
++ break;
+ /* FLOOD NOTIFY
+ * to :: from :: seconds */
+ case VY_FLOODNOTIFY:
+@@ -651,7 +663,9 @@
+ if (!get(&text, p_data, pos, p_len, codec))
+ return false;
+ emit sig_vc_floodnotify(to, from, text);
++ break;
+ default:
++ dumpPacket(p_data, p_len);
+ break;
+ }
+ return true;
+@@ -735,7 +749,7 @@
+ PacketData p;
+ if (channel == MAIN_CHANNEL)
+ p << VY_JOIN << sndcodec->fromUnicode(who) << 0 << sndcodec->fromUnicode(channel) << 0 << status << gender << 0 <<
+- PROTOVERSION << uuid << (useutf ? '1' : '0')
++ PROTOVERSION << uuid << 0 << (useutf ? '1' : '0')
+ << 0xff << 0xff << 0xff << 0xff //color
+ << 0;
+ else
+@@ -880,3 +894,49 @@
+ send(addr, &p);
+ }/*}}}*/
+
++void VCProtocol::dumpPacket(const char *p_data, const int len)/*{{{*/
++{
++ int pos = 0;
++ int i, j, quot, rem;
++ char str[81] = "00000000 00 01 02 03 | 04 05 06 07 | 08 09 0A 0B | 0C 0D 0E 0F QWERTYUIOPASDFGH";
++ char *text_str = str + 63;
++ char printf_str[] = "%.8X %.2hhX %.2hhX %.2hhX %.2hhX | "
++ "%.2hhX %.2hhX %.2hhX %.2hhX | %.2hhX %.2hhX %.2hhX %.2hhX | "
++ "%.2hhX %.2hhX %.2hhX %.2hhX %s\n";
++
++ printf ("len = %i\n", len);
++ quot = len / 16, rem = len % 16;
++ for (i = 0; i < quot ; i++, pos += 16)
++ {
++ for (j = 0; j < 16; j++)
++ text_str[j] = ((unsigned char)p_data[pos + j] >= 0x20)?p_data[pos + j]: '.';
++ printf(
++ printf_str, pos,
++ p_data[pos+0], p_data[pos+1], p_data[pos+2], p_data[pos+3],
++ p_data[pos+4], p_data[pos+5], p_data[pos+6], p_data[pos+7],
++ p_data[pos+8], p_data[pos+9], p_data[pos+10], p_data[pos+11],
++ p_data[pos+12], p_data[pos+13], p_data[pos+14], p_data[pos+15],
++ text_str
++ );
++ }
++ if (rem)
++ {
++ char buff[9];
++ char *str_pos = str + 9;
++ for (j = 0; j < rem; j++)
++ text_str[j] = ((unsigned char)p_data[pos + j] >= 0x20)?p_data[pos + j]: '.';
++ text_str[rem] = '\0';
++ sprintf(buff, "%.8X", pos);
++ memcpy(str, buff, 8);
++ for ( ; pos < len; pos++)
++ {
++ sprintf(buff, "%.2hhX", p_data[pos]);
++ memcpy(str_pos, buff, 2);
++ str_pos += 3;
++ str_pos += 2*(!((pos + 1 - quot * 16) % 4));
++ }
++ memset(str_pos, ' ', 80 - 16 - (str_pos - str) - 1);
++ printf("%s\n", str);
++ }
++}/*}}}*/
++
+diff -urN vyqchat-0.2.8/src/vcprotocol.h vyqchat-0.2.9/src/vcprotocol.h
+--- src/vcprotocol.h 2005-07-19 06:12:08.000000000 +1100
++++ src/vcprotocol.h 2006-05-16 07:10:47.000000000 +1100
+@@ -67,14 +67,15 @@
+ QTextCodec* setUserCodecUTF(const QHostAddress &addr, char f);
+ QTextCodec *codecForUser(const QHostAddress &addr);
+ void send(const QHostAddress &addr, PacketData *packet);
+- bool decode(char *p_data, int p_len, const QHostAddress &source);
++ bool decode(const char *p_data, int p_len, const QHostAddress &source);
+
+- bool get(QCString *str, char *buffer, int &pos, const int p_len);
+- bool get(QString *str, char *buffer, int &pos, const int p_len, QTextCodec *tc);
+- bool get(char *c, char *buffer, int &pos, const int p_len);
+- bool get(UUID *uuid, char *buffer, int &pos, const int p_len);
+- bool get(Q_INT16 *s, char *buffer, int &pos, const int p_len);
+- bool get(Q_INT32 *s, char *buffer, int &pos, const int p_len);
++ bool get(QCString *str, const char *buffer, int &pos, const int p_len);
++ bool get(QString *str, const char *buffer, int &pos, const int p_len, QTextCodec *tc);
++ bool get(char *c, const char *buffer, int &pos, const int p_len);
++ bool get(UUID *uuid, const char *buffer, int &pos, const int p_len);
++ bool get(Q_INT16 *s, const char *buffer, int &pos, const int p_len);
++ bool get(Q_INT32 *s, const char *buffer, int &pos, const int p_len);
++ void dumpPacket(const char *p_data, const int len);
+
+ private slots:
+ void dataReceived();
+diff -urN vyqchat-0.2.8/tr/Makefile vyqchat-0.2.9/tr/Makefile
+--- tr/Makefile 2005-07-20 02:52:41.000000000 +1100
++++ tr/Makefile 2006-05-17 07:32:07.000000000 +1100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # tr/Makefile. Generated from Makefile.in by configure.
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -60,22 +60,22 @@
+ AMDEP_FALSE = #
+ AMDEP_TRUE =
+ AMTAR = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run tar
+-AO_CFLAGS = -I/home/yogin/tmp//include
+-AO_LIBS = -L/home/yogin/tmp//lib -lao -ldl
+-ARTS_CFLAGS = -I/usr/include/kde/artsc -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+-ARTS_LIBS = -L/usr/lib -ldl -lartsc -lpthread -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
++AO_CFLAGS = -I/home/yogin/tmp/include
++AO_LIBS = -L/home/yogin/tmp/lib -lao -ldl
++ARTS_CFLAGS = -I/usr/include/kde/artsc -pthread -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
++ARTS_LIBS = -L/usr/lib64 -ldl -lartsc -lpthread -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
+ AUTOCONF = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run autoconf
+ AUTOHEADER = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run autoheader
+ AUTOMAKE = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run automake-1.9
+ AWK = gawk
+ CC = gcc
+ CCDEPMODE = depmode=gcc3
+-CFLAGS = -march=athlon-xp -O2 -fomit-frame-pointer
++CFLAGS = -march=athlon64 -O2 -fomit-frame-pointer
+ CPP = gcc -E
+-CPPFLAGS = -march=athlon-xp -O2 -fomit-frame-pointer
++CPPFLAGS = -march=athlon64 -O2 -fomit-frame-pointer
+ CXX = g++
+ CXXDEPMODE = depmode=gcc3
+-CXXFLAGS = -march=athlon-xp -O2 -fomit-frame-pointer
++CXXFLAGS = -march=athlon64 -O2 -fomit-frame-pointer
+ CYGPATH_W = echo
+ DEFS = -DHAVE_CONFIG_H
+ DEPDIR = .deps
+@@ -95,34 +95,35 @@
+ LTLIBOBJS =
+ MAKEINFO = ${SHELL} /home/yogin/src/vyqchat/trunk/missing --run makeinfo
+ OBJEXT = o
+-OPENSSL_CFLAGS = -I/usr/kerberos/include
+-OPENSSL_LIBS = -L/usr/kerberos/lib -lssl -lcrypto -lgssapi_krb5 -lkrb5 -lcom_err -lk5crypto -lresolv -ldl -lz
++OPENSSL_CFLAGS =
++OPENSSL_LIBS =
+ PACKAGE = vyqchat
+-PACKAGE_BUGREPORT = yogin at linux.bydg.org
++PACKAGE_BUGREPORT = pawel.stolowski at wp.pl
+ PACKAGE_NAME = VyQChat
+-PACKAGE_STRING = VyQChat 0.2.8
++PACKAGE_STRING = VyQChat 0.2.9
+ PACKAGE_TARNAME = vyqchat
+-PACKAGE_VERSION = 0.2.8
++PACKAGE_VERSION = 0.2.9
+ PATH_SEPARATOR = :
+ PKG_CONFIG = /usr/bin/pkg-config
+-QT_CXXFLAGS = -I/usr/lib/qt-3.3/include -DQT_THREAD_SUPPORT
+-QT_DIR = /usr/lib/qt-3.3
+-QT_LIBS = -L/usr/lib/qt-3.3/lib -lqt-mt -lSM -lICE -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi
+-QT_MOC = /usr/lib/qt-3.3/bin/moc
+-QT_UIC = /usr/lib/qt-3.3/bin/uic
++QT_CXXFLAGS = -I/usr/lib64/qt-3.3/include -DQT_THREAD_SUPPORT
++QT_DIR = /usr/lib64/qt-3.3
++QT_LIBS = -L/usr/lib64/qt-3.3/lib -lqt-mt -lSM -lICE -lX11 -lXext -lXmu -lXt -lXi
++QT_MOC = /usr/lib64/qt-3.3/bin/moc
++QT_UIC = /usr/lib64/qt-3.3/bin/uic
+ SET_MAKE =
+ SHELL = /bin/sh
+ SNDFILE_CFLAGS =
+ SNDFILE_LIBS = -lsndfile
+ STRIP =
+-VERSION = 0.2.8
+-X_CFLAGS = -I/usr/X11R6/include
++VERSION = 0.2.9
++X_CFLAGS =
+ X_EXTRA_LIBS =
+-X_LIBS = -L/usr/X11R6/lib
++X_LIBS =
+ X_PRE_LIBS = -lSM -lICE
+ ac_ct_CC = gcc
+ ac_ct_CXX = g++
+ ac_ct_STRIP =
++ac_pt_PKG_CONFIG = /usr/bin/pkg-config
+ am__fastdepCC_FALSE = #
+ am__fastdepCC_TRUE =
+ am__fastdepCXX_FALSE = #
+@@ -147,7 +148,7 @@
+ mandir = ${prefix}/man
+ mkdir_p = mkdir -p --
+ oldincludedir = /usr/include
+-prefix = /home/yogin/tmp/
++prefix = /home/yogin/tmp
+ program_transform_name = s,x,x,
+ sbindir = ${exec_prefix}/sbin
+ sharedstatedir = ${prefix}/com
+diff -urN vyqchat-0.2.8/tr/Makefile.in vyqchat-0.2.9/tr/Makefile.in
+--- tr/Makefile.in 2005-07-20 02:52:15.000000000 +1100
++++ tr/Makefile.in 2006-05-17 07:31:25.000000000 +1100
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -123,6 +123,7 @@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--- vyqchat.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list