rev 2988 - in tags/packages/kdenetwork: . kdenetwork-3.5.1-1/debian
kdenetwork-3.5.1-1/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Fri Jan 27 19:04:14 UTC 2006
Author: chrsmrtn
Date: 2006-01-27 19:04:10 +0000 (Fri, 27 Jan 2006)
New Revision: 2988
Added:
tags/packages/kdenetwork/kdenetwork-3.5.1-1/
tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/01_kdenetwork_branch_r502708.diff
Removed:
tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/01_kdenetwork_branch_r484288.diff
tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/01_kdenetwork_branch_r488948.diff
tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/01_kdenetwork_branch_r495340.diff
Modified:
tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/changelog
tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/control
tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/12_kopete_meanwhile.diff
tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/98_buildprep.diff
tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/rules
Log:
Tagging kdenetwork.
Copied: tags/packages/kdenetwork/kdenetwork-3.5.1-1 (from rev 2983, trunk/packages/kdenetwork)
Modified: tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog 2006-01-25 12:47:56 UTC (rev 2983)
+++ tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/changelog 2006-01-27 19:04:10 UTC (rev 2988)
@@ -1,4 +1,4 @@
-kdenetwork (4:3.5.0-4) UNRELEASED; urgency=low
+kdenetwork (4:3.5.1-1) unstable; urgency=low
+++ Changes by Isaac Clerencia:
@@ -16,8 +16,10 @@
libmeanwhile1, needed to go with the updated meanwhile plugin.
(Closes: #348958)
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+ * Upload to unstable.
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 26 Jan 2006 20:55:37 -0500
+
kdenetwork (4:3.5.0-3) unstable; urgency=low
+++ Changes by Christopher Martin:
Modified: tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/control
===================================================================
--- trunk/packages/kdenetwork/debian/control 2006-01-25 12:47:56 UTC (rev 2983)
+++ tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/control 2006-01-27 19:04:10 UTC (rev 2988)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.5.0), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xmms-dev, libxxf86vm-dev
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 5.0), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.5.1), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xmms-dev, libxxf86vm-dev
Standards-Version: 3.6.2
Package: kdenetwork
@@ -275,7 +275,7 @@
Package: kdenetwork-dev
Section: devel
Architecture: any
-Depends: kdict (= ${Source-Version}), kopete (= ${Source-Version}), ksirc (= ${Source-Version}), librss1 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.0)
+Depends: kdict (= ${Source-Version}), kopete (= ${Source-Version}), ksirc (= ${Source-Version}), librss1 (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.1)
Replaces: librss1-dev, kdict (<< 4:3.5.0-3)
Conflicts: librss1-dev
Description: development files for the KDE network module
Deleted: tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/01_kdenetwork_branch_r484288.diff
Deleted: tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/01_kdenetwork_branch_r488948.diff
Deleted: tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/01_kdenetwork_branch_r495340.diff
Added: tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/01_kdenetwork_branch_r502708.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r502708.diff 2006-01-25 12:47:56 UTC (rev 2983)
+++ tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/01_kdenetwork_branch_r502708.diff 2006-01-27 19:04:10 UTC (rev 2988)
@@ -0,0 +1,5932 @@
+#DPATCHLEVEL=0
+--- kpf/kpfpropertiesdialogplugin.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kpf/kpfpropertiesdialogplugin.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=KPF Directory Properties Page
+ Name[bg]=Настройки на директория за KPF
++Name[bn]=কে-পিে-এফ ডিরেক্টরী বৈশিষ্ট্যাবলী পাতা
+ Name[bs]=Stranica sa osobinama KPF direktorija
+ Name[ca]=Pàgina de propietats del directori KPF
+ Name[cs]=Stránka vlastností adresáře KPF
+--- kpf/kpfapplet.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kpf/kpfapplet.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -5,6 +5,7 @@
+ Name[ar]=خادم ملفات عام
+ Name[az]=Ümumi Fayl Vericisi
+ Name[bg]=Публичен файлов сървър
++Name[bn]=পাবলিক ফাইল সার্ভার
+ Name[bs]=Javni datotečni server
+ Name[ca]=Servidor públic de fitxers
+ Name[cs]=Veřejný souborový server
+@@ -64,6 +65,7 @@
+ Name[zu]=Ifayela Lomlekeleli Wovelele
+ Comment=A small webserver that makes sharing files over the network easy
+ Comment[bg]=Малък уеб сървър за лесно споделяне на файлове
++Comment[bn]=একটি ছোট ওয়েব সার্ভার যে নেটওয়ার্কের ওপর ফাইল ভাগাভাগি সহজ করে
+ Comment[ca]=Un servidor web petit que facilita la compartició de fitxers per la xarxa
+ Comment[cs]=Malý webový server usnadňující sdílení souborů
+ Comment[da]=En lille webbserver som gør det nemt at dele filer via netværket
+--- krdc/krdc.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ krdc/krdc.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -5,8 +5,10 @@
+ Icon=krdc
+ Terminal=false
+ Name=Krdc
++Name[bn]=কে-আর-ডি-সি
+ GenericName=Remote Desktop Connection
+ GenericName[bg]=Връзка с отд. раб. място
++GenericName[bn]=প্রত্যন্ত ডেস্কটপ সংযোগ
+ GenericName[ca]=Connexió remota entre escriptoris
+ GenericName[cs]=Vzdálené připojení pracovní plochy
+ GenericName[cy]=Cysylltiad Penbwrdd Pell
+--- krdc/smb2rdc.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ krdc/smb2rdc.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -6,6 +6,7 @@
+ [Desktop Action smb2rdc]
+ Name=Open Remote Desktop Connection to This Machine
+ Name[bg]=Връзка с отдалечен работно място с избрания компютър
++Name[bn]=এই মেশিনে প্রত্যন্ত ডেস্কটপের সংযোগ খোলো
+ Name[ca]=Obre una connexió remota d'escriptori a aquesta màquina
+ Name[cs]=Otevřít vzdálené připojení plochy k tomuto počítači
+ Name[da]=Åbn ekstern desktopforbindelse til denne maskine
+--- krfb/krfb/krfb.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ krfb/krfb/krfb.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -6,8 +6,10 @@
+ DocPath=krfb/index.html
+ Terminal=false
+ Name=Krfb
++Name[bn]=কে-আর-এফ-বি
+ GenericName=Desktop Sharing
+ GenericName[bg]=Споделяне на раб. място
++GenericName[bn]=ডেস্কটপ ভাগাভাগি
+ GenericName[br]=Rannañ ar vurev
+ GenericName[ca]=Compartició de l'escriptori
+ GenericName[cs]=Sdílení pracovní plochy
+--- krfb/krfb/eventsrc (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ krfb/krfb/eventsrc (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -4,6 +4,7 @@
+ Comment[af]=Werkskerm Deeling
+ Comment[ar]=مشاركة سطح المكتب
+ Comment[bg]=Споделяне на работно място
++Comment[bn]=ডেস্কটপ ভাগাভাগি
+ Comment[br]=Rannañ ar vurev
+ Comment[bs]=Dijeljenje desktopa
+ Comment[ca]=Compartició de l'escriptori
+@@ -63,6 +64,7 @@
+ Name=UserAcceptsConnection
+ Name[ar]=المستخدم قبل الاتصال
+ Name[bg]=Приета е връзка от потребител
++Name[bn]=ব্যবহারকারী সংযোগ গ্রহণ করে
+ Name[ca]=L'usuari accepta la connexió
+ Name[cs]=Uživatel přijímá spojení
+ Name[cy]=DefnyddiwrDerbynCysylltiad
+@@ -117,6 +119,7 @@
+ Comment[af]=Gebruiker aanvaar verbinding
+ Comment[ar]=المستخدم قبل الإتصال
+ Comment[bg]=Приета е връзка от потребител
++Comment[bn]=ব্যবহারকারী সংযোগ গ্রহণ করে
+ Comment[bs]=Korisnik prihvata konekciju
+ Comment[ca]=L'usuari accepta la connexió
+ Comment[cs]=Uživatel přijímá spojení
+@@ -176,6 +179,7 @@
+ Name=UserRefusesConnection
+ Name[ar]=المستخدم رفض الاتصال
+ Name[bg]=Отказана връзка от потребител
++Name[bn]=ব্যবহারকারী সংযোগ অস্বীকার করে
+ Name[ca]=L'usuari refusa la connexió
+ Name[cs]=Uživatel odmítá spojení
+ Name[cy]=DefnyddiwrGwrthodCysylltiad
+@@ -230,6 +234,7 @@
+ Comment[af]=Gebruiker weier verbinding
+ Comment[ar]=المستخدم رفض الاتصال
+ Comment[bg]=Отказана връзка от потребител
++Comment[bn]=ব্যবহারকারী সংযোগ অস্বীকার করে
+ Comment[bs]=Korisnik odbija konekciju
+ Comment[ca]=L'usuari refusa la connexió
+ Comment[cs]=Uživatel odmítá spojení
+@@ -289,6 +294,7 @@
+ Name=ConnectionClosed
+ Name[ar]=اتصال مغلق
+ Name[bg]=Връзката е прекъсната
++Name[bn]=সংযোগ বন্ধ করা হল
+ Name[br]=Kevreadur serret
+ Name[ca]=Connexió tancada
+ Name[cs]=Spojení ukončeno
+@@ -344,6 +350,7 @@
+ Comment[af]=Verbinding gesluit
+ Comment[ar]=الاتصال قُطع
+ Comment[bg]=Връзката е прекъсната
++Comment[bn]=সংযোগ বন্ধ করা হল
+ Comment[br]=Serret eo ar gevreadenn
+ Comment[bs]=Konekcija prekinuta
+ Comment[ca]=Connexió tancada
+@@ -406,6 +413,7 @@
+ Name[ar]=كلمة مرور غير صالحة
+ Name[be]=Некарэктны пароль
+ Name[bg]=Невалидна парола
++Name[bn]=অবৈধ পাসওয়ার্ড
+ Name[ca]=Contrasenya no vàlida
+ Name[cs]=Neplatné heslo
+ Name[cy]=CyfrinairAnnilys
+@@ -461,6 +469,7 @@
+ Comment[ar]=كلمة مرور غير صالحة
+ Comment[be]=Некарэктны пароль
+ Comment[bg]=Невалидна парола
++Comment[bn]=অবৈধ পাসওয়ার্ড
+ Comment[br]=Tremenger siek
+ Comment[bs]=Neispravna šifra
+ Comment[ca]=Contrasenya no vàlida
+@@ -523,6 +532,7 @@
+ Name=InvalidPasswordInvitations
+ Name[ar]=دعوات كلمات مرور غير صالحة
+ Name[bg]=Получи се покана с невалидна парола
++Name[bn]=অবৈধ পাসওয়ার্ড আমন্ত্রণ
+ Name[ca]=Contrasenya convidats no vàlides
+ Name[cs]=Neplatné hesla výzev
+ Name[cy]=GwahoddiadauCyfrinairAnnilys
+@@ -574,6 +584,7 @@
+ Comment[af]=Die uitgenooi party gestuur 'n ongeldige wagwoord. Verbinding geweier.
+ Comment[ar]=الجهة المدعوة أرسلت كلمة مرور غير صالحة. الاتصال رُفض
+ Comment[bg]=Получи се покана с невалидна парола
++Comment[bn]=আমন্ত্রিত দল একটি অবৈধ পাসওয়ার্ড পাঠাল। সংযোগ অস্বীকার করা হল।
+ Comment[bs]=Pozvana strana je poslala neispravnu šifru. Konekcija je odbijena.
+ Comment[ca]=La part invitada ha enviat una contrasenya no vàlida. Connexió refusada.
+ Comment[cs]=Pozvaná strana poslala neplatné heslo. Spojení odmítnuto.
+@@ -631,6 +642,7 @@
+ Name=NewConnectionOnHold
+ Name[ar]=اتصال جديد على الانتظار
+ Name[bg]=Получи се нова заявка за връзка
++Name[bn]=নতুন সংযোগ ধরে রাখা
+ Name[ca]=Nova connexió en espera
+ Name[cs]=Nové spojení pozdrženo
+ Name[cy]=CysylltiadNewyddArArfael
+@@ -684,6 +696,7 @@
+ Comment[af]=Verbinding versoekte, gebruiker moet aanvaar
+ Comment[ar]=طلب اتصال, يجب أن يقبل المستخدم
+ Comment[bg]=Получи се нова заявка за връзка
++Comment[bn]=সংযোগ অনুরোধ করা হল, ব্যবহারকারীকে অবশ্যই স্বীকার করতে হবে
+ Comment[bs]=Zatražena konekcija, korisnik mora prihvatiti
+ Comment[ca]=Connexió sol·licitada, l'usuari ha d'acceptar-la
+ Comment[cs]=Vyžadováno spojení, uživatel musí přijmout
+@@ -743,6 +756,7 @@
+ Name=NewConnectionAutoAccepted
+ Name[ar]=اتصال جديد مقبول تلقائياً
+ Name[bg]=Нова връзка е установена автоматично
++Name[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্বীকৃত
+ Name[ca]=Nova connexió auto-acceptada
+ Name[cs]=Nové spojení automaticky přijato
+ Name[cy]=CysylltiadNewyddAwtoDerbyn
+@@ -796,6 +810,7 @@
+ Comment[af]=Nuwe verbinding automaties vasgestel
+ Comment[ar]=اتصالات جديدة أُنشئت تلقائياً
+ Comment[bg]=Нова връзка е установена автоматично
++Comment[bn]=নতুন সংযোগ স্বয়ংক্রীয়ভাবে স্থাপন করা হল
+ Comment[bs]=Automatski uspostavljena nova konekcija
+ Comment[ca]=Nova connexió establerta automàticament
+ Comment[cs]=Automaticky navázáno nové spojení
+@@ -855,6 +870,7 @@
+ Name=TooManyConnections
+ Name[ar]=اتصالات عديدة جداً
+ Name[bg]=Получиха се твърде много връзки
++Name[bn]=অত্যাধিক সংযোগ
+ Name[ca]=Masses connexions
+ Name[cs]=Příliš mnoho spojení
+ Name[cy]=GormodOGysylltiadau
+@@ -909,6 +925,7 @@
+ Comment[af]=Besig, verbinding geweier
+ Comment[ar]=مشغول , الاتصال رُفض
+ Comment[bg]=Получиха се твърде много връзки
++Comment[bn]=ব্যস্ত, সংযোগ অস্বীকার করল
+ Comment[br]=Dalc'het, kevreadenn disteuleret
+ Comment[bs]=Zauzet, konekcija odbijena
+ Comment[ca]=Ocupat, connexió refusada
+@@ -970,6 +987,7 @@
+ Name=UnexpectedConnection
+ Name[ar]=اتصال غير متوقع
+ Name[bg]=Получи се неочаквана връзка
++Name[bn]=অপ্রত্যাশিত সংযোগ
+ Name[ca]=Connexió inesperada
+ Name[cs]=Neočekávané spojení
+ Name[cy]=CysylltiadAnnisgwyl
+@@ -1023,6 +1041,7 @@
+ Comment[af]=Ontvang onverwagte verbinding, staak
+ Comment[ar]=تم استلام اتصال غير متوقع , اقطع
+ Comment[bg]=Получи се неочаквана връзка
++Comment[bn]=অপ্রত্যাশিত সংযোগ গ্রহণ করল, বাতিল করুন
+ Comment[bs]=Primio neočekivanu konekciju, prekidam
+ Comment[ca]=Rebuda una connexió inesperada, avortant
+ Comment[cs]=Obdrženo neočekávané spojení, přerušeno
+--- krfb/krfb/kinetd_krfb.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ krfb/krfb/kinetd_krfb.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -21,6 +21,7 @@
+ Name=KRfb Desktop Sharing
+ Name[ar]=KRfb مشاركة سطح المكتب
+ Name[bg]=Споделяне на работно място (KRfb)
++Name[bn]=কে-আর-এফ-বি ডেস্কটপ ভাগাভাগি
+ Name[bs]=KRfb dijeljenje desktopa
+ Name[ca]=Compartició de l'escriptori KRfb
+ Name[cs]=Sdílení pracovní plochy KRfb
+@@ -78,6 +79,7 @@
+ Comment[af]='n bediener wat laat toe jy na deel jou werkskerm
+ Comment[ar]=مراقب يسمح لك بمشاركة سطح مكتبك
+ Comment[bg]=Демон за споделяне на работното място
++Comment[bn]=একটি ডিমন যে আপনার ডেস্কটপ ভাগাভাগি করতে আপনাকে অনুমতি দেয়
+ Comment[bs]=Daemon koji vam omogućuje da dijelite vaš desktop
+ Comment[ca]=Un dimoni que us permetrà compartir el vostre escriptori
+ Comment[cs]=Démon umožňující sdílení vaší plochy
+--- krfb/libvncserver/main.c (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ krfb/libvncserver/main.c (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -74,7 +74,7 @@
+
+ time(&log_clock);
+ strftime(buf, 255, "%d/%m/%Y %T ", localtime(&log_clock));
+- fprintf(stderr,buf);
++ fprintf(stderr, "%s", buf);
+
+ vfprintf(stderr, format, args);
+ fflush(stderr);
+--- krfb/krfb_httpd/krfb_httpd (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ krfb/krfb_httpd/krfb_httpd (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -1,72 +1 @@
+-#! /usr/bin/env bash
+-
+-if [ "$1" = "--kinetd" ]; then
+- # redirect stdin and stdout to the inetd socket.
+- exec <&$2 >&$2
+-fi
+-
+-read request url httptype || exit 0
+-url="${url/
/}"
+-httptype="${httptype/
/}"
+-
+-if [ "x$httptype" != "x" ]; then
+- line="x"
+- while [ -n "$line" ]; do
+- read line || exit 0
+- line="${line/
/}"
+- done
+-fi
+-# echo "url = $url, request = $request" >> /tmp/httpd.log
+-case "$url" in
+-/)
+- # We need the size of the display for the current applet.
+- size=`xdpyinfo -display :0| grep dimensions:|head -1|sed -e "s/.*dimensions: *//" -e "s/ pixels.*//"`
+- width=`echo $size|sed -e "s/x.*//"`
+- height=`echo $size|sed -e "s/.*x//"`
+- # The VNC menubar is 20 pixels high ...
+- height=$((height+20))
+-
+- port=`dcop kded kinetd port krfb`
+- if [ "$port" == "-1" ]; then
+- port=5900
+- fi
+-
+- ctype="text/html"
+- content="
+-<HTML><HEAD><TITLE>$LOGNAME's desktop</TITLE></HEAD>
+-<BODY>
+-<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar WIDTH=$width HEIGHT=$height>
+- <param name=PORT value=$port>
+-</APPLET>
+-</BODY></HTML>"
+- ;;
+-*.jar|*.class)
+- # Use basename to make sure we have just a filename, not ../../...
+- url="`basename "$url"`"
+- ctype="application/octet-stream"
+- cfile="/usr/share/vnc/classes/$url"
+- content="FILE"
+- ;;
+-esac
+-
+-if [ "x$httptype" != "x" ]; then
+- echo "HTTP/1.0 200 OK"
+- echo "Content-Type: $ctype"
+- if [ "$content" == "FILE" ]; then
+- clen=`wc -c "$cfile"`
+- else
+- clen=`echo "$content"|wc -c`
+- fi
+- echo "Content-Length: $clen"
+- echo "Connection: close"
+- echo
+-fi
+-
+-if [ "$request" == "GET" ]; then
+- if [ "$content" == "FILE" ]; then
+- cat "$cfile"
+- else
+- echo "$content"
+- fi
+-fi
+-exit 0
++#! /usr/bin/env bash
if [ "$1" = "--kinetd" ]; then
# redirect stdin and stdout to the inetd socket.
exec <&$2 >&$2
fi
read request url httptype || exit 0
url="${url/
/}"
httptype="${httptype/
/}"
if [ "x$httptype" != "x" ]; then
line="x"
while [ -n "$line" ]; do
read line || exit 0
line="${line/
/}"
done
fi
# echo "url = $url, request = $request" >> /tmp/httpd.log
case "$url" in
/)
# We need the size of the display for the current applet.
size=`xdpyinfo -display :0| grep dimensions:|head -n 1|sed -e "s/.*dimensions: *//" -e "s/ pixels.*//"`
width=`echo $size|sed -e "s/x.*//"`
height=`echo $size|sed -e "s/.*x//"`
# The VNC menubar is 20 pixels high ...
height=$((height+20))
port=`dcop kded kinetd port krfb`
if [ "$port" == "-1" ]; then
port=5900
fi
ctype="text/html"
content="
<HTML><HEAD><TITLE>$LOGNAME's desktop</TITLE></HEAD>
<BODY>
<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar WIDTH=$width HEIGHT=$height>
<param name=PORT value=$port>
</APPLET>
</BODY></HTML>"
;;
*.jar|*.class)
# Use basename to make sure we have just a filename, not ../../...
url="`basename "$url"`"
ctype="application/octet-stream"
cfile="/usr/share/vnc/classes/$url"
content="FILE"
;;
esac
if [ "x$httptype" != "x" ]; then
echo "HTTP/1.0 200 OK"
echo "Content-Type: $ctype"
if [ "$content" == "FILE" ]; then
clen=`wc -c "$cfile"`
else
clen=`echo "$content"|wc -c`
fi
echo "Content-Length: $clen"
echo "Connection: close"
echo
fi
if [ "$request" == "GET" ]; then
if [ "$content" == "FILE" ]; then
cat "$cfile"
else
echo "$content"
fi
fi
exit 0
+\ No newline at end of file
+--- krfb/krfb_httpd/kinetd_krfb_httpd.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ krfb/krfb_httpd/kinetd_krfb_httpd.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -16,6 +16,7 @@
+ Name=KRfb Micro Httpd
+ Name[ar]=KRfb ميكرو httpd
+ Name[bg]=Микро уеб сървър (KRfb - httpd)
++Name[bn]=কে-আর-এফ-বি মাইক্রো এইচটিটিপিডি
+ Name[cs]=KRfb mikro Httpd
+ Name[cy]=Meicro-Httpd KRfb
+ Name[da]=KRfb Micro-Httpd
+@@ -42,6 +43,7 @@
+ Comment=A micro http daemon for krfb that serves the VNC viewer applet.
+ Comment[ar]=مراقب httpd صغير لـkrfb الذي يخدم بريمج عرض VNC.
+ Comment[bg]=Малък уеб сървър, който обслужва аплета за преглед на VNC
++Comment[bn]=কে-আর-এফ-বির জন্য একটি মাইক্রো এইচটিটিপি ডিমন যে ভি-এন-সি প্রদর্শক অ্যাপলেট সরবরাহ করে।
+ Comment[bs]=Mikro HTTP demon za krfb koji služi za applet VNC preglednika.
+ Comment[ca]=Un micro-dimoni http per a krfb que serveix l'applet visor VNC.
+ Comment[cs]=Mikro HTTP server pro krfb sloužící VNC prohlížeči.
+--- krfb/kcm_krfb/kcmkrfb.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ krfb/kcm_krfb/kcmkrfb.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -12,6 +12,7 @@
+ Name=Desktop Sharing
+ Name[af]=Werkskerm Deeling
+ Name[ar]=مشاركة سطح المكتب
++Name[bn]=ডেস্কটপ ভাগাভাগি
+ Name[br]=Rannañ ar vurev
+ Name[bs]=Dijeljenje desktopa
+ Name[ca]=Compartició de l'escriptori
+@@ -71,6 +72,7 @@
+ Comment[af]=Konfigureer Werkskerm Deeling
+ Comment[ar]=تعديل مشاركة سطح المكتب
+ Comment[bg]=Настройки на споделянето на работно място
++Comment[bn]=ডেস্কটপ ভাগাভাগি কনফিগার করুন
+ Comment[bs]=Podesite dijeljenje desktopa
+ Comment[ca]=Lupa de l'escriptori
+ Comment[cs]=Nastavit sdílení pracovní plochy
+--- krfb/kinetd/kinetd.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ krfb/kinetd/kinetd.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -12,6 +12,7 @@
+ Name[af]=Kde Internet Bediener
+ Name[ar]=مراقب انترنت كيدي
+ Name[bg]=Интернет демон
++Name[bn]=কে-ডি-ই ইন্টারনেট ডিমন
+ Name[br]=Diaoul kenrouedad KDE
+ Name[ca]=Dimoni d'Internet per al KDE
+ Name[cs]=KDE Internet démon
+@@ -65,6 +66,7 @@
+ Comment=An Internet daemon that starts network services on demand
+ Comment[ar]=مراقب انترنت يقوم ببدء خدمات الشبكة عند الطلب
+ Comment[bg]=Интернет демон, който служи за стартиране на мрежови услуги при поискване
++Comment[bn]=একটি ইন্টারনেট ডিমন যে চাহিদা ভিত্তিক নেটওয়ার্ক সার্ভিস আরম্ভ করে
+ Comment[bs]=Internet daemon koji pokreće mrežne servise po potrebi
+ Comment[ca]=Un dimoni d'Internet que arrenca els serveis de xarxa sota demanda
+ Comment[cs]=Internetový démon spouštějící síťové služby na požádání
+--- krfb/kinetd/eventsrc (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ krfb/kinetd/eventsrc (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -1,6 +1,7 @@
+ [!Global!]
+ IconName=kinetd
+ Comment=KInetD
++Comment[bn]=কে-আইনেট-ডি
+ Comment[hi]=के-इनिट-डी
+ Comment[sv]=Kinetd
+
+@@ -8,6 +9,7 @@
+ Name=IncomingConnection
+ Name[ar]=اتصال وارد
+ Name[bg]=Получена е входяща връзка
++Name[bn]=অন্তর্মুখী সংযোগ
+ Name[br]=Kevreadenn resev
+ Name[ca]=Connexió entrant
+ Name[cs]=Příchozí spojení
+@@ -63,6 +65,7 @@
+ Comment[af]=Ontvang inkomende verbinding
+ Comment[ar]=تم استلام اتصال وارد
+ Comment[bg]=Получена е входяща връзка
++Comment[bn]=অন্তর্মুখী সংযোগ গ্রহণ করল
+ Comment[bs]=Primio dolaznu konekciju
+ Comment[ca]=Rebuda connexió entrant
+ Comment[cs]=Obdrženo příchozí spojení
+@@ -120,6 +123,7 @@
+ Name=ProcessFailed
+ Name[ar]=فشلت العملية
+ Name[bg]=Процесът за обработка връзки не може да бъде стартиран
++Name[bn]=প্রসেস ব্যর্থ
+ Name[ca]=Procés fallit
+ Name[cs]=Proces selhal
+ Name[cy]=MethoddProses
+@@ -174,6 +178,7 @@
+ Comment[af]=Kon nie roep proses na handvatsel verbinding
+ Comment[ar]=لم أستطع استحضار العملية لحمل المكالمة
+ Comment[bg]=Процесът за обработка връзки не може да бъде стартиран
++Comment[bn]=সংযোগ পরিচালনা করতে প্রসেস শুরু করতে পারল না
+ Comment[bs]=Ne mogu pokrenuti proces koji upravlja konekcijom
+ Comment[ca]=No es pot cridar al procés per a manejar la connexió
+ Comment[cs]=Nelze spustit proces k obsluze spojení
+--- krfb/kinetd/kinetdmodule.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ krfb/kinetd/kinetdmodule.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -6,6 +6,7 @@
+ Name=KInetD Module Type
+ Name[ar]=KInetD نوع وحدة
+ Name[bg]=Модул на KInetD
++Name[bn]=কে-আইনেট-ডি মডিউল ধরন
+ Name[br]=Seurt ar mollad KInetD
+ Name[bs]=KInetD tip modula
+ Name[ca]=Tipus de mòdul del KInetD
+--- lanbrowsing/kcmlisa/kcmkiolan.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ lanbrowsing/kcmlisa/kcmkiolan.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -10,6 +10,7 @@
+
+ Name=LAN KIO Slave
+ Name[ar]=الشبكة المحلية KIO Slave
++Name[bn]=ল্যান কে-আই-ও স্লেভ
+ Name[br]=Sklav LAN evit KIO
+ Name[bs]=LAN KIO slave
+ Name[cs]=LAN KIO slave
+@@ -51,6 +52,7 @@
+ Comment=lan: and rlan: setup
+ Comment[ar]=lan: و rlan: تنصيب
+ Comment[bg]=Настройки на протоколите lan: и rlan:
++Comment[bn]=ল্যান: এবং আর-ল্যান: ব্যবস্থাপনা
+ Comment[bs]=Podešavanje lan: i rlan: URLova
+ Comment[ca]=Per l'arranjament de lan: i rlan:
+ Comment[cs]=Nastavení lan: and rlan:
+@@ -104,6 +106,7 @@
+
+ Keywords=lan
+ Keywords[bg]=настройки, локална, мрежа, lan
++Keywords[bn]=ল্যান
+ Keywords[de]=LAN
+ Keywords[fr]=lan,réseau local,réseau
+ Keywords[gl]=lan,redes locáis
+--- lanbrowsing/kcmlisa/kcmlisa.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ lanbrowsing/kcmlisa/kcmlisa.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -16,6 +16,7 @@
+ Comment=Setup LISa
+ Comment[ar]=تنصيب LISa
+ Comment[bg]=Настройки на LISa
++Comment[bn]=LISa ব্যবস্থাপনা
+ Comment[br]=Kefluniañ LISa
+ Comment[bs]=Podešavanje LISe
+ Comment[ca]=Per l'arranjament de LISa
+--- lanbrowsing/kcmlisa/kcmreslisa.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ lanbrowsing/kcmlisa/kcmreslisa.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -15,6 +15,7 @@
+ Comment=Setup ResLISa
+ Comment[ar]=تنصيب ResLISa
+ Comment[bg]=Настройки на ResLISa
++Comment[bn]=ResLISa ব্যবস্থাপনা
+ Comment[br]=Kefluniañ ResLISa
+ Comment[bs]=Podešavanje ResLISe
+ Comment[ca]=Per l'arranjament de ResLISa
+--- lanbrowsing/kio_lan/lisa.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ lanbrowsing/kio_lan/lisa.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -5,6 +5,7 @@
+ Icon=network
+ Name=LAN Browser
+ Name[bg]=Браузър на локалната мрежа
++Name[bn]=ল্যান ব্রাউজার
+ Name[br]=Furcher LAN
+ Name[bs]=LAN preglednik
+ Name[ca]=Navegador LAN
+--- lanbrowsing/kio_lan/lan.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ lanbrowsing/kio_lan/lan.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -10,6 +10,7 @@
+ Name[az]=Yerli Şəbəkə
+ Name[be]=Лякальная сетка
+ Name[bg]=Локална мрежа
++Name[bn]=স্থানীয় নেটওয়ার্ক
+ Name[br]=Rouedad lec'hel
+ Name[bs]=Lokalna mreža
+ Name[ca]=Xarxa local
+--- kdnssd/ioslave/invitation.protocol (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kdnssd/ioslave/invitation.protocol (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Icon=network_local
+ Description=SD invitations
+ Description[bg]=Покани SD
++Description[bn]=এসডি আমন্ত্রণ
+ Description[ca]=Invitacions SD
+ Description[cs]=SD pozvánky
+ Description[da]=SD-invitationer
+--- kdnssd/ioslave/zeroconf.protocol (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kdnssd/ioslave/zeroconf.protocol (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -13,6 +13,7 @@
+ moving=false
+ Icon=network_local
+ Description=A kioslave for ZeroConf
++Description[bn]=জিরো-কন্ফ এর জন্য একটি কে-আই-ও স্লেভ
+ Description[br]=Ur c'hioslave evit ZeroConf
+ Description[ca]=Un kioslave per ZeroConf
+ Description[cs]=Pomocný protokol pro Zeroconf
+--- kdnssd/ioslave/zeroconf.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kdnssd/ioslave/zeroconf.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -3,6 +3,7 @@
+ Icon=network_local
+ Name=Network Services
+ Name[bg]=Мрежови услуги
++Name[bn]=নেটওয়ার্ক সার্ভিস
+ Name[br]=Servijoù rouedad
+ Name[ca]=Serveis de xarxa
+ Name[cs]=Síťové služby
+--- kdnssd/kdedmodule/dnssdwatcher.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kdnssd/kdedmodule/dnssdwatcher.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=DNS-SD Services Watcher
++Name[bn]=ডিএনএস-এসডি সার্ভিস পর্যবেক্ষক
+ Name[ca]=Vigilant de serveis DNS-SD
+ Name[cs]=Sledování DNS-SD služeb
+ Name[da]=DNS-SD overvågning af tjenester
+@@ -34,6 +35,7 @@
+ Name[zh_CN]=DNS-SD 服务监视器
+ Name[zh_HK]=DNS-SD 服務監察器
+ Comment=Keeps track of DNS-SD services and updates directory listings
++Comment[bn]=ডিএনএস-এসডি সার্ভিসের খোঁজ রাখে এবং ডিরেক্টরী তালিকা আপডেট করে
+ Comment[ca]=Segueix els serveis DNS-SD i actualitza les llistes de directoris
+ Comment[cs]=Udržuje přehled o DNS-SD službách a aktualizuje výpisy adresářů
+ Comment[da]=Holder styr på DNS-SD-tjenester og opdaterer lister med mapper
+--- kopete/plugins/nowlistening/kopete_nowlistening_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/nowlistening/kopete_nowlistening_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Name[ar]=الاستماع جار
+ Name[be]=Слухаю зараз
+ Name[bg]=Инфо за песен
++Name[bn]=এখন শুনছেন
+ Name[bs]=Sada slušam
+ Name[ca]=Ara s'escolta
+ Name[cs]=Nyní poslouchám
+@@ -59,6 +60,7 @@
+ Comment=Tells your buddies what you're listening to
+ Comment[ar]=تخبر أصدقائك بما تستمع إليه
+ Comment[bg]=Приставка за информиране на приятелите какво слушате
++Comment[bn]=আপনার বন্ধুদের বলে আপনি কি শুনছেন
+ Comment[bs]=Obavještava vaše prijatelje o muzici koju slušate
+ Comment[ca]=Li diu als vostres companys què esteu escoltant
+ Comment[cs]=Sdělí vašim kamarádům, co právě posloucháte
+--- kopete/plugins/nowlistening/kopete_nowlistening.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/nowlistening/kopete_nowlistening.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -18,6 +18,7 @@
+ Name[ar]=الاستماع جار
+ Name[be]=Слухаю зараз
+ Name[bg]=Инфо за песен
++Name[bn]=এখন শুনছেন
+ Name[bs]=Sada slušam
+ Name[ca]=Ara s'escolta
+ Name[cs]=Nyní poslouchám
+@@ -63,6 +64,7 @@
+ Comment=Tells your buddies what you're listening to
+ Comment[ar]=تخبر أصدقائك بما تستمع إليه
+ Comment[bg]=Приставка за информиране на приятелите какво слушате
++Comment[bn]=আপনার বন্ধুদের বলে আপনি কি শুনছেন
+ Comment[bs]=Obavještava vaše prijatelje o muzici koju slušate
+ Comment[ca]=Li diu als vostres companys què esteu escoltant
+ Comment[cs]=Sdělí vašim kamarádům, co právě posloucháte
+--- kopete/plugins/motionautoaway/kopete_motionaway.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/motionautoaway/kopete_motionaway.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -16,6 +16,7 @@
+ Name=Motion Auto-Away
+ Name[ar]=حركة التبعيد التلقائية
+ Name[bg]=Промяна на състоянието
++Name[bn]=চলাচল স্বয়ংক্রীয়-অনুপস্থিতি
+ Name[bs]=Auto-odsutnost na osnovu kretanja
+ Name[ca]=Auto-absent per moviment
+ Name[cs]=Pohybem automaticky pryč
+@@ -58,6 +59,7 @@
+ Comment=Sets away status when not detecting movement near the computer
+ Comment[ar]=يحول وضع الاتصال إلى في الخارج عندما لا يتم تحديد تعاملات مع الكومبيوتر
+ Comment[bg]=Промяна на състоянието, когато няма активност от страна на потребителя
++Comment[bn]=যখন কম্পিউটারের কাছে কোনও চলাচল অনুভূত হয়না তখন অনুপস্থিত অবস্থা নিযুক্ত করে
+ Comment[bs]=Postavlja status odsutnosti ako nije detektovano kretanje u blizini računara
+ Comment[ca]=Estableix l'estatus d'absent en no detectar moviment a l'ordinador
+ Comment[cs]=Nastaví automaticky stav "pryč" při absenci pohybu
+--- kopete/plugins/motionautoaway/kopete_motionaway_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/motionautoaway/kopete_motionaway_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -12,6 +12,7 @@
+ Name=Motion Auto-Away
+ Name[ar]=حركة التبعيد التلقائية
+ Name[bg]=Промяна на състоянието
++Name[bn]=চলাচল স্বয়ংক্রীয়-অনুপস্থিতি
+ Name[bs]=Auto-odsutnost na osnovu kretanja
+ Name[ca]=Auto-absent per moviment
+ Name[cs]=Pohybem automaticky pryč
+@@ -54,6 +55,7 @@
+ Comment=Sets away status when not detecting movement near the computer
+ Comment[ar]=يحول وضع الاتصال إلى في الخارج عندما لا يتم تحديد تعاملات مع الكومبيوتر
+ Comment[bg]=Промяна на състоянието, когато няма активност от страна на потребителя
++Comment[bn]=যখন কম্পিউটারের কাছে কোনও চলাচল অনুভূত হয়না তখন অনুপস্থিত অবস্থা নিযুক্ত করে
+ Comment[bs]=Postavlja status odsutnosti ako nije detektovano kretanje u blizini računara
+ Comment[ca]=Estableix l'estatus d'absent en no detectar moviment a l'ordinador
+ Comment[cs]=Nastaví automaticky stav "pryč" při absenci pohybu
+--- kopete/plugins/smpppdcs/smpppdlocationwidget.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/smpppdlocationwidget.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,30 @@
++/*
++ smpppdlocationwidget.cpp
++
++ Copyright (c) 2004-2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * 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; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++#include <klineedit.h>
++
++#include "smpppdlocationwidget.h"
++
++SMPPPDLocationWidget::SMPPPDLocationWidget(QWidget* parent, const char* name, WFlags fl)
++ : SMPPPDLocationWidgetBase(parent, name, fl) {}
++
++SMPPPDLocationWidget::~SMPPPDLocationWidget() {}
++
++void SMPPPDLocationWidget::setServer(const QString& serv) {
++ server->setText(serv);
++}
++
++#include "smpppdlocationwidget.moc"
+--- kopete/plugins/smpppdcs/kinternetiface.h (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/kinternetiface.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,47 @@
++// -*- c++ -*-
++/***************************************************************************
++ * *
++ * Copyright: SuSE Linux AG, Nuernberg *
++ * *
++ * Author: Arvin Schnell <arvin at suse.de> *
++ * *
++ ***************************************************************************/
++
++/***************************************************************************
++ * *
++ * This program is free software; you can redistribute it and/or modify *
++ * it under the terms of the GNU General Public License as published by *
++ * the Free Software Foundation; either version 2 of the License, or *
++ * (at your option) any later version. *
++ * *
++ ***************************************************************************/
++
++
++#ifndef KINTERNETIFACE_H
++#define KINTERNETIFACE_H
++
++
++#include <dcopobject.h>
++
++class KInternetIface : public DCOPObject
++{
++ K_DCOP
++
++public:
++
++ KInternetIface (const QCString& name) : DCOPObject (name) { }
++
++k_dcop:
++
++ // query function for susewatcher
++ bool isOnline () {
++#ifndef NDEBUG
++ fprintf (stderr, "%s\n", __PRETTY_FUNCTION__);
++#endif
++ return kinternet && kinternet->get_status () == KInternet::CONNECTED;
++ }
++
++};
++
++
++#endif
+--- kopete/plugins/smpppdcs/libsmpppdclient/smpppdclient.h (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/libsmpppdclient/smpppdclient.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -43,19 +43,19 @@
+ bool connect(const QString& server, uint port = 3185);
+ void disconnect();
+
+- QStringList getInterfaceConfigurations();
+- bool statusInterface(const QString& ifcfg);
+-
++ QStringList getInterfaceConfigurations();
++ bool statusInterface(const QString& ifcfg);
++
+ bool isOnline();
+ QString serverID() const;
+ QString serverVersion() const;
+-
+- void setPassword(const QString& password);
+
++ void setPassword(const QString& password);
++
+ private:
+ friend class State;
+-
+- void changeState(State * newState);
++
++ void changeState(State * newState);
+ QStringList read() const;
+ void write(const char * cmd);
+
+@@ -64,7 +64,7 @@
+ KNetwork::KStreamSocket * m_sock;
+ QString m_serverID;
+ QString m_serverVer;
+- QString m_password;
++ QString m_password;
+ };
+
+ inline void Client::changeState(State * newState) {
+@@ -72,7 +72,7 @@
+ }
+
+ inline void Client::setPassword(const QString& password) {
+- m_password = password;
++ m_password = password;
+ }
+
+ };
+--- kopete/plugins/smpppdcs/libsmpppdclient/Makefile.am (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/libsmpppdclient/Makefile.am (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -7,4 +7,4 @@
+ libsmpppdclient_la_SOURCES = smpppdclient.cpp smpppdstate.cpp smpppdready.cpp \
+ smpppdunsettled.cpp
+
+-libsmpppdclient_la_LIBADD = -lcrypto
+\ No newline at end of file
++libsmpppdclient_la_LIBADD = -lcrypto
+--- kopete/plugins/smpppdcs/iconnector.h (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/iconnector.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -28,7 +28,7 @@
+
+ public:
+ IConnector() {}
+- ;
++
+ virtual ~IConnector() {}
+
+ /**
+--- kopete/plugins/smpppdcs/smpppdcsconfig.kcfgc (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/smpppdcsconfig.kcfgc (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,6 @@
++File=smpppdcs.kcfg
++ClassName=SMPPPDCSConfig
++Singleton=true
++Mutators=true
++MemberVariables=private
++GlobalEnums=true
+\ No newline at end of file
+--- kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,165 @@
++/*
++ smpppdcsprefsimpl.cpp
++
++ Copyright (c) 2004-2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * 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; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++#include <arpa/inet.h>
++#include <netdb.h>
++
++#include <qradiobutton.h>
++
++#include <kstandarddirs.h>
++#include <kapplication.h>
++#include <kpushbutton.h>
++#include <kresolver.h>
++#include <knuminput.h>
++#include <klocale.h>
++#include <kdebug.h>
++
++#include "kopetepluginmanager.h"
++
++#include "../smpppdcsplugin.h"
++
++#include "smpppdlocationwidget.h"
++#include "smpppdcsprefsimpl.h"
++#include "smpppdsearcher.h"
++
++SMPPPDCSPrefs::SMPPPDCSPrefs(QWidget* parent, const char* name, WFlags fl)
++ : SMPPPDCSPrefsBase(parent, name, fl), m_plugin(NULL), m_scanProgressDlg(NULL), m_curSearcher(NULL) {
++
++ // search for our main-plugin instance
++ Kopete::Plugin * p = Kopete::PluginManager::self()->plugin("kopete_smpppdcs");
++ if(p) {
++ m_plugin = static_cast<SMPPPDCSPlugin *>(p);
++ }
++
++ // signals and slots connections
++ connect(useNetstat, SIGNAL(toggled(bool)), this, SLOT(disableSMPPPDSettings()));
++ connect(useSmpppd, SIGNAL(toggled(bool)), this, SLOT(enableSMPPPDSettings()));
++ connect(autoCSTest, SIGNAL(clicked()), this, SLOT(determineCSType()));
++
++ if(m_plugin) {
++ connect((QObject *)SMPPPDLocation->server, SIGNAL(textChanged(const QString&)),
++ m_plugin, SLOT(smpppdServerChanged(const QString&)));
++ }
++
++ // if netstat is NOT available, disable the option and set to SMPPPD
++ if(KStandardDirs::findExe("netstat") == QString::null) {
++ autoCSTest->setEnabled(FALSE);
++ useNetstat->setEnabled(FALSE);
++ useNetstat->setChecked(FALSE);
++ useSmpppd->setChecked(TRUE);
++ }
++}
++
++SMPPPDCSPrefs::~SMPPPDCSPrefs() {
++ delete m_scanProgressDlg;
++}
++
++void SMPPPDCSPrefs::determineCSType() {
++
++ // while we search, we'll disable the button
++ autoCSTest->setEnabled(false);
++ //kapp->processEvents();
++
++ /* broadcast network for a smpppd.
++ If one is available set to smpppd method */
++
++ SMPPPDSearcher searcher;
++ m_curSearcher = &searcher;
++
++ connect(&searcher, SIGNAL(smpppdFound(const QString&)), this, SLOT(smpppdFound(const QString&)));
++ connect(&searcher, SIGNAL(smpppdNotFound()), this, SLOT(smpppdNotFound()));
++ connect(&searcher, SIGNAL(scanStarted(uint)), this, SLOT(scanStarted(uint)));
++ connect(&searcher, SIGNAL(scanProgress(uint)), this, SLOT(scanProgress(uint)));
++ connect(&searcher, SIGNAL(scanFinished()), this, SLOT(scanFinished()));
++
++ searcher.searchNetwork();
++ m_curSearcher = NULL;
++}
++
++void SMPPPDCSPrefs::scanStarted(uint total) {
++ kdDebug(14312) << k_funcinfo << "Scanning for a SMPPPD started. Will scan " << total << " IPs" << endl;
++
++ // setup the scanProgress Dialog
++ if(!m_scanProgressDlg) {
++ m_scanProgressDlg = new KProgressDialog(this, 0, i18n("Searching"), i18n("Searching for a SMPPPD on the local network..."), TRUE);
++ m_scanProgressDlg->setAutoClose(TRUE);
++ m_scanProgressDlg->setAllowCancel(TRUE);
++ m_scanProgressDlg->setMinimumDuration(2000);
++
++ connect(m_scanProgressDlg, SIGNAL(cancelClicked()), this, SLOT(cancelScanning()));
++ }
++ m_scanProgressDlg->progressBar()->setTotalSteps(total);
++ m_scanProgressDlg->progressBar()->setProgress(0);
++ m_scanProgressDlg->show();
++}
++
++void SMPPPDCSPrefs::scanProgress(uint cur) {
++ m_scanProgressDlg->progressBar()->setProgress(cur);
++ kapp->processEvents();
++}
++
++void SMPPPDCSPrefs::cancelScanning() {
++ kdDebug(14312) << k_funcinfo << endl;
++ Q_ASSERT(m_curSearcher);
++ m_curSearcher->cancelSearch();
++}
++
++void SMPPPDCSPrefs::smpppdFound(const QString& host) {
++ kdDebug(14312) << k_funcinfo << endl;
++
++ QString myHost = host;
++
++ // try to get the domain name
++ struct in_addr addr;
++ if(inet_aton(host.ascii(), &addr)) {
++ struct hostent * hostEnt = gethostbyaddr(&addr.s_addr, sizeof(addr.s_addr), AF_INET);
++ if(hostEnt) {
++ myHost = hostEnt->h_name;
++ } else {
++#ifndef NDEBUG
++ switch(h_errno) {
++ case HOST_NOT_FOUND:
++ kdDebug(14312) << k_funcinfo << "No such host is known in the database." << endl;
++ break;
++ case TRY_AGAIN:
++ kdDebug(14312) << k_funcinfo << "Couldn't contact DNS server." << endl;
++ break;
++ case NO_RECOVERY:
++ kdDebug(14312) << k_funcinfo << "A non-recoverable error occurred." << endl;
++ break;
++ case NO_ADDRESS:
++ kdDebug(14312) << k_funcinfo << "The host database contains an entry for the name, but it doesn't have an associated Internet address." << endl;
++ break;
++ }
++#endif
++
++ }
++ }
++
++ SMPPPDLocation->setServer(myHost);
++ useNetstat->setChecked(false);
++ useSmpppd->setChecked(true);
++ autoCSTest->setEnabled(true);
++}
++
++void SMPPPDCSPrefs::smpppdNotFound() {
++ kdDebug(14312) << k_funcinfo << endl;
++ useNetstat->setChecked(true);
++ useSmpppd->setChecked(false);
++ autoCSTest->setEnabled(true);
++}
++
++#include "smpppdcsprefsimpl.moc"
+--- kopete/plugins/smpppdcs/smpppdcspreferences.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/smpppdcspreferences.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,187 @@
++/*
++ smpppdcspreferences.cpp
++
++ Copyright (c) 2004-2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * 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; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++#include <qlayout.h>
++#include <qregexp.h>
++#include <qradiobutton.h>
++
++#include <klistview.h>
++#include <klineedit.h>
++#include <knuminput.h>
++#include <kgenericfactory.h>
++
++#include "kopeteaccount.h"
++#include "kopeteprotocol.h"
++#include "kopeteaccountmanager.h"
++
++#include "smpppdlocationwidget.h"
++#include "smpppdcspreferences.h"
++#include "smpppdcsprefsimpl.h"
++#include "smpppdcsconfig.h"
++
++typedef KGenericFactory<SMPPPDCSPreferences> SMPPPDCSPreferencesFactory;
++K_EXPORT_COMPONENT_FACTORY(kcm_kopete_smpppdcs, SMPPPDCSPreferencesFactory("kcm_kopete_smpppdcs"))
++
++SMPPPDCSPreferences::SMPPPDCSPreferences(QWidget * parent, const char * /* name */, const QStringList& args)
++ : KCModule(SMPPPDCSPreferencesFactory::instance(), parent, args), m_ui(NULL) {
++
++ Kopete::AccountManager * manager = Kopete::AccountManager::self();
++ (new QVBoxLayout(this))->setAutoAdd(true);
++ m_ui = new SMPPPDCSPrefs(this);
++
++ for(QPtrListIterator<Kopete::Account> it(manager->accounts()); it.current(); ++it)
++ {
++ QString protoName;
++ QRegExp rex("(.*)Protocol");
++
++ if(rex.search((*it)->protocol()->pluginId()) > -1) {
++ protoName = rex.cap(1);
++ } else {
++ protoName = (*it)->protocol()->pluginId();
++ }
++
++ if(it.current()->inherits("Kopete::ManagedConnectionAccount")) {
++ protoName += QString(", %1").arg(i18n("connection status is managed by Kopete"));
++ }
++
++ QCheckListItem * cli = new QCheckListItem(m_ui->accountList,
++ (*it)->accountId() + " (" + protoName + ")", QCheckListItem::CheckBox);
++ cli->setPixmap(0, (*it)->accountIcon());
++
++ m_accountMapOld[cli->text(0)] = AccountPrivMap(FALSE, (*it)->protocol()->pluginId() + "_" + (*it)->accountId());
++ m_accountMapCur[cli->text(0)] = AccountPrivMap(FALSE, (*it)->protocol()->pluginId() + "_" + (*it)->accountId());;
++ m_ui->accountList->insertItem(cli);
++ }
++
++ connect(m_ui->accountList, SIGNAL(clicked(QListViewItem *)), this, SLOT(listClicked(QListViewItem *)));
++
++ // connect for modified
++ connect(m_ui->useNetstat, SIGNAL(clicked()), this, SLOT(slotModified()));
++ connect(m_ui->useSmpppd, SIGNAL(clicked()), this, SLOT(slotModified()));
++
++ connect(m_ui->SMPPPDLocation->server, SIGNAL(textChanged(const QString&)), this, SLOT(slotModified()));
++ connect(m_ui->SMPPPDLocation->port, SIGNAL(valueChanged(int)), this, SLOT(slotModified()));
++ connect(m_ui->SMPPPDLocation->Password, SIGNAL(textChanged(const QString&)), this, SLOT(slotModified()));
++
++ load();
++}
++
++SMPPPDCSPreferences::~SMPPPDCSPreferences() {
++ delete m_ui;
++}
++
++void SMPPPDCSPreferences::listClicked(QListViewItem * item)
++{
++ QCheckListItem * cli = dynamic_cast<QCheckListItem *>(item);
++
++ if(cli->isOn() != m_accountMapCur[cli->text(0)].m_on) {
++ AccountMap::iterator itOld = m_accountMapOld.begin();
++ AccountMap::iterator itCur;
++ bool change = FALSE;
++
++ for(itCur = m_accountMapCur.begin(); itCur != m_accountMapCur.end(); ++itCur, ++itOld) {
++ if((*itCur).m_on != (*itOld).m_on){
++ change = TRUE;
++ break;
++ }
++ }
++ emit KCModule::changed(change);
++ }
++ m_accountMapCur[cli->text(0)].m_on = cli->isOn();
++}
++
++void SMPPPDCSPreferences::defaults()
++{
++ QListViewItemIterator it(m_ui->accountList);
++ while(it.current()) {
++ QCheckListItem * cli = dynamic_cast<QCheckListItem *>(it.current());
++ cli->setOn(FALSE);
++ ++it;
++ }
++
++ SMPPPDCSConfig::self()->setDefaults();
++
++ m_ui->useNetstat->setChecked(SMPPPDCSConfig::self()->useNetstat());
++ m_ui->useSmpppd->setChecked(SMPPPDCSConfig::self()->useSmpppd());
++
++ m_ui->SMPPPDLocation->server->setText(SMPPPDCSConfig::self()->server());
++ m_ui->SMPPPDLocation->port->setValue(SMPPPDCSConfig::self()->port());
++ m_ui->SMPPPDLocation->Password->setText(SMPPPDCSConfig::self()->password());
++}
++
++void SMPPPDCSPreferences::load()
++{
++
++ SMPPPDCSConfig::self()->readConfig();
++
++ static QString rexStr = "^(.*) \\((.*)\\)";
++ QRegExp rex(rexStr);
++ QStringList list = SMPPPDCSConfig::self()->ignoredAccounts();
++ QListViewItemIterator it(m_ui->accountList);
++ while(it.current()) {
++ QCheckListItem * cli = dynamic_cast<QCheckListItem *>(it.current());
++ if(rex.search(cli->text(0)) > -1) {
++ bool isOn = list.contains(rex.cap(2) + "Protocol_" + rex.cap(1));
++ // m_accountMapOld[cli->text(0)].m_on = isOn;
++ m_accountMapCur[cli->text(0)].m_on = isOn;
++ cli->setOn(isOn);
++ }
++ ++it;
++ }
++
++ m_ui->useNetstat->setChecked(SMPPPDCSConfig::self()->useNetstat());
++ m_ui->useSmpppd->setChecked(SMPPPDCSConfig::self()->useSmpppd());
++
++ m_ui->SMPPPDLocation->server->setText(SMPPPDCSConfig::self()->server());
++ m_ui->SMPPPDLocation->port->setValue(SMPPPDCSConfig::self()->port());
++ m_ui->SMPPPDLocation->Password->setText(SMPPPDCSConfig::self()->password());
++
++ emit KCModule::changed(false);
++}
++
++void SMPPPDCSPreferences::save()
++{
++ QStringList list;
++ QListViewItemIterator it(m_ui->accountList);
++ while(it.current()) {
++
++ QCheckListItem * cli = dynamic_cast<QCheckListItem *>(it.current());
++ if(cli->isOn()) {
++ list.append(m_accountMapCur[cli->text(0)].m_id);
++ }
++
++ ++it;
++ }
++
++ SMPPPDCSConfig::self()->setIgnoredAccounts(list);
++
++ SMPPPDCSConfig::self()->setUseNetstat(m_ui->useNetstat->isChecked());
++ SMPPPDCSConfig::self()->setUseSmpppd(m_ui->useSmpppd->isChecked());
++
++ SMPPPDCSConfig::self()->setServer(m_ui->SMPPPDLocation->server->text());
++ SMPPPDCSConfig::self()->setPort(m_ui->SMPPPDLocation->port->value());
++ SMPPPDCSConfig::self()->setPassword(m_ui->SMPPPDLocation->Password->text());
++
++ SMPPPDCSConfig::self()->writeConfig();
++
++ emit KCModule::changed(false);
++}
++
++void SMPPPDCSPreferences::slotModified() {
++ emit KCModule::changed(true);
++}
++
++#include "smpppdcspreferences.moc"
+--- kopete/plugins/smpppdcs/smpppdcsplugin.h (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/smpppdcsplugin.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -62,7 +62,15 @@
+ */
+ virtual ~SMPPPDCSPlugin();
+
++ // Implementation of DCOP iface
+ /**
++ * @brief Checks if we are online.
++ * @note This method is reserved for future use. Do not use at the moment!
++ * @return <code>TRUE</code> if online, otherwise <code>FALSE</code>
++ */
++ virtual bool isOnline() const;
++
++ /**
+ * @brief Sets the status in all allowed accounts.
+ * Allowed accounts are set in the config dialog of the plugin.
+ *
+@@ -70,39 +78,27 @@
+ */
+ virtual void setConnectedStatus( bool newStatus );
+
+- // Implementation of DCOP iface
+-
+- /**
+- * @brief Checks if we are online.
+- * @note This method is reserved for future use. Do not use at the moment!
+- * @return <code>TRUE</code> if online, otherwise <code>FALSE</code>
+- */
+- virtual bool isOnline();
+-
+ virtual QString detectionMethod() const;
+
+-protected:
+- /**
+- * @brief Should the smpppd be used for inquiring
+- * @return <code>TRUE</code> for smpppd, <code>FALSE</code> for netstat
+- */
+- bool useSmpppd() const;
++ virtual void aboutToUnload();
+
+ public slots:
+- void smpppdServerChanged(const QString& server);
++ void smpppdServerChanged(const QString& server);
+
+ private slots:
+ void slotCheckStatus();
+ void allPluginsLoaded();
+
+ private:
+- void connectAllowed();
++
++ void connectAllowed();
+ void disconnectAllowed();
+
+ private:
+
+ Detector * m_detectorSMPPPD;
+ Detector * m_detectorNetstat;
++ Detector * m_detectorNetworkStatus;
+ bool m_pluginConnected;
+ QTimer * m_timer;
+ OnlineInquiry * m_onlineInquiry;
+--- kopete/plugins/smpppdcs/detectordcop.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/detectordcop.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -18,24 +18,26 @@
+ #include <dcopclient.h>
+ #include <kdebug.h>
+
++#include "kinternetiface_stub.h"
++
+ #include "detectordcop.h"
+ #include "iconnector.h"
+
+ QCString DetectorDCOP::m_kinternetApp = "";
+
+ DetectorDCOP::DetectorDCOP(IConnector * connector)
+- : Detector(connector) {}
++ : Detector(connector) {}
+
+ DetectorDCOP::~DetectorDCOP() {}
+
+ /*!
+ \fn DetectorDCOP::getKInternetDCOP()
+ */
+-QCString DetectorDCOP::getKInternetDCOP() {
+- m_client = kapp->dcopClient();
+- if(m_kinternetApp.isEmpty() && m_client && m_client->isAttached()) {
++QCString DetectorDCOP::getKInternetDCOP() const {
++ DCOPClient * client = kapp->dcopClient();
++ if(m_kinternetApp.isEmpty() && client && client->isAttached()) {
+ // get all registered dcop apps and search for kinternet
+- QCStringList apps = m_client->registeredApplications();
++ QCStringList apps = client->registeredApplications();
+ QCStringList::iterator iter;
+ for(iter = apps.begin(); iter != apps.end(); ++iter) {
+ if((*iter).left(9) == "kinternet") {
+@@ -50,27 +52,26 @@
+ /*!
+ \fn DetectorDCOP::getConnectionStatusDCOP()
+ */
+-DetectorDCOP::KInternetDCOPState DetectorDCOP::getConnectionStatusDCOP() {
+- QByteArray data, replyData;
+- QCString replyType;
+- QDataStream arg(data, IO_WriteOnly);
+-
++DetectorDCOP::KInternetDCOPState DetectorDCOP::getConnectionStatusDCOP() const {
+ kdDebug(14312) << k_funcinfo << "Start inquiring " << m_kinternetApp << " via DCOP" << endl;
++
++
++ KInternetIface_stub stub = KInternetIface_stub(kapp->dcopClient(), m_kinternetApp, "KInternetIface");
++
++ bool status = stub.isOnline();
++
++ if(stub.ok()) {
++ if(status) {
++ kdDebug(14312) << k_funcinfo << "isOnline() returned true" << endl;
++ return CONNECTED;
++ } else {
++ kdDebug(14312) << k_funcinfo << "isOnline() returned false" << endl;
++ return DISCONNECTED;
++ }
++ } else {
++ kdWarning(14312) << k_funcinfo << "DCOP call to " << m_kinternetApp << " failed!";
++ }
+
+- if(!m_client->call(m_kinternetApp, "KInternetIface", "isOnline()", data, replyType, replyData)) {
+- kdDebug(14312) << k_funcinfo << "there was some error using DCOP." << endl;
+- } else {
+- QDataStream reply(replyData, IO_ReadOnly);
+- if(replyType == "bool") {
+- bool result;
+- reply >> result;
+- kdDebug(14312) << k_funcinfo << "isOnline() returned " << result << endl;
+- return result ? CONNECTED : DISCONNECTED;
+- } else {
+- kdDebug(14312) << k_funcinfo << "isOnline() returned an unexpected type of reply!" << endl;
+- }
+- }
+-
+- return ERROR;
++ return ERROR;
+ }
+
+--- kopete/plugins/smpppdcs/smpppdcs.kcfg (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/smpppdcs.kcfg (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,29 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
++<kcfg>
++ <kcfgfile name="kopeterc"/>
++ <group name="SMPPPDCS Plugin">
++ <entry name="Password" type="String">
++ <label>Password to connect to the SMPPPD.</label>
++ </entry>
++ <entry name="ignoredAccounts" type="StringList">
++ <label>Accounts to ignore in the plugin.</label>
++ </entry>
++ <entry name="server" type="String">
++ <label>SMPPPD-Server to connect.</label>
++ <default>localhost</default>
++ </entry>
++ <entry name="port" type="UInt">
++ <label>SMPPPD-Server port to connect.</label>
++ <default>3185</default>
++ </entry>
++ <entry name="useNetstat" type="Bool">
++ <label>Use the netstat tool to determine the connection status.</label>
++ <default>true</default>
++ </entry>
++ <entry name="useSmpppd" type="Bool">
++ <label>Use the SMPPPD to determine the connection status.</label>
++ <default>false</default>
++ </entry>
++ </group>
++</kcfg>
+\ No newline at end of file
+--- kopete/plugins/smpppdcs/detectornetstat.h (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/detectornetstat.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -37,7 +37,7 @@
+ DetectorNetstat(IConnector* connector);
+ virtual ~DetectorNetstat();
+
+- virtual void checkStatus();
++ virtual void checkStatus() const;
+
+ private slots:
+ // Original cs-plugin code
+@@ -49,7 +49,7 @@
+ void slotProcessExited(KProcess *process);
+
+ private:
+- KProcess * m_process;
++ mutable KProcess * m_process;
+ };
+
+ #endif
+--- kopete/plugins/smpppdcs/smpppdlocationui.ui (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/smpppdlocationui.ui (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,149 @@
++<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
++<class>SMPPPDLocationWidgetBase</class>
++<widget class="QWidget">
++ <property name="name">
++ <cstring>SMPPPDLocationWidgetBase</cstring>
++ </property>
++ <property name="geometry">
++ <rect>
++ <x>0</x>
++ <y>0</y>
++ <width>365</width>
++ <height>167</height>
++ </rect>
++ </property>
++ <property name="caption">
++ <string>SMPPPDLocation</string>
++ </property>
++ <vbox>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <widget class="QLabel">
++ <property name="name">
++ <cstring>textLabel1</cstring>
++ </property>
++ <property name="text">
++ <string>Ser&ver:</string>
++ </property>
++ <property name="buddy" stdset="0">
++ <cstring>server</cstring>
++ </property>
++ </widget>
++ <widget class="KLineEdit">
++ <property name="name">
++ <cstring>server</cstring>
++ </property>
++ <property name="cursor">
++ <cursor>4</cursor>
++ </property>
++ <property name="text">
++ <string>localhost</string>
++ </property>
++ <property name="maxLength">
++ <number>256</number>
++ </property>
++ <property name="toolTip" stdset="0">
++ <string>The server on which the SMPPPD is running</string>
++ </property>
++ </widget>
++ <widget class="QLabel">
++ <property name="name">
++ <cstring>textLabel2</cstring>
++ </property>
++ <property name="text">
++ <string>P&ort:</string>
++ </property>
++ <property name="buddy" stdset="0">
++ <cstring>port</cstring>
++ </property>
++ </widget>
++ <widget class="QLayoutWidget">
++ <property name="name">
++ <cstring>layout14</cstring>
++ </property>
++ <hbox>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <widget class="KIntNumInput">
++ <property name="name">
++ <cstring>port</cstring>
++ </property>
++ <property name="cursor">
++ <cursor>4</cursor>
++ </property>
++ <property name="value">
++ <number>3185</number>
++ </property>
++ <property name="minValue">
++ <number>0</number>
++ </property>
++ <property name="toolTip" stdset="0">
++ <string>The port on which the SMPPPD is running on</string>
++ </property>
++ </widget>
++ <widget class="QLabel">
++ <property name="name">
++ <cstring>textLabel3</cstring>
++ </property>
++ <property name="text">
++ <string>Default: 3185</string>
++ </property>
++ </widget>
++ <spacer>
++ <property name="name">
++ <cstring>spacer15</cstring>
++ </property>
++ <property name="orientation">
++ <enum>Horizontal</enum>
++ </property>
++ <property name="sizeType">
++ <enum>Expanding</enum>
++ </property>
++ <property name="sizeHint">
++ <size>
++ <width>130</width>
++ <height>20</height>
++ </size>
++ </property>
++ </spacer>
++ </hbox>
++ </widget>
++ <widget class="QLabel">
++ <property name="name">
++ <cstring>m_passwordLabel</cstring>
++ </property>
++ <property name="text">
++ <string>Pass&word:</string>
++ </property>
++ <property name="buddy" stdset="0">
++ <cstring>Password</cstring>
++ </property>
++ </widget>
++ <widget class="KLineEdit">
++ <property name="name">
++ <cstring>Password</cstring>
++ </property>
++ <property name="cursor">
++ <cursor>4</cursor>
++ </property>
++ <property name="echoMode">
++ <enum>Password</enum>
++ </property>
++ <property name="toolTip" stdset="0">
++ <string>The password to authenticate with the smpppd</string>
++ </property>
++ </widget>
++ </vbox>
++</widget>
++<customwidgets>
++</customwidgets>
++<layoutdefaults spacing="6" margin="0"/>
++<includehints>
++ <includehint>klineedit.h</includehint>
++ <includehint>knuminput.h</includehint>
++ <includehint>knuminput.h</includehint>
++ <includehint>klineedit.h</includehint>
++</includehints>
++</UI>
+--- kopete/plugins/smpppdcs/smpppdsearcher.h (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/smpppdsearcher.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,102 @@
++/*
++ smpppdsearcher.h
++
++ Copyright (c) 2004-2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * 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; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++
++#ifndef SMPPPDSEARCHER_H
++#define SMPPPDSEARCHER_H
++
++#include <kresolver.h>
++
++class KProcess;
++
++/**
++ * @brief Searches a network for a smpppd
++ *
++ * @todo Use of the SLP to find the smpppd
++ * @author Heiko Schäfer <heiko at rangun.de>
++ */
++class SMPPPDSearcher : public QObject {
++ Q_OBJECT
++
++ SMPPPDSearcher(const SMPPPDSearcher&);
++ SMPPPDSearcher& operator=(const SMPPPDSearcher&);
++
++public:
++ /**
++ * @brief Creates an <code>SMPPPDSearcher</code> instance
++ */
++ SMPPPDSearcher();
++
++ /**
++ * @brief Destroys an <code>SMPPPDSearcher</code> instance
++ */
++ ~SMPPPDSearcher();
++
++ /**
++ * @brief Triggers a network scan to find a smpppd
++ * @see smpppdFound
++ * @see smpppdNotFound
++ */
++ void searchNetwork();
++
++ void cancelSearch();
++
++protected:
++ /**
++ * @brief Scans a network for a smpppd
++ *
++ * Scans a network for a smpppd described by
++ * ip and mask.
++ *
++ * @param ip the ntwork ip
++ * @param mask the network mask
++ * @return <code>TRUE</code> if an smpppd was found
++ */
++ bool scan(const QString& ip, const QString& mask);
++
++signals:
++ /**
++ * @brief A smppd was found
++ *
++ * @param host the host there the smpppd was found
++ */
++ void smpppdFound(const QString& host);
++
++ /**
++ * @brief No smpppd was found
++ */
++ void smpppdNotFound();
++
++ void scanStarted(uint total);
++ void scanProgress(uint cur);
++ void scanFinished();
++
++protected slots:
++ void slotStdoutReceivedIfconfig(KProcess * proc, char * buf, int len);
++ void slotStdoutReceivedNetstat (KProcess * proc, char * buf, int len);
++
++private:
++ bool m_cancelSearchNow;
++ KProcess * m_procIfconfig;
++ KProcess * m_procNetstat;
++};
++
++inline void SMPPPDSearcher::cancelSearch() {
++ m_cancelSearchNow = TRUE;
++}
++
++#endif
++
+--- kopete/plugins/smpppdcs/smpppdcsiface.h (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/smpppdcsiface.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -30,7 +30,7 @@
+ k_dcop:
+
+ virtual QString detectionMethod() const = 0;
+- virtual bool isOnline() = 0;
++ virtual bool isOnline() const = 0;
+ };
+
+ #endif
+--- kopete/plugins/smpppdcs/detectornetworkstatus.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/detectornetworkstatus.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,68 @@
++/*
++ detectornetworkstatus.cpp
++
++ Copyright (c) 2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * 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; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++#include <kdebug.h>
++
++#include "kopeteuiglobal.h"
++#include "connectionmanager.h"
++
++#include "iconnector.h"
++#include "detectornetworkstatus.h"
++
++DetectorNetworkStatus::DetectorNetworkStatus(IConnector* connector)
++ : Detector(connector), m_connManager(NULL) {
++
++ m_connManager = ConnectionManager::self();
++ connect(m_connManager, SIGNAL(statusChanged(const QString&, NetworkStatus::EnumStatus)),
++ this, SLOT(statusChanged(const QString&, NetworkStatus::EnumStatus)));
++}
++
++DetectorNetworkStatus::~DetectorNetworkStatus() {}
++
++void DetectorNetworkStatus::checkStatus() const {
++ // needs to do nothing
++}
++
++void DetectorNetworkStatus::statusChanged(const QString& host, NetworkStatus::EnumStatus status) {
++ switch(status) {
++ case NetworkStatus::Offline:
++ kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Offline" << endl;
++ break;
++ case NetworkStatus::OfflineFailed:
++ kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::OfflineFailed" << endl;
++ break;
++ case NetworkStatus::OfflineDisconnected:
++ kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::OfflineDisconnected" << endl;
++ break;
++ case NetworkStatus::ShuttingDown:
++ kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::ShuttingDown" << endl;
++ break;
++ case NetworkStatus::Establishing:
++ kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Establishing" << endl;
++ break;
++ case NetworkStatus::Online:
++ kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Online" << endl;
++ break;
++ case NetworkStatus::NoNetworks:
++ kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::NoNetworks" << endl;
++ break;
++ case NetworkStatus::Unreachable:
++ kdDebug(14312) << k_funcinfo << host << ": NetworkStatus::Unreachable" << endl;
++ break;
++ }
++}
++
++#include "detectornetworkstatus.moc"
+--- kopete/plugins/smpppdcs/Changelog.smpppdcs (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/Changelog.smpppdcs (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -15,15 +15,22 @@
+ Changelog
+ =========
+
+-0.79 (2006/01/18)
++0.79 (2006/01/25)
++* using KConfigXT for configuration
++* using dcopidl2cpp stub generated from kinternetiface.h (from kinternet package),
++ no more own implementation
++* experimental implementation of the the KDED-NetworkStatus (not active, yet)
++* significantly speeded up automatic detection of a SMPPPD
++* BUGFIX: reloading the plugin in a already running Kopete will no more
++ result in an inactive plugin
+ * refactoring to allow easy implementation of new detection methods
+-* speed improvements
++* even more speed improvements
+
+ 0.75 (2006/01/01)
+ * use of KSocketStream instead of deprecated KExtendedSocket
+ * progressbar while searching for an smpppd on the local network
+ * automatically found smpppd server is resolved via DNS
+-* Fixed Bug 111369: better detection of SMPPPD and no more freeze of Kopete
++* Fixed Bug 111369: better detection of a SMPPPD and no more freeze of Kopete
+
+ 0.74 (2005/12/27)
+ * minor bugfixes
+@@ -38,7 +45,7 @@
+ Accounts can be excluded from the plugin connect/disconnect
+ mechanism
+ * connection detection enhanced: first kinternet is asked via
+- DCOP for a running connection, if this fails smpppdcs is asked
++ DCOP for a running connection, if this fails the smpppd is asked
+ * improved startup detection, compatible with recent CVS changes
+ * some API chages in the config module
+
+--- kopete/plugins/smpppdcs/unittest/clienttest.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/unittest/clienttest.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,121 @@
++/*
++ clienttest.cpp
++
++ Copyright (c) 2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * 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; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++#include "smpppdclient.h"
++
++#include "clienttest.h"
++
++ClientTest::ClientTest(const char * name)
++ : KUnitTest::SlotTester(name) {}
++
++ClientTest::~ClientTest() {}
++
++void ClientTest::testInitIsReady() {
++ SMPPPD::Client c;
++ CHECK(c.isReady(), false);
++}
++
++void ClientTest::testAfterConnectIsReady() {
++ SMPPPD::Client c;
++ if(c.connect("warwar", 3185)) {
++ CHECK(c.isReady(), true);
++ } else {
++ SKIP("Test skipped because no smpppd at warwar:3185");
++ }
++}
++
++void ClientTest::testConnect() {
++ SMPPPD::Client c;
++ CHECK(c.connect("warwar", 3185), true);
++ CHECK(c.connect("localhost", 3185), false);
++}
++
++void ClientTest::testCommunicationBeforeConnect() {
++ SMPPPD::Client c;
++ QStringList l = c.getInterfaceConfigurations();
++
++ CHECK(l.count() == 0, true);
++ CHECK(c.statusInterface("ifcfg0"), false);
++}
++
++void ClientTest::testServerIDBeforeConnect() {
++ SMPPPD::Client c;
++ CHECK(c.serverID(), QString::null);
++}
++
++void ClientTest::testServerVersionBeforeConnect() {
++ SMPPPD::Client c;
++ CHECK(c.serverVersion(), QString::null);
++}
++
++void ClientTest::testCommunicationAfterConnect() {
++ SMPPPD::Client c;
++ if(c.connect("warwar", 3185)) {
++ CHECK(c.getInterfaceConfigurations().count() > 0, true);
++ } else {
++ SKIP("Test skipped because no smpppd at warwar:3185");
++ }
++}
++
++void ClientTest::testServerIDAfterConnect() {
++ SMPPPD::Client c;
++ if(c.connect("warwar", 3185)) {
++ CHECK(c.serverID().isEmpty(), false);
++ } else {
++ SKIP("Test skipped because no smpppd at warwar:3185");
++ }
++}
++
++void ClientTest::testServerVersionAfterConnect() {
++ SMPPPD::Client c;
++ if(c.connect("warwar", 3185)) {
++ CHECK(c.serverVersion().isEmpty(), false);
++ } else {
++ SKIP("Test skipped because no smpppd at warwar:3185");
++ }
++}
++
++void ClientTest::testCommunicationAfterDisconnect() {
++ SMPPPD::Client c;
++ if(c.connect("warwar", 3185)) {
++ c.disconnect();
++ CHECK(c.getInterfaceConfigurations().count() == 0, true);
++ } else {
++ SKIP("Test skipped because no smpppd at warwar:3185");
++ }
++}
++
++void ClientTest::testServerIDAfterDisconnect() {
++ SMPPPD::Client c;
++ if(c.connect("warwar", 3185)) {
++ c.disconnect();
++ CHECK(c.serverID(), QString::null);
++ } else {
++ SKIP("Test skipped because no smpppd at warwar:3185");
++ }
++}
++
++void ClientTest::testServerVersionAfterDisconnect() {
++ SMPPPD::Client c;
++ if(c.connect("warwar", 3185)) {
++ c.disconnect();
++ CHECK(c.serverVersion(), QString::null);
++ } else {
++ SKIP("Test skipped because no smpppd at warwar:3185");
++ }
++}
++
++#include "clienttest.moc"
+--- kopete/plugins/smpppdcs/unittest/clienttest.h (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/unittest/clienttest.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,50 @@
++/*
++ clienttest.h
++
++ Copyright (c) 2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * 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; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++#ifndef CLIENTTEST_H
++#define CLIENTTEST_H
++
++#include <kunittest/tester.h>
++
++/**
++ @author Heiko Schäfer <heiko at rangun.de>
++*/
++class ClientTest : public KUnitTest::SlotTester {
++ Q_OBJECT
++
++ ClientTest(const ClientTest&);
++ ClientTest& operator=(const ClientTest&);
++
++public:
++ ClientTest(const char * name = 0);
++ virtual ~ClientTest();
++
++private slots:
++ void testInitIsReady();
++ void testAfterConnectIsReady();
++ void testConnect();
++ void testCommunicationBeforeConnect();
++ void testServerIDBeforeConnect();
++ void testServerVersionBeforeConnect();
++ void testCommunicationAfterConnect();
++ void testServerIDAfterConnect();
++ void testServerVersionAfterConnect();
++ void testCommunicationAfterDisconnect();
++ void testServerIDAfterDisconnect();
++ void testServerVersionAfterDisconnect();
++};
++
++#endif
+--- kopete/plugins/smpppdcs/unittest/main.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/unittest/main.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,45 @@
++/*
++ main.cpp
++
++ Copyright (c) 2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * 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; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++#include <kaboutdata.h>
++#include <kapplication.h>
++#include <kcmdlineargs.h>
++#include <kcmdlineargs.h>
++#include <klocale.h>
++#include <kunittest/runnergui.h>
++
++#include "clienttest.h"
++
++static const char description[] = I18N_NOOP("SMPPPDClientTests");
++static const char version[] = "0.1";
++static KCmdLineOptions options[] = { KCmdLineLastOption };
++
++int main( int argc, char** argv ) {
++ KAboutData about("SMPPPDClientTests", I18N_NOOP("SMPPPDClientTests"), version, description,
++ KAboutData::License_BSD, "(C) 2006 Heiko Schäfer", 0, 0, "heiko at rangun.de");
++
++ KCmdLineArgs::init(argc, argv, &about);
++ KCmdLineArgs::addCmdLineOptions(options);
++ KApplication app;
++
++ KUnitTest::Runner::registerTester("ClientTest", new ClientTest);
++
++ KUnitTest::RunnerGUI runner(0);
++ runner.show();
++ app.setMainWidget(&runner);
++
++ return app.exec();
++}
+--- kopete/plugins/smpppdcs/unittest/Makefile.am (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/unittest/Makefile.am (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,15 @@
++INCLUDES = -I$(top_srcdir)/src $(all_includes) -I../libsmpppdclient
++METASOURCES = AUTO
++
++
++check_PROGRAMS = smpppdcstests
++
++smpppdcstests_SOURCES = main.cpp clienttest.cpp
++smpppdcstests_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -lkunittestgui
++
++noinst_HEADERS = clienttest.h
++
++check:
++ kunittest ./smpppdcstests ClientTest
++
+--- kopete/plugins/smpppdcs/detectorsmpppd.h (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/detectorsmpppd.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -34,14 +34,13 @@
+
+ DetectorSMPPPD(const DetectorSMPPPD&);
+ DetectorSMPPPD& operator=(const DetectorSMPPPD&);
+-
++
+ public:
+ DetectorSMPPPD(IConnector* connector);
+ virtual ~DetectorSMPPPD();
+
+- virtual void checkStatus();
+-
+- virtual void smpppdServerChange();
++ virtual void checkStatus() const;
++
+ };
+
+ #endif
+--- kopete/plugins/smpppdcs/smpppdlocationwidget.h (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/smpppdlocationwidget.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,39 @@
++/*
++ smpppdlocationwidget.h
++
++ Copyright (c) 2004-2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * 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; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++#ifndef SMPPPDLOCATIONWIDGET_H
++#define SMPPPDLOCATIONWIDGET_H
++
++#include "smpppdlocationui.h"
++
++/**
++ @author Heiko Schäfer <heiko at rangun.de>
++*/
++class SMPPPDLocationWidget : public SMPPPDLocationWidgetBase
++{
++ Q_OBJECT
++
++ SMPPPDLocationWidget(const SMPPPDLocationWidget&);
++ SMPPPDLocationWidget& operator=(const SMPPPDLocationWidget&);
++
++public:
++ SMPPPDLocationWidget(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
++ ~SMPPPDLocationWidget();
++
++ void setServer(const QString& serv);
++};
++
++#endif
+--- kopete/plugins/smpppdcs/smpppdcsplugin.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/smpppdcsplugin.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -22,33 +22,47 @@
+ #include <qtimer.h>
+
+ #include <kdebug.h>
+-#include <kconfig.h>
+ #include <kgenericfactory.h>
+
+ #include "kopeteprotocol.h"
++#include "networkstatuscommon.h"
+ #include "kopetepluginmanager.h"
+ #include "kopeteaccountmanager.h"
+
++#include "detectornetworkstatus.h"
+ #include "detectornetstat.h"
+ #include "detectorsmpppd.h"
++#include "smpppdcsconfig.h"
+
+ typedef KGenericFactory<SMPPPDCSPlugin> SMPPPDCSPluginFactory;
+ K_EXPORT_COMPONENT_FACTORY(kopete_smpppdcs, SMPPPDCSPluginFactory("kopete_smpppdcs"))
+
+ SMPPPDCSPlugin::SMPPPDCSPlugin(QObject *parent, const char * name, const QStringList& /* args */)
+ : DCOPObject("SMPPPDCSIface"), Kopete::Plugin(SMPPPDCSPluginFactory::instance(), parent, name),
+- m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_timer(NULL),
++ m_detectorSMPPPD(NULL), m_detectorNetstat(NULL), m_detectorNetworkStatus(NULL), m_timer(NULL),
+ m_onlineInquiry(NULL) {
+
++ kdDebug(14312) << k_funcinfo << endl;
++
+ m_pluginConnected = false;
+
+- // we wait for the allPluginsLoaded signal, to connect as early as possible after startup
++ m_onlineInquiry = new OnlineInquiry();
++ m_detectorSMPPPD = new DetectorSMPPPD(this);
++ m_detectorNetstat = new DetectorNetstat(this);
++
++ // experimental, not used yet
++ m_detectorNetworkStatus = new DetectorNetworkStatus(this);
++
++ // we wait for the allPluginsLoaded signal, to connect
++ // as early as possible after startup, but not before
++ // all accounts are ready
+ connect(Kopete::PluginManager::self(), SIGNAL(allPluginsLoaded()),
+ this, SLOT(allPluginsLoaded()));
+
+- m_onlineInquiry = new OnlineInquiry();
+- m_detectorSMPPPD = new DetectorSMPPPD(this);
+- m_detectorNetstat = new DetectorNetstat(this);
++ // if kopete was already running and the plugin
++ // was loaded later, we check once after 15 secs
++ // if all other plugins have been loaded
++ QTimer::singleShot(15000, this, SLOT(allPluginsLoaded()));
+ }
+
+ SMPPPDCSPlugin::~SMPPPDCSPlugin() {
+@@ -58,30 +72,38 @@
+ delete m_timer;
+ delete m_detectorSMPPPD;
+ delete m_detectorNetstat;
++ delete m_detectorNetworkStatus;
+ delete m_onlineInquiry;
+ }
+
+ void SMPPPDCSPlugin::allPluginsLoaded() {
+
+- m_timer = new QTimer();
+- connect( m_timer, SIGNAL( timeout() ), this, SLOT( slotCheckStatus() ) );
++ if(Kopete::PluginManager::self()->isAllPluginsLoaded()) {
++ m_timer = new QTimer();
++ connect(m_timer, SIGNAL(timeout()), this, SLOT(slotCheckStatus()));
+
+- if(useSmpppd()) {
+- m_timer->start(30000);
+- } else {
+- // we use 1 min interval, because it reflects the old connectionstatus plugin behaviour
+- m_timer->start(60000);
++ if(SMPPPDCSConfig::self()->useSmpppd()) {
++ m_timer->start(30000);
++ } else {
++ // we use 1 min interval, because it reflects
++ // the old connectionstatus plugin behaviour
++ m_timer->start(60000);
++ }
++
++ slotCheckStatus();
+ }
+-
+- slotCheckStatus();
+ }
+
+-bool SMPPPDCSPlugin::isOnline() {
+- return m_onlineInquiry->isOnline(useSmpppd());
++bool SMPPPDCSPlugin::isOnline() const {
++ return m_onlineInquiry->isOnline(SMPPPDCSConfig::self()->useSmpppd());
+ }
+
+ void SMPPPDCSPlugin::slotCheckStatus() {
+- if(useSmpppd()) {
++
++ // reread config to get changes
++ SMPPPDCSConfig::self()->readConfig();
++
++ if(SMPPPDCSConfig::self()->useSmpppd()) {
+ m_detectorSMPPPD->checkStatus();
+ } else {
+ m_detectorNetstat->checkStatus();
+@@ -114,48 +136,56 @@
+ }
+
+ void SMPPPDCSPlugin::connectAllowed() {
+- static KConfig *config = KGlobal::config();
+- config->setGroup(SMPPPDCS_CONFIG_GROUP);
+- QStringList list = config->readListEntry("ignoredAccounts");
+
++ QStringList list = SMPPPDCSConfig::self()->ignoredAccounts();
++
+ Kopete::AccountManager * m = Kopete::AccountManager::self();
+ for(QPtrListIterator<Kopete::Account> it(m->accounts())
+ ;
+ it.current();
+ ++it) {
+- if(!list.contains(it.current()->protocol()->pluginId() + "_" + it.current()->accountId())) {
++
++#ifndef NDEBUG
++ if(it.current()->inherits("Kopete::ManagedConnectionAccount")) {
++ kdDebug(14312) << k_funcinfo << "Account " << it.current()->protocol()->pluginId() + "_" + it.current()->accountId() << " is an managed account!" << endl;
++ } else {
++ kdDebug(14312) << k_funcinfo << "Account " << it.current()->protocol()->pluginId() + "_" + it.current()->accountId() << " is an unmanaged account!" << endl;
++ }
++#endif
++
++ if(!list.contains(it.current()->protocol()->pluginId() + "_" + it.current()->
++ accountId())) {
+ it.current()->connect();
+ }
+ }
+ }
+
+ void SMPPPDCSPlugin::disconnectAllowed() {
+- static KConfig *config = KGlobal::config();
+- config->setGroup(SMPPPDCS_CONFIG_GROUP);
+- QStringList list = config->readListEntry("ignoredAccounts");
+
++ QStringList list = SMPPPDCSConfig::self()->ignoredAccounts();
++
+ Kopete::AccountManager * m = Kopete::AccountManager::self();
+ for(QPtrListIterator<Kopete::Account> it(m->accounts())
+ ;
+ it.current();
+ ++it) {
++
++#ifndef NDEBUG
++ if(it.current()->inherits("Kopete::ManagedConnectionAccount")) {
++ kdDebug(14312) << k_funcinfo << "Account " << it.current()->protocol()->pluginId() + "_" + it.current()->accountId() << " is an managed account!" << endl;
++ } else {
++ kdDebug(14312) << k_funcinfo << "Account " << it.current()->protocol()->pluginId() + "_" + it.current()->accountId() << " is an unmanaged account!" << endl;
++ }
++#endif
++
+ if(!list.contains(it.current()->protocol()->pluginId() + "_" + it.current()->accountId())) {
+ it.current()->disconnect();
+ }
+ }
+ }
+
+-/*!
+- \fn SMPPPDCSPlugin::useSmpppd() const
+- */
+-bool SMPPPDCSPlugin::useSmpppd() const {
+- static KConfig *config = KGlobal::config();
+- config->setGroup(SMPPPDCS_CONFIG_GROUP);
+- return config->readBoolEntry("useSmpppd", false);
+-}
+-
+ QString SMPPPDCSPlugin::detectionMethod() const {
+- if(useSmpppd()) {
++ if(SMPPPDCSConfig::self()->useSmpppd()) {
+ return "smpppd";
+ } else {
+ return "netstat";
+@@ -165,18 +195,27 @@
+ /*!
+ \fn SMPPPDCSPlugin::smpppdServerChanged(const QString& server)
+ */
+-void SMPPPDCSPlugin::smpppdServerChanged(const QString& server)
+-{
+- static KConfig *config = KGlobal::config();
+- config->setGroup(SMPPPDCS_CONFIG_GROUP);
+- QString oldServer = config->readEntry("server", "localhost").utf8();
+-
+- if(oldServer != server) {
+- kdDebug(14312) << k_funcinfo << "Detected a server change" << endl;
+- m_detectorSMPPPD->smpppdServerChange();
+- }
++void SMPPPDCSPlugin::smpppdServerChanged(const QString& server) {
++
++ QString oldServer = SMPPPDCSConfig::self()->server().utf8();
++
++ if(oldServer != server) {
++ kdDebug(14312) << k_funcinfo << "Detected a server change" << endl;
++ m_detectorSMPPPD->smpppdServerChange();
++ }
+ }
+
++void SMPPPDCSPlugin::aboutToUnload() {
++
++ kdDebug(14312) << k_funcinfo << endl;
++
++ if(m_timer) {
++ m_timer->stop();
++ }
++
++ emit readyForUnload();
++}
++
+ #include "smpppdcsplugin.moc"
+
+ // vim: set noet ts=4 sts=4 sw=4:
+--- kopete/plugins/smpppdcs/detectornetstat.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/detectornetstat.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -27,7 +27,7 @@
+ delete m_process;
+ }
+
+-void DetectorNetstat::checkStatus() {
++void DetectorNetstat::checkStatus() const {
+ kdDebug(14312) << k_funcinfo << endl;
+
+ if(m_process) {
+--- kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,85 @@
++[Desktop Entry]
++Encoding=UTF-8
++Icon=smpppdcs
++Type=Service
++ServiceTypes=KCModule
++
++X-KDE-ModuleType=Library
++X-KDE-Library=kopete_smpppdcs
++X-KDE-FactoryName=SMPPPDCSConfigFactory
++X-KDE-ParentApp=kopete_smpppdcs
++X-KDE-ParentComponents=kopete_smpppdcs
++
++X-Kopete-Version=1000900
++
++Name=SUSE SMPPPD Connection Status
++Name[bn]=SUSE SMPPPD সংযোগ অবস্থা
++Name[ca]=Estatus de la connexió SUSE SMPPPD
++Name[cs]=Stav spojení SUSE SMPPPD
++Name[da]=SUSE SMPPD Forbindelsesstatus
++Name[de]=SuSE SMPPPD-Verbindungsstatus
++Name[el]=Κατάσταση σύνδεσης του SuSE SMPPPD
++Name[es]=Estado de conexión de SUSE SMPPPD
++Name[et]=SUSE SMPPPD ühenduse staatus
++Name[eu]=SUSE SMPPPD konexioaren egoera
++Name[fi]=SUSE SMPPPD -yhteyden tila
++Name[fr]=État de la connexion SUSE SMPPPD
++Name[ga]=Stádas Ceangail SUSE SMPPPD
++Name[gl]=Estado da conexión de SUSE SMPPPD
++Name[he]=מצב החיבור של SUSE SMPPPD
++Name[hu]=SUSE SMPPPD kapcsolati állapot
++Name[is]=SUSE SMPPPD tengingarstaða
++Name[it]=Stato della connessione di SUSE SMPPPD
++Name[lt]=SUSE SMPPPD ryšio būklė
++Name[nb]=Tilstand for SUSE-SMPPPD-forbindelsen
++Name[nl]=SUSE SMPPPD-verbindingsstatus
++Name[nn]=Tilstand for SUSE-SMPPPD-sambandet
++Name[pl]=Status połączenia SUSE SMPPPD
++Name[pt]=Estado da Ligação SUSE SMPPPD
++Name[pt_BR]=Status da Conexão SUSE SMPPPD
++Name[ru]=Статус соединения SUSE SMPPPD
++Name[sl]=Stanje povezave z uporabo SuSE SMPPPD
++Name[sr]=Статус SUSE-ове SMPPPD везе
++Name[sr at Latn]=Status SUSE-ove SMPPPD veze
++Name[sv]=SUSE SMPPPD anslutningsstatus
++Name[tr]=SUSE SMPPPD bağlantı durumu
++Name[uk]=Стан з'єднання SUSE SMPPPD
++Name[zh_CN]=SUSE SMPPPD 连接状态
++Name[zh_HK]=SUSE SMPPPD 連線狀態
++Comment=SMPPPDCS Plugin
++Comment[bn]=SMPPPDCS প্লাগিন
++Comment[br]=Lugant SMPPPDCS
++Comment[ca]=Connector SMPPPDCS
++Comment[cs]=SMPPPDCS modul
++Comment[da]=SMPPPDCS-Plugin
++Comment[de]=SMPPPDCS-Modul
++Comment[el]=Πρόσθετο SMPPPDCS
++Comment[es]=Extensión SMPPPDCS
++Comment[et]=SMPPPDCS plugin
++Comment[eu]=SMPPPDCS plugin-a
++Comment[fi]=SMPPPDCS-liitännäinen
++Comment[fr]=Module SMPPPDCS
++Comment[ga]=Breiseán SMPPPDCS
++Comment[gl]=Plugin SMPPPDCS
++Comment[he]=תוסף SMPPPDCS
++Comment[hu]=SMPPPDCS bővítőmodul
++Comment[is]=SMPPPDCS íforrit
++Comment[it]=Plugin SMPPPDCS
++Comment[lt]=SMPPPDCS įskiepis
++Comment[nb]=Programtillegg for SMPPPDCS
++Comment[nl]=SMPPPDCS-plugin
++Comment[nn]=Programtillegg for SMPPPDCS
++Comment[pl]=Wtyczka SMPPPDCS
++Comment[pt]='Plugin' SMPPPDCS
++Comment[pt_BR]=Plugin SMPPPDCS
++Comment[ro]=Modul SMPPPDCS
++Comment[ru]=Модуль SMPPPDCS
++Comment[sl]=Vstavek SMPPPDCS
++Comment[sr]=Прикључак SMPPPDCS
++Comment[sr at Latn]=Priključak SMPPPDCS
++Comment[sv]=SMPPPDCS-insticksprogram
++Comment[tr]=SMPPPDCS Eklentisi
++Comment[uk]=Втулок SMPPPDCS
++Comment[uz]=SMPPPDCS плагини
++Comment[zh_CN]=SMPPPDCS 插件
++Comment[zh_HK]=SMPPPDCS 插件
+--- kopete/plugins/smpppdcs/detector.h (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/detector.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -17,10 +17,6 @@
+ #ifndef DETECTOR_H
+ #define DETECTOR_H
+
+-#include <qmutex.h>
+-
+-#define SMPPPDCS_CONFIG_GROUP "SMPPPDCS Plugin"
+-
+ class IConnector;
+
+ /**
+@@ -52,7 +48,7 @@
+ */
+ virtual ~Detector() {}
+
+- virtual void checkStatus() = 0;
++ virtual void checkStatus() const = 0;
+
+ virtual void smpppdServerChange() {}
+
+--- kopete/plugins/smpppdcs/smpppdcsprefsimpl.h (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/smpppdcsprefsimpl.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,76 @@
++/*
++ smpppdcsprefsimpl.h
++
++ Copyright (c) 2004-2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * 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; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++#ifndef SMPPPDCSPREFSIMPL_H
++#define SMPPPDCSPREFSIMPL_H
++
++#include <qgroupbox.h>
++
++#include <kprogress.h>
++
++#include "smpppdcsprefs.h"
++
++class SMPPPDCSPlugin;
++class SMPPPDSearcher;
++
++/**
++ at author Heiko Schäfer <heiko at rangun.de>
++*/
++class SMPPPDCSPrefs : public SMPPPDCSPrefsBase
++{
++ Q_OBJECT
++
++ SMPPPDCSPrefs(const SMPPPDCSPrefs&);
++ SMPPPDCSPrefs& operator=(const SMPPPDCSPrefs&);
++
++public:
++
++ SMPPPDCSPrefs(QWidget* parent, const char* name = 0, WFlags fl = 0);
++ ~SMPPPDCSPrefs();
++
++signals:
++ void foundSMPPPD(bool found);
++
++protected slots:
++ void enableSMPPPDSettings();
++ void disableSMPPPDSettings();
++ void determineCSType();
++ void smpppdFound(const QString & host);
++ void smpppdNotFound();
++ void scanStarted(uint total);
++ void scanProgress(uint cur);
++ void scanFinished();
++ void cancelScanning();
++
++private:
++ SMPPPDCSPlugin * m_plugin;
++ KProgressDialog * m_scanProgressDlg;
++ SMPPPDSearcher * m_curSearcher;
++};
++
++inline void SMPPPDCSPrefs::enableSMPPPDSettings() {
++ smpppdPrefs->setEnabled(true);
++}
++
++inline void SMPPPDCSPrefs::disableSMPPPDSettings() {
++ smpppdPrefs->setEnabled(false);
++}
++
++inline void SMPPPDCSPrefs::scanFinished() {
++ m_scanProgressDlg->hide();
++}
++
++#endif
+--- kopete/plugins/smpppdcs/smpppdcspreferences.h (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/smpppdcspreferences.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,77 @@
++/*
++ smpppdcspreferences.h
++
++ Copyright (c) 2004-2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * 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; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++#ifndef SMPPPDCSPREFERENCES_H
++#define SMPPPDCSPREFERENCES_H
++
++#include <kcmodule.h>
++
++class QListViewItem;
++
++class SMPPPDCSPrefs;
++
++class AccountPrivMap {
++public:
++ AccountPrivMap(bool isOn = FALSE, const QString& id = QString::null)
++ : m_on(isOn), m_id(id) {}
++ bool m_on;
++ QString m_id;
++};
++
++/**
++ * @brief Module for the configuration of the smpppdcs-plugin
++ *
++ * @author Heiko Schäfer <heiko at rangun.de>
++ */
++class SMPPPDCSPreferences : public KCModule {
++ Q_OBJECT
++
++ SMPPPDCSPreferences(const SMPPPDCSPreferences&);
++ SMPPPDCSPreferences& operator=(const SMPPPDCSPreferences&);
++
++public:
++ typedef QMap<QString, AccountPrivMap> AccountMap;
++
++ /**
++ * @brief Creates an <code>SMPPPDCSPreferences</code> instance
++ */
++ SMPPPDCSPreferences(QWidget * parent = 0, const char * name = 0, const QStringList &args = QStringList());
++
++ /**
++ * @brief Destroys an <code>SMPPPDCSPreferences</code> instance
++ */
++ virtual ~SMPPPDCSPreferences();
++
++ virtual void load();
++ virtual void save();
++ virtual void defaults();
++
++protected slots:
++ void listClicked(QListViewItem * item);
++
++private slots:
++ void slotModified();
++
++protected:
++
++ /// The UI class generated by the QT-designer
++ SMPPPDCSPrefs * m_ui;
++
++ AccountMap m_accountMapOld;
++ AccountMap m_accountMapCur;
++};
++
++#endif
+--- kopete/plugins/smpppdcs/smpppdsearcher.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/smpppdsearcher.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,189 @@
++/*
++ smpppdsearcher.h
++
++ Copyright (c) 2004-2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * 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; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++#include <qregexp.h>
++#include <qfile.h>
++
++#include <kprocess.h>
++#include <kdebug.h>
++
++#include "smpppdclient.h"
++#include "smpppdsearcher.h"
++
++SMPPPDSearcher::SMPPPDSearcher()
++ : m_cancelSearchNow(FALSE),
++ m_procIfconfig(NULL),
++m_procNetstat(NULL) {}
++
++SMPPPDSearcher::~SMPPPDSearcher() {
++ delete m_procIfconfig;
++ delete m_procNetstat;
++}
++
++/*!
++ \fn SMPPPDSearcher::searchNetwork() const
++ */
++void SMPPPDSearcher::searchNetwork() {
++ kdDebug(14312) << k_funcinfo << endl;
++
++ // the first point to search is localhost
++ if(!scan("127.0.0.1", "255.0.0.0")) {
++
++ m_procNetstat = new KProcess;
++ m_procNetstat->setEnvironment("LANG", "C"); // we want to force english output
++
++ *m_procNetstat << "/bin/netstat" << "-rn";
++ connect(m_procNetstat, SIGNAL(receivedStdout(KProcess *,char *,int)), this, SLOT(slotStdoutReceivedNetstat(KProcess *,char *,int)));
++ if(!m_procNetstat->start(KProcess::Block, KProcess::Stdout)) {
++ kdDebug(14312) << k_funcinfo << "Couldn't execute /sbin/netstat -rn" << endl << "Perhaps the package net-tools isn't installed." << endl;
++
++ emit smpppdNotFound();
++ }
++
++ delete m_procNetstat;
++ m_procNetstat = NULL;
++ }
++}
++
++/*!
++ \fn SMPPPDSearcher::slotStdoutReceived(KProcess * proc, char * buf, int len)
++ */
++void SMPPPDSearcher::slotStdoutReceivedIfconfig(KProcess * /* proc */, char * buf, int len) {
++ kdDebug(14312) << k_funcinfo << endl;
++
++ QString myBuf = QString::fromLatin1(buf,len);
++ QRegExp rex("^[ ]{10}.*inet addr:([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}).*Mask:([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3})");
++ // tokenize the string into lines
++ QStringList toks = QStringList::split("\n", myBuf);
++ for(QStringList::size_type i = 0; i < toks.count(); i++) {
++ if(rex.exactMatch(toks[i])) {
++ if(scan(rex.cap(1), rex.cap(2))) {
++ return;
++ }
++ }
++ }
++
++ emit smpppdNotFound();
++}
++void SMPPPDSearcher::slotStdoutReceivedNetstat(KProcess * /* proc */, char * buf, int len) {
++ kdDebug(14312) << k_funcinfo << endl;
++
++ QRegExp rexGW(".*\\n0.0.0.0[ ]*([0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}).*");
++ QString myBuf = QString::fromLatin1(buf,len);
++
++ if(!(rexGW.exactMatch(myBuf) && scan(rexGW.cap(1), "255.255.255.255"))) {
++ // if netstat -r found no gateway we search the network
++ m_procIfconfig = new KProcess;
++ m_procIfconfig->setEnvironment("LANG", "C"); // we want to force english output
++
++ *m_procIfconfig << "/sbin/ifconfig";
++ connect(m_procIfconfig, SIGNAL(receivedStdout(KProcess *,char *,int)), this, SLOT(slotStdoutReceivedIfconfig(KProcess *,char *,int)));
++ if(!m_procIfconfig->start(KProcess::Block, KProcess::Stdout)) {
++ kdDebug(14312) << k_funcinfo << "Couldn't execute /sbin/ifconfig" << endl << "Perhaps the package net-tools isn't installed." << endl;
++
++ emit smpppdNotFound();
++ }
++
++ delete m_procIfconfig;
++ m_procIfconfig = NULL;
++ }
++}
++
++/*!
++ \fn SMPPPDSearcher::scan() const
++ */
++bool SMPPPDSearcher::scan(const QString& ip, const QString& mask) {
++ kdDebug(14312) << k_funcinfo << "Scanning " << ip << "/" << mask << "..." << endl;
++
++ SMPPPD::Client client;
++
++ if(ip == "127.0.0.1") { // if localhost, we only scan this one host
++ if(client.connect(ip, 3185)) {
++ client.disconnect();
++ emit smpppdFound(ip);
++ return true;
++ }
++
++ return false;
++ }
++
++ uint min_range = 0;
++ uint max_range = 255;
++
++ // calculate ip range (only last mask entry)
++ QRegExp lastRex("([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})");
++ if(lastRex.exactMatch(ip)) {
++
++ uint lastWordIP = lastRex.cap(4).toUInt();
++
++ QStringList ipToks;
++ for(int i = 1; i < 5; i++) {
++ ipToks.push_back(lastRex.cap(i));
++ }
++
++ if(lastRex.exactMatch(mask)) {
++ uint lastWordMask = lastRex.cap(4).toUInt();
++
++ if(lastWordMask == 0) {
++ kdDebug(14312) << k_funcinfo << "IP-Range: " << ipToks[0] << "." << ipToks[1] << "." << ipToks[2] << ".0 - " << ipToks[0] << "." << ipToks[1] << "." << ipToks[2] << ".255" << endl;
++ max_range = 255;
++ } else if(lastWordMask == 255) {
++ min_range = max_range = lastWordIP;
++ } else {
++ kdDebug(14312) << k_funcinfo << "IP-Range: " << ipToks[0] << "." << ipToks[1] << "." << ipToks[2] << ".0 - " << ipToks[0] << "." << ipToks[1] << "." << ipToks[2] << "." << lastWordMask << endl;
++ max_range = lastWordMask;
++ }
++ }
++
++ uint range = max_range - min_range;
++ m_cancelSearchNow = FALSE;
++ if(range > 1) {
++ emit scanStarted(max_range);
++ }
++ for(uint i = min_range; i <= max_range; i++) {
++ if(m_cancelSearchNow) {
++ if(range > 1) {
++ emit scanFinished();
++ }
++ break;
++ }
++ if(range > 1) {
++ emit scanProgress(i);
++ }
++
++ if(client.connect(QString(ipToks[0] + "." + ipToks[1] + "." + ipToks[2] + "." + QString::number(i)), 3185)) {
++ client.disconnect();
++ emit smpppdFound(ip);
++ if(range > 1) {
++ emit scanFinished();
++ }
++ return true;
++ }
++#ifndef NDEBUG
++ else {
++ kdDebug(14312) << k_funcinfo << "No smpppd found at " << QString(ipToks[0] + "." + ipToks[1] + "." + ipToks[2] + "." + QString::number(i)) << endl;
++ }
++#endif
++ }
++ if(range > 1) {
++ emit scanFinished();
++ }
++ }
++
++ return false;
++}
++
++#include "smpppdsearcher.moc"
+--- kopete/plugins/smpppdcs/smpppdcsprefs.ui (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/smpppdcsprefs.ui (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,284 @@
++<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
++<class>SMPPPDCSPrefsBase</class>
++<author>Heiko Schaefer</author>
++<widget class="QWidget">
++ <property name="name">
++ <cstring>SMPPPDCSPrefsBase</cstring>
++ </property>
++ <property name="geometry">
++ <rect>
++ <x>0</x>
++ <y>0</y>
++ <width>476</width>
++ <height>225</height>
++ </rect>
++ </property>
++ <property name="caption">
++ <string>SMPPPDCS Preferences</string>
++ </property>
++ <vbox>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <widget class="QTabWidget">
++ <property name="name">
++ <cstring>tabWidget</cstring>
++ </property>
++ <widget class="QWidget">
++ <property name="name">
++ <cstring>tab</cstring>
++ </property>
++ <attribute name="title">
++ <string>&Connection</string>
++ </attribute>
++ <vbox>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <widget class="QLayoutWidget">
++ <property name="name">
++ <cstring>layout4</cstring>
++ </property>
++ <vbox>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <property name="margin">
++ <number>6</number>
++ </property>
++ <property name="spacing">
++ <number>6</number>
++ </property>
++ <widget class="QButtonGroup">
++ <property name="name">
++ <cstring>csMethod</cstring>
++ </property>
++ <property name="title">
++ <string>Method of Connection Status Detection</string>
++ </property>
++ <vbox>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <property name="margin">
++ <number>6</number>
++ </property>
++ <property name="spacing">
++ <number>6</number>
++ </property>
++ <widget class="QRadioButton">
++ <property name="name">
++ <cstring>useNetstat</cstring>
++ </property>
++ <property name="text">
++ <string>&netstat - Standard method of connection status detection</string>
++ </property>
++ <property name="checked">
++ <bool>true</bool>
++ </property>
++ <property name="toolTip" stdset="0">
++ <string>Uses the netstat command to find a gateway; suitable on dial-up computers</string>
++ </property>
++ </widget>
++ <widget class="QRadioButton">
++ <property name="name">
++ <cstring>useSmpppd</cstring>
++ </property>
++ <property name="text">
++ <string>smpppd - Ad&vanced method of connection status detection</string>
++ </property>
++ <property name="toolTip" stdset="0">
++ <string>Uses the smpppd on a gateway; suitable for a computer in a private network</string>
++ </property>
++ </widget>
++ <widget class="QLayoutWidget">
++ <property name="name">
++ <cstring>autoCSLayout</cstring>
++ </property>
++ <hbox>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <widget class="KPushButton">
++ <property name="name">
++ <cstring>autoCSTest</cstring>
++ </property>
++ <property name="text">
++ <string>&Try to Detect Automatically</string>
++ </property>
++ <property name="toolTip" stdset="0">
++ <string>Tries to find an appropriate connection method</string>
++ </property>
++ </widget>
++ <spacer>
++ <property name="name">
++ <cstring>spacer4</cstring>
++ </property>
++ <property name="orientation">
++ <enum>Horizontal</enum>
++ </property>
++ <property name="sizeType">
++ <enum>Expanding</enum>
++ </property>
++ <property name="sizeHint">
++ <size>
++ <width>341</width>
++ <height>20</height>
++ </size>
++ </property>
++ </spacer>
++ </hbox>
++ </widget>
++ </vbox>
++ </widget>
++ <widget class="QGroupBox">
++ <property name="name">
++ <cstring>smpppdPrefs</cstring>
++ </property>
++ <property name="enabled">
++ <bool>false</bool>
++ </property>
++ <property name="title">
++ <string>Location of the SMPPPD</string>
++ </property>
++ <vbox>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <property name="margin">
++ <number>6</number>
++ </property>
++ <property name="spacing">
++ <number>6</number>
++ </property>
++ <widget class="SMPPPDLocationWidget">
++ <property name="name">
++ <cstring>SMPPPDLocation</cstring>
++ </property>
++ </widget>
++ </vbox>
++ </widget>
++ <spacer>
++ <property name="name">
++ <cstring>spacer18</cstring>
++ </property>
++ <property name="orientation">
++ <enum>Vertical</enum>
++ </property>
++ <property name="sizeType">
++ <enum>Expanding</enum>
++ </property>
++ <property name="sizeHint">
++ <size>
++ <width>20</width>
++ <height>20</height>
++ </size>
++ </property>
++ </spacer>
++ </vbox>
++ </widget>
++ </vbox>
++ </widget>
++ <widget class="QWidget">
++ <property name="name">
++ <cstring>tab</cstring>
++ </property>
++ <attribute name="title">
++ <string>Acco&unts</string>
++ </attribute>
++ <vbox>
++ <property name="name">
++ <cstring>unnamed</cstring>
++ </property>
++ <property name="spacing">
++ <number>6</number>
++ </property>
++ <spacer>
++ <property name="name">
++ <cstring>spacer4_2</cstring>
++ </property>
++ <property name="orientation">
++ <enum>Vertical</enum>
++ </property>
++ <property name="sizeType">
++ <enum>Fixed</enum>
++ </property>
++ <property name="sizeHint">
++ <size>
++ <width>20</width>
++ <height>6</height>
++ </size>
++ </property>
++ </spacer>
++ <widget class="QLabel">
++ <property name="name">
++ <cstring>toIgnoreLabel</cstring>
++ </property>
++ <property name="text">
++ <string>Choose the accounts to ignore:</string>
++ </property>
++ </widget>
++ <widget class="KListView">
++ <column>
++ <property name="text">
++ <string>Account</string>
++ </property>
++ <property name="clickable">
++ <bool>true</bool>
++ </property>
++ <property name="resizable">
++ <bool>false</bool>
++ </property>
++ </column>
++ <property name="name">
++ <cstring>accountList</cstring>
++ </property>
++ <property name="allColumnsShowFocus">
++ <bool>true</bool>
++ </property>
++ <property name="resizeMode">
++ <enum>LastColumn</enum>
++ </property>
++ </widget>
++ </vbox>
++ </widget>
++ </widget>
++ </vbox>
++</widget>
++<customwidgets>
++ <customwidget>
++ <class>SMPPPDLocationWidget</class>
++ <header location="local">smpppdlocationwidget.h</header>
++ <sizehint>
++ <width>16</width>
++ <height>16</height>
++ </sizehint>
++ <container>1</container>
++ <sizepolicy>
++ <hordata>5</hordata>
++ <verdata>5</verdata>
++ <horstretch>0</horstretch>
++ <verstretch>0</verstretch>
++ </sizepolicy>
++ <pixmap>image0</pixmap>
++ </customwidget>
++</customwidgets>
++<images>
++ <image name="image0">
++ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data>
++ </image>
++</images>
++<tabstops>
++ <tabstop>tabWidget</tabstop>
++ <tabstop>useNetstat</tabstop>
++ <tabstop>autoCSTest</tabstop>
++ <tabstop>useSmpppd</tabstop>
++ <tabstop>accountList</tabstop>
++</tabstops>
++<layoutdefaults spacing="0" margin="0"/>
++<includehints>
++ <includehint>kpushbutton.h</includehint>
++ <includehint>smpppdlocationwidget.h</includehint>
++ <includehint>klistview.h</includehint>
++</includehints>
++</UI>
+--- kopete/plugins/smpppdcs/detectordcop.h (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/detectordcop.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -19,7 +19,6 @@
+
+ #include "detector.h"
+
+-class DCOPClient;
+ class IConnector;
+
+ /**
+@@ -42,12 +41,11 @@
+ ERROR
+ };
+
+- QCString getKInternetDCOP();
+- KInternetDCOPState getConnectionStatusDCOP();
++ QCString getKInternetDCOP() const;
++ KInternetDCOPState getConnectionStatusDCOP() const;
+
+ protected:
+- static QCString m_kinternetApp;
+- DCOPClient * m_client;
++ static QCString m_kinternetApp;
+ };
+
+ #endif
+--- kopete/plugins/smpppdcs/kopete_smpppdcs.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/kopete_smpppdcs.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -15,6 +15,7 @@
+ X-KDE-PluginInfo-License=GPL
+ X-KDE-PluginInfo-EnabledByDefault=true
+ Name=SUSE smpppd-enabled Connection Status (SMPPPD)
++Name[bn]=SUSE smpppd-enabled সংযোগ অবস্থা (SMPPPD)
+ Name[ca]=Estat actiu de la connexió SUSE smpppd (SMPPPD)
+ Name[cs]=Stav spojení SUSE smpppd-enabled (SMPPPD)
+ Name[da]=SUSE smpppd-aktiveret Forbindelsesstatus (SMPPPD)
+@@ -48,6 +49,7 @@
+ Comment=Connects/disconnects Kopete automatically depending on availability of Internet connection
+ Comment[ar]=يقوم بوصل و فصل Kopete تلقائيا استنادا إلى وضع الاتصال بالشبكة
+ Comment[bg]=Автоматично установяване и прекъсване на връзката в зависимост от състоянието на връзката с Интернет
++Comment[bn]=ইন্টারনেট সংযোগের সুবিধা অনুযায়ী কপেট স্বয়ংক্রীয়ভাবে সংযোগ/সংযোগবিচ্ছিন্নকরে
+ Comment[bs]=Automatski spaja Kopete i prekida vezu ovisno o dostupnosti Internet konekcije
+ Comment[ca]=Connecta/desconnecta automàticament depenent de la disponibilitat de la connexió a Internet
+ Comment[cs]=Automaticky připojí nebo odpojí vzhledem k dostupnosti připojení na Internet
+--- kopete/plugins/smpppdcs/Makefile.am (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/Makefile.am (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -1,25 +1,35 @@
+-if include_smpppdcs
+-SMPPPDCS_SUBDIR=config
+-endif
+-
+ METASOURCES = AUTO
+
+-SUBDIRS = icons libsmpppdclient $(SMPPPDCS_SUBDIR)
++SUBDIRS = icons libsmpppdclient unittest
+
+ EXTRA_DIST = Changelog.smpppdcs
+
+ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes) -Ilibsmpppdclient
+
+-kde_module_LTLIBRARIES = kopete_smpppdcs.la
++kde_module_LTLIBRARIES = kopete_smpppdcs.la kcm_kopete_smpppdcs.la
+
+-kopete_smpppdcs_la_SOURCES = smpppdcsplugin.cpp onlineinquiry.cpp \
+- smpppdcsiface.skel detectordcop.cpp detectorsmpppd.cpp detectornetstat.cpp
++kopete_smpppdcs_la_SOURCES = kinternetiface.stub smpppdcsplugin.cpp \
++ onlineinquiry.cpp smpppdcsiface.skel detectordcop.cpp detectorsmpppd.cpp \
++ detectornetstat.cpp detectornetworkstatus.cpp smpppdcsconfig.kcfgc
+ kopete_smpppdcs_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+ kopete_smpppdcs_la_LIBADD = \
+ libsmpppdclient/libsmpppdclient.la ../../libkopete/libkopete.la
+
++kcm_kopete_smpppdcs_la_SOURCES = smpppdcsprefs.ui smpppdcspreferences.cpp \
++ smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdlocationui.ui smpppdlocationwidget.cpp \
++ smpppdcsconfig.kcfgc
++kcm_kopete_smpppdcs_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
++kcm_kopete_smpppdcs_la_LIBADD = libsmpppdclient/libsmpppdclient.la \
++ ../../libkopete/libkopete.la $(LIB_KUTILS)
++
+ service_DATA = kopete_smpppdcs.desktop
+ servicedir = $(kde_servicesdir)
+
++kcm_DATA = kopete_smpppdcs_config.desktop
++kcmdir = $(kde_servicesdir)/kconfiguredialog
++
++kde_kcfg_DATA = smpppdcs.kcfg
++
+ noinst_HEADERS = smpppdcsiface.h detectordcop.h detectorsmpppd.h \
+- detectornetstat.h
++ detectornetstat.h kinternetiface.h detectornetworkstatus.h \
++ smpppdsearcher.h smpppdcsprefsimpl.h smpppdlocationwidget.h
+--- kopete/plugins/smpppdcs/detectornetworkstatus.h (.../tags/KDE/3.5.1/kdenetwork) (revision 0)
++++ kopete/plugins/smpppdcs/detectornetworkstatus.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -0,0 +1,50 @@
++/*
++ detectornetworkstatus.h
++
++ Copyright (c) 2006 by Heiko Schaefer <heiko at rangun.de>
++
++ Kopete (c) 2002-2006 by the Kopete developers <kopete-devel at kde.org>
++
++ *************************************************************************
++ * *
++ * 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; version 2 of the License. *
++ * *
++ *************************************************************************
++*/
++
++#ifndef DETECTORNETWORKSTATUS_H
++#define DETECTORNETWORKSTATUS_H
++
++#include <qobject.h>
++
++#include "detector.h"
++
++class IConnector;
++class ConnectionManager;
++
++/**
++ @author Heiko Schäfer <heiko at rangun.de>
++*/
++class DetectorNetworkStatus : protected QObject, public Detector
++{
++ Q_OBJECT
++
++ DetectorNetworkStatus(const DetectorNetworkStatus&);
++ DetectorNetworkStatus& operator=(const DetectorNetworkStatus&);
++
++public:
++ DetectorNetworkStatus(IConnector* connector);
++ virtual ~DetectorNetworkStatus();
++
++ virtual void checkStatus() const;
++
++protected slots:
++ void statusChanged(const QString& host, NetworkStatus::EnumStatus status);
++
++private:
++ ConnectionManager * m_connManager;
++};
++
++#endif
+--- kopete/plugins/smpppdcs/detectorsmpppd.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/smpppdcs/detectorsmpppd.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -17,54 +17,55 @@
+ #include <kdebug.h>
+ #include <kglobal.h>
+ #include <kconfig.h>
++#include <kapplication.h>
+
+ #include "iconnector.h"
+ #include "detectorsmpppd.h"
++#include "smpppdcsconfig.h"
+
+ #include "smpppdclient.h"
+
+ DetectorSMPPPD::DetectorSMPPPD(IConnector * connector)
+- : DetectorDCOP(connector) {}
++ : DetectorDCOP(connector) {}
+
+ DetectorSMPPPD::~DetectorSMPPPD() {}
+
+ /*!
+ \fn DetectorSMPPPD::checkStatus()
+ */
+-void DetectorSMPPPD::checkStatus() {
++void DetectorSMPPPD::checkStatus() const {
+ kdDebug(14312) << k_funcinfo << "Checking for online status..." << endl;
+
+- m_kinternetApp = getKInternetDCOP();
+- if(m_client && m_kinternetApp != "") {
+- switch(getConnectionStatusDCOP()) {
+- case CONNECTED:
+- m_connector->setConnectedStatus(true);
+- return;
+- case DISCONNECTED:
+- m_connector->setConnectedStatus(false);
+- return;
+- default:
+- break;
+- }
+- }
+-
+- SMPPPD::Client c;
+-
+- static KConfig *config = KGlobal::config();
+- config->setGroup(SMPPPDCS_CONFIG_GROUP);
+- unsigned int port = config->readUnsignedNumEntry("port", 3185);
+- QString server = config->readEntry("server", "localhost").utf8();
+-
+- c.setPassword(config->readEntry("Password", "").utf8());
+-
+- if(c.connect(server, port)) {
+- m_connector->setConnectedStatus(c.isOnline());
+- } else {
+- kdDebug(14312) << k_funcinfo << "not connected to smpppd => I'll try again later" << endl;
+- m_connector->setConnectedStatus(false);
+- }
+-}
++#ifndef NOKINTERNETDCOP
++ m_kinternetApp = getKInternetDCOP();
++ if(kapp->dcopClient() && m_kinternetApp != "") {
++ switch(getConnectionStatusDCOP()) {
++ case CONNECTED:
++ m_connector->setConnectedStatus(true);
++ return;
++ case DISCONNECTED:
++ m_connector->setConnectedStatus(false);
++ return;
++ default:
++ break;
++ }
++ }
++#else
++#warning DCOP inquiry disabled
++ kdDebug(14312) << k_funcinfo << "DCOP inquiry disabled" << endl;
++#endif
+
+-void DetectorSMPPPD::smpppdServerChange() {
+- kdDebug(14312) << k_funcinfo << "Server changed. Disconnect to SMPPPD" << endl;
++ SMPPPD::Client c;
++
++ unsigned int port = SMPPPDCSConfig::self()->port();
++ QString server = SMPPPDCSConfig::self()->server();
++
++ c.setPassword(SMPPPDCSConfig::self()->password().utf8());
++
++ if(c.connect(server, port)) {
++ m_connector->setConnectedStatus(c.isOnline());
++ } else {
++ kdDebug(14312) << k_funcinfo << "not connected to smpppd => I'll try again later" << endl;
++ m_connector->setConnectedStatus(false);
++ }
+ }
+--- kopete/plugins/alias/kopete_alias.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/alias/kopete_alias.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -18,6 +18,7 @@
+ Name[ar]=اسم مستعار
+ Name[be]=Псэўданім
+ Name[bg]=Запазени думи
++Name[bn]=ছদ্মনাম
+ Name[br]=Lesanv
+ Name[ca]=Àlies
+ Name[cy]=Ffugenw
+@@ -47,6 +48,7 @@
+ Comment=Adds custom aliases for commands
+ Comment[ar]=يضيف أسماء مستعارة للأوامر
+ Comment[bg]=Приставка за добавяне на запазени думи, при въвеждането на които ще се изпълняват зададени команди
++Comment[bn]=কম্যান্ডের জন্য স্বনির্বাচিত ছদ্মনাম যোগ করে
+ Comment[bs]=Dodajte vlastite aliase naredbama
+ Comment[ca]=Afegeix àlies personalitzats als vostres comandaments
+ Comment[cs]=Přidává vlastní přezdívky pro příkazy
+--- kopete/plugins/alias/kopete_alias_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/alias/kopete_alias_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Name[ar]=اسم مستعار
+ Name[be]=Псэўданім
+ Name[bg]=Запазени думи
++Name[bn]=ছদ্মনাম
+ Name[br]=Lesanv
+ Name[ca]=Àlies
+ Name[cy]=Ffugenw
+@@ -43,6 +44,7 @@
+ Comment=Adds custom aliases for commands
+ Comment[ar]=يضيف أسماء مستعارة للأوامر
+ Comment[bg]=Приставка за добавяне на запазени думи, при въвеждането на които ще се изпълняват зададени команди
++Comment[bn]=কম্যান্ডের জন্য স্বনির্বাচিত ছদ্মনাম যোগ করে
+ Comment[bs]=Dodajte vlastite aliase naredbama
+ Comment[ca]=Afegeix àlies personalitzats als vostres comandaments
+ Comment[cs]=Přidává vlastní přezdívky pro příkazy
+--- kopete/plugins/translator/kopete_translator.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/translator/kopete_translator.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -18,6 +18,7 @@
+ Name[ar]=المترجم
+ Name[be]=Перакладчык
+ Name[bg]=Автоматичен превод
++Name[bn]=অনুবাদক
+ Name[br]=Troer
+ Name[bs]=Prevodilac
+ Name[ca]=Traductor
+@@ -68,6 +69,7 @@
+ Comment[ar]=تحدث مع أصدقائك اﻷجانب بلغتك اﻷم
+ Comment[be]=Гутарка з замежнымі таварышамі на Вашай роднай мове
+ Comment[bg]=Приставка за превод от един език на друг в реално време
++Comment[bn]=আপনার স্থানীয় ভাষাতে বিদেশী বন্ধুর সঙ্গে চ্যাট করুন
+ Comment[bs]=Razgovarajte sa prijateljima iz inostranstva u vašem jeziku
+ Comment[ca]=Feu un xat amb els vostres amics en la vostra llengua nativa
+ Comment[cs]=Pokecejte si s cizinci ve svém rodném jazyku
+--- kopete/plugins/translator/kopete_translator_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/translator/kopete_translator_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Name[ar]=المترجم
+ Name[be]=Перакладчык
+ Name[bg]=Автоматичен превод
++Name[bn]=অনুবাদক
+ Name[br]=Troer
+ Name[bs]=Prevodilac
+ Name[ca]=Traductor
+@@ -63,6 +64,7 @@
+ Comment=Translates messages from your native language to another language
+ Comment[ar]=يترجم رسائل من لغتك اﻷم إلى لغة أخرى
+ Comment[bg]=Приставка за превод от един език на друг в реално време
++Comment[bn]=আপনার স্থানীয় ভাষা থেকে অন্য একটি ভাষাতে বার্তা অনুবাদ করে
+ Comment[bs]=Prevodi poruke iz vašeg maternjeg jezika u neki drugi
+ Comment[ca]=Tradueix els missatges des del vostre idioma natiu cap a un altre
+ Comment[cs]=Překládá zprávy z vašeho rodného jazyka do jiného
+--- kopete/plugins/statistics/kopete_statistics.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/statistics/kopete_statistics.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -16,6 +16,7 @@
+ X-KDE-PluginInfo-EnabledByDefault=false
+ Name=Statistics
+ Name[bg]=Статистика
++Name[bn]=পরিসংখ্যান
+ Name[br]=Stadegoù
+ Name[ca]=Estadístiques
+ Name[cs]=Statistika
+@@ -54,6 +55,7 @@
+ Name[zh_HK]=統計
+ Comment=Gather some meaningful statistics
+ Comment[bg]=Приставка за обобщаваща статистика
++Comment[bn]=কিছু অর্থপূর্ণ পরিসংখ্যান সমবেত করে
+ Comment[ca]=Obté estadístiques
+ Comment[cs]=Shromažďuje užitečné statistiky
+ Comment[da]=Indsamling af noget meningsfuld statistik
+--- kopete/plugins/cryptography/kopete_cryptography_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/cryptography/kopete_cryptography_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Name[ar]=التشفير
+ Name[be]=Крыптаграфія
+ Name[bg]=Криптография
++Name[bn]=ক্রিপ্টোগ্রাফি
+ Name[bs]=Kriptografija
+ Name[ca]=Xifrat
+ Name[cs]=Šifrování
+@@ -62,6 +63,7 @@
+ Comment=Encrypts messages using PGP
+ Comment[ar]=يشفر الرسائل باستخدام PGP
+ Comment[bg]=Шифроване на съобщения с GPG
++Comment[bn]=পিজিপি ব্যবহার করে বার্তা এনক্রিপ্ট করে
+ Comment[bs]=Šifruje poruke koristeći GPG
+ Comment[ca]=Xifra missatges emprant PGP
+ Comment[cs]=Šifrování zpráv pomocí GPG
+--- kopete/plugins/cryptography/kopete_cryptography.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/cryptography/kopete_cryptography.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -18,6 +18,7 @@
+ Name[ar]=التشفير
+ Name[be]=Крыптаграфія
+ Name[bg]=Криптография
++Name[bn]=ক্রিপ্টোগ্রাফি
+ Name[bs]=Kriptografija
+ Name[ca]=Xifrat
+ Name[cs]=Šifrování
+@@ -66,6 +67,7 @@
+ Comment=Encrypt and decrypt messages with GPG
+ Comment[ar]=يقوم بتشفير وفل التشفير الرسائل عن طريق GPG
+ Comment[bg]=Шифроване на съобщения с GPG
++Comment[bn]=জিপিজি ব্যবহার করে বার্তা এনক্রিপ্ট এবং ডিক্রিপ্ট করুন
+ Comment[bs]=Šifrujte poruke koristeći GPG
+ Comment[ca]=Xifra i desxifra missatges amb GPG
+ Comment[cs]=Šifrování a dešifrování zpráv pomocí GPG
+--- kopete/plugins/netmeeting/kopete_netmeeting_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/netmeeting/kopete_netmeeting_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -13,6 +13,7 @@
+ Name=Netmeeting
+ Name[ar]=الاجتماع على الشبكة
+ Name[bg]=Видео чат
++Name[bn]=নেট মিটিং
+ Name[da]=Netmøde
+ Name[fr]=Vidéo-conférence
+ Name[hi]=नेटमीटिंग
+@@ -24,6 +25,7 @@
+ Name[tg]=Вохӯриҳои шабакавӣ
+ Comment=Voice and Video with MSN Messenger
+ Comment[bg]=Приставка за разговор с глас и видео с MSN Messenger
++Comment[bn]=এমএসএন বার্তাবাহকের সঙ্গে স্বর এবং ভিডিও
+ Comment[ca]=Veu i vídeo amb MSN Messenger
+ Comment[cs]=Hlas a video pomocí MSN Messenger
+ Comment[da]=Stemme og video med MSN Messenger
+--- kopete/plugins/netmeeting/kopete_netmeeting.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/netmeeting/kopete_netmeeting.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -17,6 +17,7 @@
+ Name=Netmeeting
+ Name[ar]=الاجتماع على الشبكة
+ Name[bg]=Видео чат
++Name[bn]=নেট মিটিং
+ Name[da]=Netmøde
+ Name[fr]=Vidéo-conférence
+ Name[hi]=नेटमीटिंग
+@@ -28,6 +29,7 @@
+ Name[tg]=Вохӯриҳои шабакавӣ
+ Comment=Voice and Video with MSN Messenger
+ Comment[bg]=Приставка за разговор с глас и видео с MSN Messenger
++Comment[bn]=এমএসএন বার্তাবাহকের সঙ্গে স্বর এবং ভিডিও
+ Comment[ca]=Veu i vídeo amb MSN Messenger
+ Comment[cs]=Hlas a video pomocí MSN Messenger
+ Comment[da]=Stemme og video med MSN Messenger
+--- kopete/plugins/texteffect/kopete_texteffect.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/texteffect/kopete_texteffect.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -17,6 +17,7 @@
+ Name=Text Effect
+ Name[ar]=التأثير النصي
+ Name[bg]=Текстови ефекти
++Name[bn]=টেক্সট প্রভাব
+ Name[bs]=Text efekti
+ Name[ca]=Efecte de text
+ Name[cs]=Textový efekt
+@@ -64,6 +65,7 @@
+ Comment=Add nice effects to your messages
+ Comment[ar]=تضيف مؤثرات لطيفة لرسائلك
+ Comment[bg]=Добавяне на текстови ефекти към съобщенията
++Comment[bn]=আপনার বার্তাতে সুন্দর প্রভাব যোগ করে
+ Comment[bs]=Dodaj efekte porukama
+ Comment[ca]=Afegeix bonics efectes als vostres missatges
+ Comment[cs]=Přidává efekty ke zprávám
+--- kopete/plugins/texteffect/kopete_texteffect_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/texteffect/kopete_texteffect_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -13,6 +13,7 @@
+ Name=Text Effect
+ Name[ar]=التأثير النصي
+ Name[bg]=Текстови ефекти
++Name[bn]=টেক্সট প্রভাব
+ Name[bs]=Text efekti
+ Name[ca]=Efecte de text
+ Name[cs]=Textový efekt
+@@ -60,6 +61,7 @@
+ Comment=Adds special effects to your text
+ Comment[ar]=يضيف مؤثرات خاصة لنصوصك
+ Comment[bg]=Добавяне на текстови ефекти към съобщенията
++Comment[bn]=আপনার টেক্সটে বিশেষ প্রভাব যোগ করে
+ Comment[bs]=Dodaje specijalne efekte vašim porukama
+ Comment[ca]=Afegeix bonics efectes al vostre text
+ Comment[cs]=Přidává speciální efekty do vašeho textu
+--- kopete/plugins/history/kopete_history.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/history/kopete_history.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -19,6 +19,7 @@
+ Name[az]=Keçmiş
+ Name[be]=Гісторыя
+ Name[bg]=История
++Name[bn]=ইতিহাস
+ Name[br]=Istor
+ Name[bs]=Historija
+ Name[ca]=Historial
+@@ -78,6 +79,7 @@
+ Comment=Log all messages to keep track of your conversations
+ Comment[ar]=سجل جميع الرسائل للمحافظة على محادثاتك
+ Comment[bg]=Запис на всички съобщения с цел преглед и търсене в тях в бъдеще
++Comment[bn]=আপনার কথোপকথনের খতিয়ান রাখতে সব বার্তা কার্যবিবরণীতে লিখে রাখে
+ Comment[bs]=Zapiši sve poruke u historiju
+ Comment[ca]=Registra tots els missatges per seguir les vostres converses
+ Comment[cs]=Záznam konverzace
+--- kopete/plugins/history/kopete_history_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/history/kopete_history_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -15,6 +15,7 @@
+ Name[az]=Keçmiş
+ Name[be]=Гісторыя
+ Name[bg]=История
++Name[bn]=ইতিহাস
+ Name[br]=Istor
+ Name[bs]=Historija
+ Name[ca]=Historial
+@@ -75,6 +76,7 @@
+ Comment[ar]=توصيلة المحفوظات
+ Comment[be]=Дапаўненьне "Гісторыя"
+ Comment[bg]=Приставка за историята
++Comment[bn]=ইতিহাস প্লাগিন
+ Comment[br]=Lugent an istorig
+ Comment[bs]=Dodatak za historiju
+ Comment[ca]=Connector de l'historial
+--- kopete/plugins/addbookmarks/kopete_addbookmarks.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/addbookmarks/kopete_addbookmarks.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=Bookmarks
+ Name[bg]=Отметки
++Name[bn]=বুকমার্ক
+ Name[br]=Sinedoù
+ Name[ca]=Punts
+ Name[cs]=Záložky
+@@ -52,6 +53,7 @@
+ Name[zu]=Amamaki encwadi
+ Comment=Automatically bookmark links in incoming messages
+ Comment[bg]=Автоматично добавяне на връзките във входящите съобщения към отметките
++Comment[bn]=অন্তর্মুখী বার্তামধ্যস্থ লিঙ্কগুলো স্বয়ংক্রীয়ভাবে বুকমার্ক করে
+ Comment[ca]=Apunta automàticaments els enllaços en els missatges entrants
+ Comment[cs]=Automaticky přidat do záložek odkazy z příchozích zpráv
+ Comment[da]=Sæt link til indkommende breve automatisk
+--- kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -3,6 +3,7 @@
+ Type=Service
+ Name=Bookmarks
+ Name[bg]=Отметки
++Name[bn]=বুকমার্ক
+ Name[br]=Sinedoù
+ Name[ca]=Punts
+ Name[cs]=Záložky
+@@ -52,6 +53,7 @@
+ Name[zu]=Amamaki encwadi
+ Comment=Automatically bookmark links in incoming messages
+ Comment[bg]=Автоматично добавяне на връзките във входящите съобщения към отметките
++Comment[bn]=অন্তর্মুখী বার্তামধ্যস্থ লিঙ্কগুলো স্বয়ংক্রীয়ভাবে বুকমার্ক করে
+ Comment[ca]=Apunta automàticaments els enllaços en els missatges entrants
+ Comment[cs]=Automaticky přidat do záložek odkazy z příchozích zpráv
+ Comment[da]=Sæt link til indkommende breve automatisk
+--- kopete/plugins/webpresence/kopete_webpresence.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/webpresence/kopete_webpresence.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -17,6 +17,7 @@
+ Comment=Show the status of (parts of) your contact list on a webpage
+ Comment[ar]=يظهر حالة أجزاء من قائمة أتصالاتك على صفحة الشبكة
+ Comment[bg]=Приставка за показвана на състоянието на (част от) списъка с контакти като уеб страница
++Comment[bn]=একটি ওয়েবপেজে আপনার যোগাযোগ তালিকার (এর অংশের) অবস্থা প্রদর্শন করে
+ Comment[bs]=Pokazuje status (dijelova) vaše kontakt liste na web stranici
+ Comment[ca]=Mostra l'estatus de (parts de) la vostra llista de contactes a una pàgina web
+ Comment[cs]=Zobrazí stav (části) seznamu kontaktů na webu
+@@ -60,6 +61,7 @@
+ Name=Web Presence
+ Name[ar]=موقع على الشبكة
+ Name[bg]=Уеб присъствие
++Name[bn]=ওয়েব উপস্থিতি
+ Name[bs]=Web prisustvo
+ Name[ca]=Web de presència
+ Name[cs]=Přítomnost na webu
+--- kopete/plugins/webpresence/kopete_webpresence_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/webpresence/kopete_webpresence_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -13,6 +13,7 @@
+ Comment=Show the status of (parts of) your contact list on a web page
+ Comment[ar]=يظهر حالة أجزاء من قائمة أتصالاتك على الشبكة
+ Comment[bg]=Приставка за показвана на състоянието на (част от) списъка с контакти като уеб страница
++Comment[bn]=একটি ওয়েবপেজে আপনার যোগাযোগ তালিকার (এর অংশের) অবস্থা প্রদর্শন করে
+ Comment[bs]=Pokazuje status (dijelova) vaše kontakt liste na web stranici
+ Comment[ca]=Mostra l'estatus de (parts de) la vostra llista de contactes sobre una pàgina web
+ Comment[cs]=Zobrazí stav (části) seznamu kontaktů na webu
+@@ -56,6 +57,7 @@
+ Name=Web Presence
+ Name[ar]=موقع على الشبكة
+ Name[bg]=Уеб присъствие
++Name[bn]=ওয়েব উপস্থিতি
+ Name[bs]=Web prisustvo
+ Name[ca]=Web de presència
+ Name[cs]=Přítomnost na webu
+--- kopete/plugins/connectionstatus/kopete_connectionstatus.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/connectionstatus/kopete_connectionstatus.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -16,6 +16,7 @@
+ Name=Connection Status
+ Name[ar]=وضع الاتصال
+ Name[bg]=Състояние на връзката
++Name[bn]=সংযোগ অবস্থা
+ Name[bs]=Status veze
+ Name[ca]=Estatus de la connexió
+ Name[cs]=Stav spojení
+@@ -64,6 +65,7 @@
+ Comment=Connects/disconnects Kopete automatically depending on availability of Internet connection
+ Comment[ar]=يقوم بوصل و فصل Kopete تلقائيا استنادا إلى وضع الاتصال بالشبكة
+ Comment[bg]=Автоматично установяване и прекъсване на връзката в зависимост от състоянието на връзката с Интернет
++Comment[bn]=ইন্টারনেট সংযোগের সুবিধা অনুযায়ী কপেট স্বয়ংক্রীয়ভাবে সংযোগ/সংযোগবিচ্ছিন্নকরে
+ Comment[bs]=Automatski spaja Kopete i prekida vezu ovisno o dostupnosti Internet konekcije
+ Comment[ca]=Connecta/desconnecta automàticament depenent de la disponibilitat de la connexió a Internet
+ Comment[cs]=Automaticky připojí nebo odpojí vzhledem k dostupnosti připojení na Internet
+--- kopete/plugins/contactnotes/kopete_contactnotes.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/contactnotes/kopete_contactnotes.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -17,6 +17,7 @@
+ Name=Contact Notes
+ Name[ar]=ملاحظات الاتصال
+ Name[bg]=Бележки за контактите
++Name[bn]=যোগাযোগ নোট
+ Name[br]=Notennoù an darempred
+ Name[bs]=Kontakt informacije
+ Name[ca]=Notes del contacte
+@@ -61,6 +62,7 @@
+ Comment=Add personal notes on your contacts
+ Comment[ar]=أضف ملاحظاتك الشخصية إلى بيانات اﻹتصال
+ Comment[bg]=Добавяне и редактиране на бележки и коментари към контактите
++Comment[bn]=আপনার যোগাযোগে ব্যক্তিগত নোট যোগ করুন
+ Comment[bs]=Dodajte lične bilješke vašim kontaktima
+ Comment[ca]=Afegeix notes personals als vostres contactes
+ Comment[cs]=Osobní poznámky ke kontaktům
+--- kopete/plugins/autoreplace/kopete_autoreplace.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/autoreplace/kopete_autoreplace.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -18,6 +18,7 @@
+ Name[ar]=الاستبدال التلقائي
+ Name[be]=Аўтаматычная замена
+ Name[bg]=Автоматична замяна
++Name[bn]=স্বয়ংক্রীয় প্রতিস্থাপন
+ Name[bs]=Auto zamjena
+ Name[ca]=Auto-substitució
+ Name[cs]=Automatické nahrazení
+@@ -65,6 +66,7 @@
+ Comment=Auto replaces some text you can choose
+ Comment[ar]=يقوم بتغيير تلفائي للنصوص التي يمكن اختيارها
+ Comment[bg]=Приставка за автоматична замяна на текст в съобщенията
++Comment[bn]=স্বয়ংক্রীয়ভাবে প্রতিস্থাপন করে কিছু টেক্সট যা আপনি বেছে নিতে পারেন
+ Comment[bs]=Automatski zamjenjuje neki tekst koji izaberete
+ Comment[ca]=Auto-substitueix algun text que podreu escollir
+ Comment[cs]=Automaticky nahrazuje zvolený text
+--- kopete/plugins/autoreplace/kopete_autoreplace_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/autoreplace/kopete_autoreplace_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Name[ar]=الاستبدال التلقائي
+ Name[be]=Аўтаматычная замена
+ Name[bg]=Автоматична замяна
++Name[bn]=স্বয়ংক্রীয় প্রতিস্থাপন
+ Name[bs]=Auto zamjena
+ Name[ca]=Auto-substitució
+ Name[cs]=Automatické nahrazení
+@@ -61,6 +62,7 @@
+ Comment=Autoreplaces some text you can choose
+ Comment[ar]=تقوم بتغييرتلقائي لبعض النصوص التي يمكنك الاختيار منها
+ Comment[bg]=Приставка за автоматична замяна на текст в съобщенията
++Comment[bn]=স্বয়ংক্রীয়ভাবে প্রতিস্থাপন করে কিছু টেক্সট যা আপনি বেছে নিতে পারেন
+ Comment[bs]=Automatski zamjenjuje neki tekst koji izaberete
+ Comment[ca]=Auto-substitueix algun text que podreu escollir
+ Comment[cs]=Automaticky nahrazuje zvolený text
+--- kopete/plugins/highlight/kopete_highlight.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/highlight/kopete_highlight.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -18,6 +18,7 @@
+ Name[ar]=تمييز
+ Name[be]=Падсьветка
+ Name[bg]=Открояване
++Name[bn]=গুরুত্বপূর্ণ
+ Name[br]=Splannadur
+ Name[bs]=Isticanje
+ Name[ca]=Ressaltat
+@@ -67,6 +68,7 @@
+ Comment[ar]=الرسائل المميزة
+ Comment[be]=Падсьветка паведамленьняў
+ Comment[bg]=Открояване на съобщения
++Comment[bn]=বার্তা প্রজ্জ্বলন
+ Comment[bs]=Istakni poruke
+ Comment[ca]=Missatges a ressaltar
+ Comment[cs]=Zvýraznit zprávy
+--- kopete/plugins/highlight/kopete_highlight_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/highlight/kopete_highlight_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Name[ar]=تمييز
+ Name[be]=Падсьветка
+ Name[bg]=Открояване
++Name[bn]=গুরুত্বপূর্ণ
+ Name[br]=Splannadur
+ Name[bs]=Isticanje
+ Name[ca]=Ressaltat
+@@ -62,6 +63,7 @@
+ Comment=Highlights text based on filters
+ Comment[ar]=تميز النصوص بناءا على التصفية
+ Comment[bg]=Открояване на текст в съобщенията на базата на ключови думи
++Comment[bn]=ফিল্টারের ওপর ভিত্তি করে টেক্সট প্রজ্জ্বল করে
+ Comment[bs]=Ističe poruke na osnovu filtera
+ Comment[ca]=Ressalta el text basant-se en filtres
+ Comment[cs]=Zvýraznit text podle filtrů
+--- kopete/plugins/latex/kopete_latex_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/latex/kopete_latex_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Name[ar]=تمييز
+ Name[be]=Падсьветка
+ Name[bg]=Открояване
++Name[bn]=গুরুত্বপূর্ণ
+ Name[br]=Splannadur
+ Name[bs]=Isticanje
+ Name[ca]=Ressaltat
+--- kopete/plugins/latex/kopete_latex.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/plugins/latex/kopete_latex.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -15,10 +15,12 @@
+ X-KDE-PluginInfo-License=GPL
+ X-KDE-PluginInfo-EnabledByDefault=false
+ Name=KopeTeX
++Name[bn]=কপেটেক
+ Name[ja]=KopeTex
+ Name[sv]=Kopetex
+ Comment=Render Latex formulas in the chatwindow
+ Comment[bg]=Показване на формули на Latex в прозореца за чат
++Comment[bn]=চ্যাট উইন্ডোতে লেটেক ফর্মূলা প্রদর্শন করে
+ Comment[bs]=Iscrtava Latex formule u chat prozoru
+ Comment[ca]=Representa fórmules Latex a la finestra de xat
+ Comment[cs]=Vykresluje vzorce LaTeXu v okně rozhovoru
+--- kopete/protocols/yahoo/libyahoo2/libyahoo2.c (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/yahoo/libyahoo2/libyahoo2.c (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -1088,8 +1088,9 @@
+ if (pair->key == 14) /* decline/conf message */
+ msg = pair->value;
+
+- if (pair->key == 13)
+- ;
++ if (pair->key == 13) {
++
++ }
+ if (pair->key == 16) /* error */
+ msg = pair->value;
+
+--- kopete/protocols/yahoo/kopete_yahoo.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/yahoo/kopete_yahoo.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -16,11 +16,13 @@
+ X-KDE-PluginInfo-License=GPL
+ X-KDE-PluginInfo-EnabledByDefault=false
+ Name=Yahoo
++Name[bn]=ইয়্যাহু
+ Name[hi]=याहू
+ Name[ta]=யாஹூ
+ Comment=Protocol to connect to Yahoo
+ Comment[ar]=سيتصل البروتوكول بـ Yahoo
+ Comment[bg]=Протокол за връзка с Yahoo
++Comment[bn]=ইয়্যাহুতে সংযোগ করতে প্রোটোকল
+ Comment[bs]=Yahoo protokol
+ Comment[ca]=Protocol per a connectar-se a Yahoo
+ Comment[cs]=Protokol k připojení k Yahoo
+--- kopete/protocols/yahoo/yahooaccount.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/yahoo/yahooaccount.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -772,7 +772,7 @@
+ }
+
+ // Replace < and > in text
+- regExp.setPattern( "<(?![\"/fbui])" );
++ regExp.setPattern( "<(?!(/*(font.*|[\"fbui])>))" );
+ pos = 0;
+ while ( pos >= 0 ) {
+ pos = regExp.search( newMsgText, pos );
+--- kopete/protocols/gadu/gaduprotocol.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/gadu/gaduprotocol.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -57,7 +57,7 @@
+ "gg_ignored", i18n( "Blocked" ) ),
+ gaduStatusOffline_( Kopete::OnlineStatus::Offline, GG_STATUS_NOT_AVAIL, this, GG_STATUS_NOT_AVAIL,
+ "gg_offline", i18n( "Offline" ) , i18n( "O&ffline" ) , Kopete::OnlineStatusManager::Offline ),
+- gaduStatusOfflineDescr_( Kopete::OnlineStatus::Away, GG_STATUS_NOT_AVAIL_DESCR, this, GG_STATUS_NOT_AVAIL_DESCR,
++ gaduStatusOfflineDescr_( Kopete::OnlineStatus::Offline, GG_STATUS_NOT_AVAIL_DESCR, this, GG_STATUS_NOT_AVAIL_DESCR,
+ QStringList::split( '|', "contact_away_overlay|gg_description_overlay" ), i18n( "Offline" ), i18n( "A&way" ) , Kopete::OnlineStatusManager::Offline ),
+ gaduStatusBusy_(Kopete::OnlineStatus::Away, GG_STATUS_BUSY, this, GG_STATUS_BUSY,
+ "contact_away_overlay", i18n( "Busy" ) , i18n( "B&usy" ) , Kopete::OnlineStatusManager::Busy ),
+--- kopete/protocols/gadu/kopete_gadu.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/gadu/kopete_gadu.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -22,6 +22,7 @@
+ Comment=Protocol to connect to Gadu-Gadu
+ Comment[ar]=البرتوكول سيتصل بـ Gadu-Gadu
+ Comment[bg]=Протокол за връзка с Gadu-Gadu
++Comment[bn]=Gadu-Gadu-তে সংযোগ করতে প্রোটোকল
+ Comment[bs]=Gadu-Gadu protokol
+ Comment[ca]=Protocol per a connectar-se a Gadu-Gadu
+ Comment[cs]=Protokol k připojení ke Gadu-Gadu
+--- kopete/protocols/winpopup/kopete_wp.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/winpopup/kopete_wp.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -17,6 +17,7 @@
+ X-KDE-PluginInfo-EnabledByDefault=false
+ Name=WinPopup
+ Name[ar]=منبثقWin
++Name[bn]=উইন পপ-আপ
+ Name[ca]=Finestres emergents
+ Name[eu]=WinPopup plugina
+ Name[hi]=विन-पॉपअप
+@@ -27,6 +28,7 @@
+ Comment=Protocol to send Windows WinPopup messages
+ Comment[ar]=البرتوكول سيصدر رسائل Windows المنبثقة
+ Comment[bg]=Протокол за изпращане на съобщения Windows WinPopup
++Comment[bn]=উইন্ডোজ উইন পপ-আপ বার্তা পাঠাতে প্রোটোকল
+ Comment[bs]=Protokol za slanje Windows WinPopup poruka
+ Comment[ca]=Protocol per a enviar missatges de finestres emergents de Windows
+ Comment[cs]=Protokol k odesílání WinPopup zpráv
+--- kopete/protocols/winpopup/config/kopete_wp_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/winpopup/config/kopete_wp_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Name[ar]=توصيلة منبثق windows
+ Name[be]=Дапаўненьне "WinPopup"
+ Name[bg]=Приставка WinPopup
++Name[bn]=উইন পপ-আপ প্লাগিন
+ Name[bs]=WinPopup dodatak
+ Name[ca]=Connector WinPopup
+ Name[cs]=WinPopup modul
+@@ -60,6 +61,7 @@
+ Name[zh_HK]=WinPopup 插件
+ Comment=Microsoft "WinPopup" Window Messenger
+ Comment[bg]=Приставка за връзка с Microsoft "WinPopup" Window Messenger
++Comment[bn]=মাইক্রোসফ্ট "উইন পপ-আপ" উইন্ডো বার্তাবাহক
+ Comment[bs]=Microsoft "WinPopup" poruke
+ Comment[ca]=Missatger de finestra "WinPopup" de Microsoft
+ Comment[cs]=Odesílání Microsoft "WinPopup"
+--- kopete/protocols/sms/kopete_sms.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/sms/kopete_sms.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -16,12 +16,14 @@
+ X-KDE-PluginInfo-License=GPL
+ X-KDE-PluginInfo-EnabledByDefault=false
+ Name=SMS
++Name[bn]=এস-এম-এস
+ Name[hi]=एसएमएस
+ Name[zh_CN]=短信息
+ Comment=Protocol to send SMS messages
+ Comment[ar]=سيرسل البروتوكول رسالة عن طريق خدمة الرسائل القصيرة
+ Comment[be]=Пратакол дасылкі SMS паведамленьняў
+ Comment[bg]=Протокол за изпращане на съобщения SMS
++Comment[bn]=এস-এম-এস বার্তা পাঠাতে প্রোটোকল
+ Comment[bs]=Protokol za slanje SMS poruka
+ Comment[ca]=Protocol per a enviar missatges SMS
+ Comment[cs]=Protokol k odesílání SMS zpráv
+--- kopete/protocols/groupwise/kopete_groupwise.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/groupwise/kopete_groupwise.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -16,10 +16,12 @@
+ X-KDE-PluginInfo-License=GPL
+ X-KDE-PluginInfo-EnabledByDefault=false
+ Name=GroupWise
++Name[bn]=গ্রুপ-ওয়াইজ
+ Name[it]=Per gruppi
+ Name[ta]=குழு படி
+ Name[tr]=Akıllı Gruplama
+ Comment=Novell GroupWise Messenger
++Comment[bn]=নোভেল গ্রুপ-ওয়াইজ বার্তাবাহক
+ Comment[cs]=Novell GroupWise komunikátor
+ Comment[de]=Novell GroupWise-Nachrichtendienst
+ Comment[es]=Mensajería GroupWise de Novell
+--- kopete/protocols/jabber/kopete_jabber.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/jabber/kopete_jabber.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -21,6 +21,7 @@
+ Comment=Protocol to connect to Jabber
+ Comment[ar]=البروتوكول سيتصل بـ Jabber
+ Comment[bg]=Протокол за връзка с Jabber
++Comment[bn]=Jabber-এ সংযোগ করতে প্রোটোকল
+ Comment[bs]=Jabber protokol
+ Comment[ca]=Protocol per a connectar-se a Jabber
+ Comment[cs]=Protokol k připojení k Jabberu
+--- kopete/protocols/jabber/kioslave/jabberdisco.protocol (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/jabber/kioslave/jabberdisco.protocol (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -10,6 +10,7 @@
+ moving=false
+ Icon=remote
+ Description=A KIO slave for Jabber Service Discovery
++Description[bn]=Jabber সার্ভিস ডিসকভারির জন্য একটি কে-আই-ও স্লেভ
+ Description[ca]=Un esclau KIO pel servei de de descoberta del Jabber
+ Description[cs]=Pomocný protokol pro zjišťování služeb Jabber
+ Description[da]=En kioslave til at opdage jabber service
+--- kopete/protocols/oscar/aim/kopete_aim.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/oscar/aim/kopete_aim.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -16,10 +16,12 @@
+ X-KDE-PluginInfo-License=GPL
+ X-KDE-PluginInfo-EnabledByDefault=false
+ Name=AIM
++Name[bn]=এ-আই-এম
+ Name[hi]=एआरईएम
+ Comment=Protocol to connect to AIM
+ Comment[ar]=البرتوكول سيتصل بـ AIM
+ Comment[bg]=Протокол за връзка с AIM
++Comment[bn]=এ-আই-এমতে সংযোগ করতে প্রোটোকল
+ Comment[bs]=AIM protokol
+ Comment[ca]=Protocol per a connectar-se a AIM
+ Comment[cs]=Protokol k připojení k AIM
+--- kopete/protocols/oscar/icq/x-icq.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/oscar/icq/x-icq.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -4,6 +4,7 @@
+ Comment[ar]=جهة اتصال على ICQ
+ Comment[be]=Кантакт ICQ
+ Comment[bg]=Връзка с ICQ Contact
++Comment[bn]=আই-সি-কিউ যোগাযোগ
+ Comment[br]=Darempred ICQ
+ Comment[bs]=ICQ kontakt
+ Comment[ca]=Contacte ICQ
+--- kopete/protocols/oscar/icq/kopete_icq.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/oscar/icq/kopete_icq.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -16,10 +16,12 @@
+ X-KDE-PluginInfo-License=GPL
+ X-KDE-PluginInfo-EnabledByDefault=false
+ Name=ICQ
++Name[bn]=আই-সি-কিউ
+ Name[hi]=आईसीक्यू
+ Comment=Protocol to connect to ICQ
+ Comment[ar]=البرتوكول سيتصل بـ ICQ
+ Comment[bg]=Протокол за връзка с ICQ
++Comment[bn]=আই-সি-কিউতে সংযোগ করতে প্রোটোকল
+ Comment[bs]=ICQ protokol
+ Comment[ca]=Protocol per a connectar-se a ICQ
+ Comment[cs]=Protokol k připojení k ICQ
+--- kopete/protocols/meanwhile/kopete_meanwhile.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/meanwhile/kopete_meanwhile.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -22,6 +22,7 @@
+ Name[ta]=இடைப்பட்ட பொழுதில்
+ Comment=Meanwhile protocol plugin
+ Comment[bg]=Протокол за връзка с Meanwhile
++Comment[bn]=Meanwhile প্রোটোকল প্লাগিন
+ Comment[ca]=Connector de protocol Meanwhile
+ Comment[cs]=Modul protokolu Meanwhile
+ Comment[da]=Meanwhile-protokol-plugin
+--- kopete/protocols/testbed/kopete_testbed.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/testbed/kopete_testbed.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -17,6 +17,7 @@
+ X-KDE-PluginInfo-EnabledByDefault=false
+ Name=Testbed
+ Name[ar]=مكان اختبار
++Name[bn]=পরীক্ষাস্থল
+ Name[cy]=Mainc Arbrofi
+ Name[et]=Testija
+ Name[fi]=Testipenkki
+@@ -42,6 +43,7 @@
+ Comment[ar]=بروتوكول اختبار Kopete
+ Comment[be]=Тэставы пратакол Kopete
+ Comment[bg]=Пробен протокол на Kopete
++Comment[bn]=কপেট পরীক্ষা প্রোটোকল
+ Comment[bs]=Kopete testni protokol
+ Comment[ca]=Protocol per a proves en Kopete
+ Comment[cy]=Protocol arbrofi Kopete
+--- kopete/protocols/irc/kopete_irc.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/irc/kopete_irc.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -16,10 +16,12 @@
+ X-KDE-PluginInfo-License=GPL
+ X-KDE-PluginInfo-EnabledByDefault=false
+ Name=IRC
++Name[bn]=আই-আর-সি
+ Name[hi]=आईआरसी
+ Comment=Protocol to connect to IRC
+ Comment[ar]=البروتوكل سيتصل بـ IRC
+ Comment[bg]=Протокол за връзка с IRC
++Comment[bn]=আই-আর-সিতে সংযোগ করতে প্রোটোকল
+ Comment[bs]=IRC protokol
+ Comment[ca]=Protocol per a connectar-se a l'IRC
+ Comment[cs]=Protokol k připojení k IRC
+--- kopete/protocols/msn/kopete_msn.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/msn/kopete_msn.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -17,6 +17,7 @@
+ X-KDE-PluginInfo-EnabledByDefault=false
+ Name=MSN Messenger
+ Name[ar]=مرسال MSN
++Name[bn]=এমএসএন বার্তাবাহক
+ Name[cy]=Negesydd MSN
+ Name[da]=MSN-Messenger
+ Name[de]=MSN-Messenger
+@@ -34,6 +35,7 @@
+ Comment=Protocol to connect to MSN Messenger
+ Comment[ar]=البرتوكول سيتصل بمرسال MSN
+ Comment[bg]=Протокол за връзка с MSN Messenger
++Comment[bn]=এমএসএন বার্তাবাহকে সংযোগ করতে প্রোটোকল
+ Comment[bs]=MSN Messenger protokol
+ Comment[ca]=Protocol per a connectar-se a MSN Messenger
+ Comment[cs]=Protokol k připojení k MSN Messengeru
+--- kopete/protocols/msn/config/kopete_msn_config.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/protocols/msn/config/kopete_msn_config.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Name[ar]=توصيلة MSN
+ Name[be]=Дапаўненьне "MSN"
+ Name[bg]=MSN
++Name[bn]=এমএসএন প্লাগিন
+ Name[br]=Lugent MSN
+ Name[bs]=MSN dodatak
+ Name[ca]=Connector de MSN
+@@ -63,6 +64,7 @@
+ Comment=Microsoft Network Protocol
+ Comment[ar]=بروتوكول شبكة Microsoft
+ Comment[bg]=Протокол за връзка с Microsoft Network
++Comment[bn]=মাইক্রোসফ্ট নেটওয়ার্ক প্রোটোকল
+ Comment[br]=Komenad rouedad Microsoft
+ Comment[bs]=Microsoft Network protokol
+ Comment[ca]=Protocol per a la xarxa de Microsoft
+--- kopete/kopete/eventsrc (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/kopete/eventsrc (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -3,6 +3,7 @@
+ Comment=Kopete Messenger
+ Comment[ar]=مرسال Kopete
+ Comment[bg]=Месинджър
++Comment[bn]=কপেট বার্তাবাহক
+ Comment[ca]=Missatger Kopete
+ Comment[cs]=Kopete komunikátor
+ Comment[cy]=Negesydd Kopete
+@@ -42,6 +43,7 @@
+ Name=Incoming
+ Name[ar]=وارد
+ Name[bg]=Пристигна ново съобщение
++Name[bn]=অন্তর্মুখী
+ Name[br]=Nevez
+ Name[bs]=Ulazni
+ Name[ca]=Entrant
+@@ -91,6 +93,7 @@
+ Name[zh_HK]=內送
+ Comment=An incoming message has been received
+ Comment[bg]=Пристигна ново съобщение
++Comment[bn]=একটি অন্তর্মুখী বার্তা গ্রহণ করা হয়েছে
+ Comment[bs]=Primljena je poruka
+ Comment[ca]=S'ha rebut un missatge entrant
+ Comment[cs]=Přišla zpráva
+@@ -138,6 +141,7 @@
+ Name=Outgoing
+ Name[ar]=خارج
+ Name[bg]=Изпратено е съобщение
++Name[bn]=বহির্মুখী
+ Name[bs]=Izlazni
+ Name[ca]=Sortint
+ Name[cs]=Odchozí
+@@ -186,6 +190,7 @@
+ Name[zh_HK]=外發
+ Comment=An outgoing message has been sent
+ Comment[bg]=Изпратено е съобщение
++Comment[bn]=একটি বহির্মুখী বার্তা পাঠান হয়েছে
+ Comment[bs]=Poslana je poruka
+ Comment[ca]=S'ha enviat un missatge sortint
+ Comment[cs]=Byla odeslána zpráva
+@@ -234,6 +239,7 @@
+ Name=Online
+ Name[ar]=متصل
+ Name[bg]=Включи се приятел
++Name[bn]=অনলাইন
+ Name[br]=Enlinenn
+ Name[ca]=Connectat
+ Name[cy]=Ar-lein
+@@ -274,6 +280,7 @@
+ Name[zh_HK]=上線
+ Comment=A contact has come online
+ Comment[bg]=Включи се приятел
++Comment[bn]=যোগাযোগ তালিকাভুক্ত একজন অনলাইন হয়েছে
+ Comment[bs]=Kontakt je došao online
+ Comment[ca]=Un contacte s'ha connectat
+ Comment[cs]=Osoba je online
+@@ -319,6 +326,7 @@
+ Name=Offline
+ Name[ar]=غير متصل
+ Name[bg]=Изключи се приятел
++Name[bn]=অফলাইন
+ Name[br]=N'eo ket enlinenn
+ Name[ca]=Desconnectat
+ Name[cy]=All-lein
+@@ -361,6 +369,7 @@
+ Name[zh_HK]=離線
+ Comment=A contact has gone offline
+ Comment[bg]=Изключи се приятел
++Comment[bn]=যোগাযোগ তালিকাভুক্ত একজন অফলাইন হয়ে গিয়েছে
+ Comment[bs]=Kontakt je otišao offline
+ Comment[ca]=Un contacte s'ha desconnectat
+ Comment[cs]=Osoba je offline
+@@ -408,6 +417,7 @@
+ Name[ar]=تغير حالة
+ Name[be]=Зьмяненьне статусу
+ Name[bg]=Променено състояние на приятел
++Name[bn]=অবস্থা পরিবর্তন
+ Name[bs]=Izmjena statusa
+ Name[ca]=Canvia estatus
+ Name[cs]=Změna stavu
+@@ -455,6 +465,7 @@
+ Name[zh_HK]=狀態改變
+ Comment=A contact's online status has changed
+ Comment[bg]=Променено състояние на приятел
++Comment[bn]=যোগাযোগ তালিকাভুক্ত একজনের অনলাইন অবস্থার পরিবর্তন হয়েছে
+ Comment[bs]=Kontakt je promijenio svoj online status
+ Comment[ca]=L'estat d'un contacte ha canviat
+ Comment[cs]=Osoba změnila online stav
+@@ -501,6 +512,7 @@
+ Name[ar]=تمييز
+ Name[be]=Падсьветка
+ Name[bg]=Открояване
++Name[bn]=গুরুত্বপূর্ণ
+ Name[br]=Splannadur
+ Name[bs]=Isticanje
+ Name[ca]=Ressaltat
+@@ -548,6 +560,7 @@
+ Name[zh_HK]=加強顯示
+ Comment=A highlighted message has been received
+ Comment[bg]=Пристигна специално съобщение
++Comment[bn]=একটি গুরুত্বপূর্ণ বার্তা গ্রহণ করা হয়েছে
+ Comment[bs]=Primljena je naglašena poruka
+ Comment[ca]=S'ha rebut un missatge ressaltat
+ Comment[cs]=Byla obdržena zvýrazněná zpráva
+@@ -594,6 +607,7 @@
+ [kopete_contact_lowpriority]
+ Name=Low priority messages
+ Name[bg]=Пристигна съобщение с нисък приоритет
++Name[bn]=কম গুরুত্বপূর্ণ বার্তা
+ Name[bs]=Poruke niskog prioriteta
+ Name[ca]=Missatges de baixa prioritat
+ Name[cs]=Zprávy s nízkou prioritou
+@@ -635,6 +649,7 @@
+ Name[zh_HK]=不太重要的訊息
+ Comment=A message marked with a low priority has been received
+ Comment[bg]=Пристигна съобщение с нисък приоритет
++Comment[bn]=একটি কম গুরুত্বপূর্ণ বার্তা গ্রহণ করা হয়েছে
+ Comment[bs]=Primljena je poruka označena kao poruka niskog prioriteta
+ Comment[ca]=S'ha rebut un missatge marcat amb baixa prioritat
+ Comment[cs]=Byla obdržena zvýrazněná zpráva s nízkou prioritou
+@@ -681,6 +696,7 @@
+ Name=Yahoo Mail
+ Name[be]=Пошта Yahoo
+ Name[bg]=Пристигна нова поща в Yahoo
++Name[bn]=ইয়্যাহু মেইল
+ Name[bs]=Yahoo mail
+ Name[ca]=Correu Yahoo
+ Name[es]=Correo de Yahoo
+@@ -707,6 +723,7 @@
+ Name[zh_CN]=Yahoo 邮件
+ Comment=New email has arrived in your Yahoo inbox
+ Comment[bg]=Пристигна нова поща в Yahoo
++Comment[bn]=আপনার ইয়্যাহু ইনবক্সে নতুন ই-মেইল উপস্থিত হয়েছে
+ Comment[br]=Deuet eo ur postel nevez d'em voest degemer Yahoo
+ Comment[bs]=Stigla je nova pošta u vaš Yahoo sandučić
+ Comment[ca]=Ha arribat un nou correu a la vostra bústia de Yahoo
+@@ -753,6 +770,7 @@
+ Name[ar]=بريد MSN
+ Name[be]=Пошта MSN
+ Name[bg]=Пристигна нова поща в MSN
++Name[bn]=এমএসএন মেইল
+ Name[br]=Postel MSN
+ Name[bs]=MSN mail
+ Name[ca]=Correu de MSN
+@@ -788,6 +806,7 @@
+ Name[zh_CN]=MSN 邮件
+ Comment=New email has arrived in your MSN inbox
+ Comment[bg]=Пристигна нова поща в MSN
++Comment[bn]=আপনার এমএসএন ইনবক্সে নতুন ই-মেইল উপস্থিত হয়েছে
+ Comment[br]=Deuet eo ur postel nevez d'em voest degemer MSN
+ Comment[bs]=Stigla je nova pošta u vaš MSN sandučić
+ Comment[ca]=Ha arribat un nou correu a la vostra bústia de MSN
+@@ -833,6 +852,7 @@
+ [icq_authorization]
+ Name=ICQ Authorization
+ Name[bg]=Оторизация на ICQ
++Name[bn]=আই-সি-কিউ প্রাপ্তাধিকার
+ Name[ca]=Autorització ICQ
+ Name[cs]=ICQ autorizace
+ Name[da]=ICQ-godkendelse
+@@ -869,6 +889,7 @@
+ Name[zh_HK]=ICQ 授權
+ Comment=An ICQ user has authorized/declined your authorization request
+ Comment[bg]=Потребител на ICQ е приел/отхвърлил Вашата заявка за оторизация
++Comment[bn]=একজন আই-সি-কিউ ব্যবহারকারী আপনার প্রাপ্তাধিকার অনুরোধ অনুমোদন/প্রত্যাখ্যান করেছে
+ Comment[ca]=Un usuari d'ICQ ha autoritzat/declinat la vostra petició d'autorització
+ Comment[cs]=ICQ uživatel vám poskytl/odmítnul požadavek na autorizaci
+ Comment[da]=En ICQ-bruger har godkendt/afslået din godkendelsesforespørgsel
+@@ -907,6 +928,7 @@
+ [irc_event]
+ Name=IRC Event
+ Name[bg]=Събитие в IRC
++Name[bn]=আই-আর-সি ঘটনা
+ Name[ca]=Esdeveniment IRC
+ Name[cs]=IRC událost
+ Name[da]=IRC-begivenhed
+@@ -943,6 +965,7 @@
+ Name[zh_HK]=IRC 事件
+ Comment=An IRC event has occurred
+ Comment[bg]=Събитие в клиента за IRC
++Comment[bn]=একটি আই-আর-সি ঘটনা ঘটেছে
+ Comment[ca]=Ha ocorregut un esdeveniment d'IRC
+ Comment[cs]=Nastala IRC událost
+ Comment[da]=En IRC=begivenhed er opstået
+@@ -980,6 +1003,7 @@
+ [connection_error]
+ Name=Connection Error
+ Name[bg]=Грешка при връзка
++Name[bn]=সংযোগ ত্রুটি
+ Name[br]=Fazi ar gevreadenn
+ Name[ca]=Error de connexió
+ Name[cs]=Chyba ve spojení
+@@ -1014,6 +1038,7 @@
+ Name[zh_HK]=連線錯誤
+ Comment=An error on connection has occurred
+ Comment[bg]=Грешка по време на установяване на връзка
++Comment[bn]=সংযোগে একটি ত্রুটি ঘটেছে
+ Comment[ca]=Hi ha hagut un error al connectar
+ Comment[cs]=Nastala chyba ve spojení
+ Comment[da]=En fejl i forbindelsen er opstået
+@@ -1049,6 +1074,7 @@
+ [connection_lost]
+ Name=Connection Lost
+ Name[bg]=Връзката е прекъсната
++Name[bn]=সংযোগ বিচ্ছিন্ন
+ Name[br]=Kollet eo ar gevreadenn
+ Name[ca]=Connexió perduda
+ Name[cs]=Spojení ztraceno
+@@ -1081,12 +1107,15 @@
+ Name[zh_CN]=连接已丢失
+ Name[zh_HK]=連線已中斷
+ Comment=The connection has been lost
++Comment[bn]=সংযোগ বিচ্ছিন্ন হয়েছে
++Comment[ca]=S'ha perdut la connexió
+ Comment[cs]=Spojení bylo ztraceno
+ Comment[da]=Forbindelsen er gået tabt
+ Comment[de]=Die Verbindung wurde unterbrochen
+ Comment[el]=Η σύνδεση έκλεισε
+ Comment[es]=Se perdió la conexión
+ Comment[et]=Ühendus kadus
++Comment[eu]=Konexioa galdu da
+ Comment[fr]=La connexion a été perdue
+ Comment[hu]=A kapcsolat megszakadt
+ Comment[it]=La connessione è stata chiusa
+@@ -1106,6 +1135,7 @@
+ [cannot_connect]
+ Name=Cannot Connect
+ Name[bg]=Невъзможна връзка
++Name[bn]=সংযোগ করা গেল না
+ Name[ca]=No es pot connectar
+ Name[cs]=Nelze se připojit
+ Name[da]=Kan ikke forbinde
+@@ -1139,6 +1169,7 @@
+ Name[zh_HK]=無法連接
+ Comment=Kopete can't connect to the service
+ Comment[bg]=Установяването на връзка е невъзможно
++Comment[bn]=কপেট সার্ভিসে সংযোগ করতে পারেনি
+ Comment[ca]=El Kopete no pot connectar al servei
+ Comment[cs]=Kopete se nedokáže připojit ke službě
+ Comment[da]=Kopete kan ikke forbinde til tjenesten
+@@ -1173,6 +1204,7 @@
+ [network_problems]
+ Name=Network Problems
+ Name[bg]=Мрежови проблеми
++Name[bn]=নেটওয়ার্ক সমস্যা
+ Name[ca]=Problemes de xarxa
+ Name[cs]=Problémy se sítí
+ Name[da]=Netværksproblemer
+@@ -1206,6 +1238,7 @@
+ Name[zh_HK]=網絡問題
+ Comment=The network is experiencing problems
+ Comment[bg]=Мрежови проблеми
++Comment[bn]=নেটওয়ার্ক সমস্যা অনুভব করছে
+ Comment[ca]=La xarxa està tenint problemes
+ Comment[cs]=Síť má problémy
+ Comment[da]=Netværket har for øjeblikket problemer
+@@ -1240,6 +1273,7 @@
+ [server_error]
+ Name=Server Internal Error
+ Name[bg]=Вътрешна грешка на сървъра
++Name[bn]=সার্ভার অভ্যন্তরীন ত্রুটি
+ Name[ca]=Error intern del servidor
+ Name[cs]=Interní chyba serveru
+ Name[da]=Intern fejl i serveren
+@@ -1271,12 +1305,15 @@
+ Name[zh_CN]=服务器内部错误
+ Name[zh_HK]=伺服器內部錯誤
+ Comment=A service internal error has occurred
++Comment[bn]=একটি সার্ভিস অভ্যন্তরীন ত্রুটি ঘটেছে
++Comment[ca]=Hi ha hagut un error intern del servei
+ Comment[cs]=Nastala interní chyba služby
+ Comment[da]=En intern fejl for tjenesten er opstået
+ Comment[de]=Bei diesem Dienst ist ein interner Serverfehler aufgetreten.
+ Comment[el]=Παρουσιάστηκε ένα εσωτερικό σφάλμα της υπηρεσίας
+ Comment[es]=Ocurrió un error interno en el servicio
+ Comment[et]=Tekkis teenuse sisemine viga
++Comment[eu]=Zerbitzuaren barne-errore bat gertatu da
+ Comment[fr]=Une erreur interne au service s'est produite
+ Comment[hu]=Belső hiba történt a szolgáltatásban
+ Comment[it]=Si è verificato un errore interno del servizio
+@@ -1296,6 +1333,7 @@
+ [buzz_nudge]
+ Name=Buzz/Nudge
+ Name[bg]=Сбутване
++Name[bn]=গুঞ্জন/গুঁতো
+ Name[ca]=Truca/Avisa
+ Name[cs]=Štouchanec
+ Name[da]=Påringning/luk
+@@ -1320,6 +1358,7 @@
+ Name[zh_HK]=響聲/提示
+ Comment=A contact has sent you a buzz/nudge.
+ Comment[bg]=Контакт Ви изпрати сбутване
++Comment[bn]=যোগাযোগ তালিকাভুক্ত একজন আপনাকে একটি গুঞ্জন/গুঁতো পাঠিয়েছে।
+ Comment[ca]=Un contacte us ha enviat una trucada/avís.
+ Comment[cs]=Osoba vám poslala šťouchanec :-)
+ Comment[da]=En kontakt har sendt dig en buzz/nudge.
+--- kopete/kopete/kopete.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/kopete/kopete.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -2,10 +2,12 @@
+ Encoding=UTF-8
+ MimeType=application/x-kopete-emoticons;application/x-icq
+ Name=Kopete
++Name[bn]=কপেট
+ Name[hi]=के-ऑप्टी
+ GenericName=Instant Messenger
+ GenericName[ar]=المرسال الفوري
+ GenericName[bg]=Съобщения в реално време
++GenericName[bn]=তাত্ক্ষণিক বার্তাবাহক
+ GenericName[bs]=Instant poruke
+ GenericName[ca]=Missatger a l'instant
+ GenericName[cs]=Komunikátor
+@@ -50,6 +52,7 @@
+ Comment=Instant Messenger
+ Comment[ar]=المرسال الفوري
+ Comment[bg]=Съобщения в реално време
++Comment[bn]=তাত্ক্ষণিক বার্তাবাহক
+ Comment[bs]=Instant poruke
+ Comment[ca]=Missatger a l'instant
+ Comment[cs]=Komunikátor
+--- kopete/kopete/x-kopete-emoticons.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/kopete/x-kopete-emoticons.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -9,6 +9,7 @@
+ Comment=Kopete Emoticon Archive
+ Comment[be]=Архіў піктаграмаў эмоцыяў Kopete
+ Comment[bg]=Архив на икони за Kopete
++Comment[bn]=কপেট অভিব্যক্তি প্রতীক আর্কাইভ
+ Comment[bs]=Kopete arhiva smajlija
+ Comment[ca]=Arxiu d'emoticones Kopete
+ Comment[cs]=Archív Kopete emotikonů
+--- kopete/kopete/config/accounts/kopete_accountconfig.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/kopete/config/accounts/kopete_accountconfig.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Name[ar]=حسابات
+ Name[be]=Рахункі
+ Name[bg]=Сметки
++Name[bn]=অ্যাকাউন্ট
+ Name[br]=Kontoù
+ Name[bs]=Računi
+ Name[ca]=Comptes
+@@ -63,6 +64,7 @@
+ Comment[ar]=من هنا تستطيع إدارة جميع حساباتك
+ Comment[be]=Тут Вы можаце кіраваць усімі Вашымі рахункамі
+ Comment[bg]=Настройки на сметките
++Comment[bn]=আপনি এখানে আপনার অ্যাকাউন্ট পরিচালনা করতে পারেন
+ Comment[bs]=Ovdje možete upravljati svim svojim računima
+ Comment[ca]=Aquí podreu gestionar tots els vostres comptes
+ Comment[cs]=Zde můžete spravovat veškeré své účty
+--- kopete/kopete/config/appearance/kopete_appearanceconfig.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/kopete/config/appearance/kopete_appearanceconfig.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Name[ar]=المظهر
+ Name[be]=Зьнешні выгляд
+ Name[bg]=Външен вид
++Name[bn]=চেহারা
+ Name[br]=Neuziadur
+ Name[bs]=Izgled
+ Name[ca]=Aparença
+@@ -63,6 +64,7 @@
+ Comment=Here You Can Alter Kopete's Look And Feel
+ Comment[ar]=يمكنك تغيير مظهر Kopete
+ Comment[bg]=Настройки на външния вид на програмата
++Comment[bn]=আপনি এখানে কপেটের চেহারা ও কার্যকারিতা পরিবর্তন করতে পারেন
+ Comment[bs]=Ovdje možete izmijeniti izgled Kopete-a
+ Comment[ca]=Aquí podreu modificar l'aparença i comportament de Kopete
+ Comment[cs]=Zde je možné přizpůsobit si vzhled a chování Kopete
+--- kopete/kopete/config/behavior/kopete_behaviorconfig.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/kopete/config/behavior/kopete_behaviorconfig.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Name[ar]=السلوك
+ Name[be]=Паводзіны
+ Name[bg]=Поведение
++Name[bn]=আচরণ
+ Name[br]=Emzalc'h
+ Name[bs]=Ponašanje
+ Name[ca]=Comportament
+@@ -64,6 +65,7 @@
+ Comment=Here You Can Personalize Kopete
+ Comment[ar]=هنا يمكنك تخصيص Kopete
+ Comment[bg]=Настройки на поведението на програмата
++Comment[bn]=আপনি এখানে কপেট ব্যক্তিগতকরণ করতে পারেন
+ Comment[bs]=Ovdje možete prilagoditi sebi Kopete
+ Comment[ca]=Aquí podreu personalitzar el Kopete
+ Comment[cs]=Zde je možné přizpůsobit si Kopete
+--- kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -12,6 +12,7 @@
+
+ Name=Devices
+ Name[bg]=Устройства
++Name[bn]=ডিভাইস
+ Name[br]=Trobarzhelloù
+ Name[ca]=Dispositius
+ Name[cs]=Zařízení
+@@ -57,6 +58,7 @@
+ Name[zu]=Amacebo
+ Comment=Here You Can Alter Kopete's Video And Audio Devices' Settings
+ Comment[bg]=Настройки на видео и аудио устройствата на програмата
++Comment[bn]=আপনি এখানে কপেটের ভিডিও এবং অডিও ডিভাইসের মানসমূহ পরিবর্তন করতে পারেন
+ Comment[ca]=Aquí podreu modificar els paràmetres dels dispositius d'àudio i vídeo del Kopete
+ Comment[cs]=Zde je možné přizpůsobit si nastavení audio a video zařízení
+ Comment[da]=Her kan du ændre Kopete's video- og lydenheds opsætning
+--- kopete/kopete/config/identity/kopete_identityconfig.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/kopete/config/identity/kopete_identityconfig.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -12,6 +12,7 @@
+
+ Name=Identity
+ Name[bg]=Идентификация
++Name[bn]=পরিচয়
+ Name[br]=Anvelezh
+ Name[ca]=Identitat
+ Name[cs]=Identita
+@@ -47,6 +48,7 @@
+ Name[zh_HK]=識別名稱
+ Comment=Here You Can Manage Your Global Identity
+ Comment[bg]=Настройки на идентификацията
++Comment[bn]=আপনি এখানে আপনার বিশ্ব পরিচয় পরিচালনা করতে পারেন
+ Comment[ca]=Aquí podreu gestionar globalment la vostra identitat
+ Comment[cs]=Zde můžete spravovat svou globální identitu
+ Comment[da]=Her kan du håndtere din globale identitet
+--- kopete/kopete/chatwindow/chatwindow.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/kopete/chatwindow/chatwindow.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -17,6 +17,7 @@
+ Name[ar]=نافذة محادثة Kopete
+ Name[be]=Акно гутаркі Kopete
+ Name[bg]=Прозорец за разговори
++Name[bn]=কপেট চ্যাট উইন্ডো
+ Name[bs]=Kopete chat prozor
+ Name[ca]=Finestra de xat del Kopete
+ Name[cs]=Okno rozhovoru Kopete
+@@ -64,6 +65,7 @@
+ Comment[ar]=نافذة محادثة Kopete ألافتراضية
+ Comment[be]=Акно гутаркі Kopete па ўмаўчаньні
+ Comment[bg]=Стандартен прозорец за разговори
++Comment[bn]=ডিফল্ট কপেট চ্যাট উইন্ডো
+ Comment[bs]=Osnovni Kopete chat prozor
+ Comment[ca]=La finestra de xat per omissió del Kopete
+ Comment[cs]=Výchozí okno Kopete pro rozhovor
+--- kopete/kopete/chatwindow/emailwindow.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/kopete/chatwindow/emailwindow.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -15,6 +15,7 @@
+ X-KDE-PluginInfo-EnabledByDefault=true
+ Name=Kopete Email Window
+ Name[bg]=Прозорец за е-поща
++Name[bn]=কপেট ই-মেইল উইন্ডো
+ Name[ca]=Finestra de correu-e del Kopete
+ Name[cs]=Emailové okno Kopete
+ Name[da]=Kopete's e-mail-vindue
+@@ -50,6 +51,7 @@
+ Name[zh_HK]=Kopete 電郵視窗
+ Comment=The Kopete email window
+ Comment[bg]=Прозорец за изпращане на е-поща
++Comment[bn]=কপেট ই-মেইল উইন্ডো
+ Comment[br]=Prenestr postel Kopete
+ Comment[ca]=La finestra de correu-e del Kopete
+ Comment[cs]=Emailové okno Kopete
+--- kopete/libkopete/kopetemessage.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/libkopete/kopetemessage.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -231,7 +231,7 @@
+ theBody.remove( QString::fromLatin1("\n") );
+ }
+
+- d->body=body;
++ d->body=theBody;
+ d->format = f;
+ }
+
+--- kopete/libkopete/kopeteui.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/libkopete/kopeteui.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -6,6 +6,7 @@
+ Comment=A Kopete UI Plugin
+ Comment[ar]=توصيلة واجهة استخدام Kopete
+ Comment[bg]=Приставка за графичния интерфейс на Kopete
++Comment[bn]=একটি কপেট ইউ-আই প্লাগিন
+ Comment[bs]=Kopete dodatak za UI
+ Comment[ca]=Un connector de IU per a Kopete
+ Comment[cs]=Modul rozhraní aplikace Kopete
+--- kopete/libkopete/kopeteprotocol.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/libkopete/kopeteprotocol.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -7,6 +7,7 @@
+ Comment[ar]=توصيلة بروتوكول KDE
+ Comment[be]=Дапаўненьне-пратакол Kopete
+ Comment[bg]=Приставка за протоколите на Kopete
++Comment[bn]=কপেট প্রোটোকল প্লাগিন
+ Comment[br]=Lugent komenad Kopete
+ Comment[bs]=Kopete dodatak za protokol
+ Comment[ca]=Connector de protocol per a Kopete
+--- kopete/libkopete/kopeteplugin.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kopete/libkopete/kopeteplugin.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -7,6 +7,7 @@
+ Comment[ar]=توصيلة Kopete
+ Comment[be]=Дапаўненьне Kopete
+ Comment[bg]=Приставки на Kopete
++Comment[bn]=কপেট প্লাগিন
+ Comment[br]=Lugent Kopete
+ Comment[bs]=Kopete dodatak
+ Comment[ca]=Connector de Kopete
+--- knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -6,6 +6,7 @@
+ Name[ar]=صفحة خصائص ملف مصدر مجدد الأخبار
+ Name[az]=KNewsticker Mənbə Faylı Xüsusiyyətləri Səhifəsi
+ Name[bg]=Настройки на файла източник на KNewsticker
++Name[bn]=কে-নিউজ-টিকার উত্স ফাইল বৈশিষ্ট্যাবলী পাতা
+ Name[bs]=KNewsticker stranica sa osobinama izvorne datoteke
+ Name[ca]=Pàgina de propietats dels fitxers font del KNewsticker
+ Name[cs]=Popis vlastností zdrojového souboru programu KNewsticker
+--- knewsticker/knewsticker-standalone.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ knewsticker/knewsticker-standalone.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -3,6 +3,7 @@
+ Name=KNewsTicker
+ Name[af]=K-nuustikker
+ Name[ar]=مجدد أخبار كيدي
++Name[bn]=কে-নিউজ-টিকার
+ Name[cy]=KTicerNewyddion
+ Name[eo]=Novaĵprezentilo
+ Name[he]=KNewsTicker - צג חדשות
+@@ -28,6 +29,7 @@
+ GenericName[ar]=تجديد الأخبار
+ GenericName[az]=Xəbər Gözləyici
+ GenericName[bg]=Четец на новини
++GenericName[bn]=সংবাদ টিকার
+ GenericName[bs]=Traka s vijestima
+ GenericName[ca]=Teletip de notícies
+ GenericName[cs]=Novinky
+--- knewsticker/knewstickerstub/knewstickerstub.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ knewsticker/knewstickerstub/knewstickerstub.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Name=KNewsTicker Config Frontend
+ Name[bg]=Настройки на четеца на новини
++Name[bn]=কে-নিউজ-টিকার কনফিগ ফ্রন্ট-এন্ড
+ Name[bs]=KNewsTicker konfiguracijski frontend
+ Name[ca]=Interfície de configuració per a KNewsTicker
+ Name[cs]=Nastavení KNewsTickeru
+@@ -45,6 +46,7 @@
+ Comment[ar]=واجهة لضبط مجدد الأخبار
+ Comment[az]=KNewsTicker quraşdırması üçün bir axtar üz
+ Comment[bg]=Графичен интерфейс за настройки на четеца на новини
++Comment[bn]=কে-নিউজ-টিকার কনফিগারেশনের জন্য একটি ফ্রন্ট-এন্ড
+ Comment[bs]=Frontend za podešavanje KNewsTicker-a
+ Comment[ca]=Una interfície per a la configuració del KNewsTicker
+ Comment[cs]=Rozhraní pro nastavení KNewsTickeru
+@@ -118,6 +120,7 @@
+ Name[ar]=استخدمه مع مجدد الأخبار
+ Name[az]=KNewsTicker ilə birgə işlədin
+ Name[bg]=Използване с четеца на новини
++Name[bn]=কে-নিউজ-টিকারের সঙ্গে ব্যবহার
+ Name[bs]=Koristite sa KNewsTicker-om
+ Name[ca]=Empra amb el KNewsTicker
+ Name[cs]=Použít s KNewsTickerem
+--- knewsticker/eventsrc (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ knewsticker/eventsrc (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -5,6 +5,7 @@
+ Comment[ar]=تجديد الأخبار
+ Comment[az]=Xəbər Gözləyici
+ Comment[bg]=Четец на новини
++Comment[bn]=সংবাদ টিকার
+ Comment[bs]=Traka s vijestima
+ Comment[ca]=Teletip de notícies
+ Comment[cs]=Novinky
+@@ -66,6 +67,7 @@
+ Name[ar]=توجد أخبار جديدة
+ Name[az]=Mövcud Yeni Xəbərlər
+ Name[bg]=Пристигнаха нови новини
++Name[bn]=নতুন সংবাদ পাওয়া যাচ্ছে
+ Name[br]=Keleier nevez da gaout
+ Name[bs]=Nove vijesti su dostupne
+ Name[ca]=Noves notícies disponibles
+@@ -129,6 +131,7 @@
+ Comment[ar]=هناك أخبار جديدة
+ Comment[az]=Yeni xəbərlər mövcuddur
+ Comment[bg]=Пристигнаха нови новини
++Comment[bn]=নতুন সংবাদ পাওয়া যাচ্ছে
+ Comment[bs]=Sada ima novih vijesti
+ Comment[ca]=Hi ha noves notícies disponibles
+ Comment[cs]=Jsou dostupné nové zprávy
+@@ -196,6 +199,7 @@
+ Name[az]=Xətalı RDF faylı
+ Name[be]=Некарэктны RDF файл
+ Name[bg]=Невалиден файл RDF
++Name[bn]=অবৈধ আর-ডি-এফ ফাইল
+ Name[bs]=Neispravna RDF datoteka
+ Name[ca]=Fitxer RDF no vàlid
+ Name[cs]=Neplatný RDF soubor
+@@ -256,6 +260,7 @@
+ Name[zu]=Ifayela Engasebenziyo ye RDF
+ Comment=The downloaded RDF file could not be parsed
+ Comment[bg]=Изтегленият файл RDF не може да бъде анализиран
++Comment[bn]=ডাউনলোডকৃত আর-ডি-এফ ফাইল পার্স করতে পারল না
+ Comment[ca]=El fitxer RDF descarregat no s'ha pogut analitzar
+ Comment[cs]=Analýza stáhnutého RDF souboru selhala
+ Comment[da]=Den nedtagne RDF-fil kunne ikke fortolkes
+--- knewsticker/knewsticker.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ knewsticker/knewsticker.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Name=News Ticker
+ Name[af]=Nuus Tikker
++Name[bn]=সংবাদ টিকার
+ Name[ca]=Teletip de notícies
+ Name[cs]=KNewsTicker
+ Name[cy]=Ticer Newyddion
+@@ -46,6 +47,7 @@
+ Icon=knewsticker
+ Comment=A scrolling RDF news ticker
+ Comment[bg]=Четец на новини RDF
++Comment[bn]=একটি অবিরাম আর-ডি-এফ সংবাদ টিকার
+ Comment[ca]=Teletip de notícies RDF amb desplaçament
+ Comment[cs]=Rolující RDF novinky
+ Comment[da]=En rullende RDF nyhedstelegraf
+--- kget/kget_plug_in/kget_plug_in.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kget/kget_plug_in/kget_plug_in.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -12,6 +12,7 @@
+ X-KDE-PluginInfo-EnabledByDefault=true
+ Name=KGet
+ Name[ar]=ك.جيت
++Name[bn]=কে-গেট
+ Name[cy]=KNôl
+ Name[eo]=Prenilo
+ Name[hi]=के-गेट
+@@ -21,6 +22,7 @@
+ Name[ven]=Wana ha K
+ Comment=Download Manager
+ Comment[bg]=Изтегляне на файлове
++Comment[bn]=ডাউনলোড ম্যানেজার
+ Comment[br]=Merour enkargañ
+ Comment[ca]=Gestor de descàrregues
+ Comment[cs]=Správce stahování
+--- kget/kget.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kget/kget.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -7,6 +7,7 @@
+ Terminal=false
+ Name=KGet
+ Name[ar]=ك.جيت
++Name[bn]=কে-গেট
+ Name[cy]=KNôl
+ Name[eo]=Prenilo
+ Name[hi]=के-गेट
+@@ -17,6 +18,7 @@
+ GenericName=Download Manager
+ GenericName[ar]=إدارة التحميل
+ GenericName[bg]=Изтегляне на файлове
++GenericName[bn]=ডাউনলোড ম্যানেজার
+ GenericName[br]=Merour enkargañ
+ GenericName[bs]=Upravitelj downloadom
+ GenericName[ca]=Gestor de descàrregues
+--- kget/x-kgetlist.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kget/x-kgetlist.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -4,6 +4,7 @@
+ Comment=Kget Download List
+ Comment[ar]=قائمة تنزيل ك.جيت
+ Comment[bg]=Списък за изтегляне на Kget
++Comment[bn]=কে-গেট ডাউনলোড তালিকা
+ Comment[bs]=KGet download lista
+ Comment[ca]=Llista de descàrrega del Kget
+ Comment[cs]=Seznam stahování KGet
+--- kget/kget_download.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kget/kget_download.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -10,6 +10,7 @@
+ Icon=kget
+ Name=Download with KGet
+ Name[bg]=Изтегляне с KGet
++Name[bn]=কে-গেট দিয়ে ডাউনলোড
+ Name[ca]=Descarrega amb el KGet
+ Name[cs]=Stáhnout pomocí KGet
+ Name[da]=Download med KGet
+--- kget/main.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kget/main.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -172,7 +172,9 @@
+ for( int i=0; i < args->count(); ++i){
+ urls.append(KURL::fromPathOrURL( args->arg(i)));
+ }
+- if ( args->count()==2 & urls.last().protocol() == "file" )
++
++ // Sometimes valid filenames are not recognised by KURL::isLocalFile(), they are marked as unvalid then
++ if ( args->count()==2 & ( urls.last().isLocalFile() | !urls.last().isValid()))
+ {
+ dest=urls.last().path();
+ kmain->addTransferEx( urls.first(), dest );
+--- kget/eventsrc (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kget/eventsrc (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -1,6 +1,7 @@
+ [!Global!]
+ IconName=kget
+ Comment=KGet
++Comment[bn]=কে-গেট
+ Comment[sv]=Kget
+
+ [added]
+@@ -31,6 +32,7 @@
+ Name[zh_HK]=傳輸已新增
+ Comment=A new download has been added
+ Comment[bg]=Добавен е нов файл за изтегляне
++Comment[bn]=একটি নতুন ডাউনলোড যোগ করা হয়েছে
+ Comment[ca]=S'ha afegit una descàrrega nova
+ Comment[cs]=Byl přidán nový přenos
+ Comment[da]=En ny download er blevet tilføjet
+@@ -66,6 +68,7 @@
+ [started]
+ Name=DownloadStarted
+ Name[bg]=Начало на изтегляне
++Name[bn]=ডাউনলোড আরম্ভ
+ Name[ca]=S'ha iniciat la descàrrega
+ Name[cs]=Stahování zahájeno
+ Name[el]=Εκκίνηση λήψης αρχείου
+@@ -92,6 +95,7 @@
+ Name[zh_HK]=下載已開始
+ Comment=Downloading started
+ Comment[bg]=Изтеглянето започна
++Comment[bn]=ডাউনলোড আরম্ভ করল
+ Comment[ca]=S'ha iniciat la descàrrega
+ Comment[cs]=Bylo zahájeno stahování
+ Comment[da]=Nedtagning startet
+@@ -128,6 +132,7 @@
+ [finished]
+ Name=DownloadFinished
+ Name[bg]=Край на изтегляне
++Name[bn]=ডাউনলোড শেষ
+ Name[ca]=Ha acabat la descàrrega
+ Name[cs]=Stahování ukončeno
+ Name[el]=Η λήψη ολοκληρώθηκε
+@@ -156,6 +161,7 @@
+ Name[zh_HK]=下載已完成
+ Comment=Downloading finished
+ Comment[bg]=Изтеглянето завърши
++Comment[bn]=ডাউনলোড শেষ করল
+ Comment[ca]=Ha acabat la descàrrega
+ Comment[cs]=Stahování bylo dokončeno
+ Comment[da]=Nedtagning afsluttet
+@@ -217,6 +223,7 @@
+ Name[zh_HK]=新增的下載已完成
+ Comment=All downloads finished
+ Comment[bg]=Изтеглянето на всичките файлове завърши
++Comment[bn]=সব ডাউনলোড শেষ করল
+ Comment[ca]=Han acabat totes les descàrregues
+ Comment[cs]=Všechna stahování byla dokončena
+ Comment[da]=Alle nedtagninger afsluttet
+--- filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -17,6 +17,7 @@
+
+ Comment=A module to configure shares for Microsoft Windows
+ Comment[bg]=Настройки на споделянето на ресурси с Майкрософт Уиндоус
++Comment[bn]=মাইক্রোসফ্ট উইন্ডোজের জন্য ভাগাভাগি কনফিগার করতে একটি মডিউল
+ Comment[ca]=Un mòdul per configurar els recursos compartits de Microsoft Windows
+ Comment[cs]=Modul pro konfiguraci sdílených prostředků MS Windows
+ Comment[da]=En modul til at indstille shares delt med Microsoft Windows
+@@ -72,5 +73,6 @@
+ Keywords[zh_CN]=KcmSambaConf,kcmsambaconf,samba,windows,share,共享
+ Name=Samba
+ Name[bg]=Самба
++Name[bn]=সাম্বা
+ Name[he]=סמבה
+ Name[pa]=ਸਾਂਬਾ
+--- filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -4,6 +4,7 @@
+ Icon=fileshare
+ Name=Fileshare Konqueror Directory Properties Page
+ Name[bg]=Настройки за приставката за браузъра за споделяна на файлове
++Name[bn]=ফাইল ভাগাভাগি কনকরার ডিরেক্টরী বৈশিষ্ট্যাবলী পাতা
+ Name[bs]=Stranica sa osobinama dijeljenja direktorija u Konqueroru
+ Name[ca]=Pàgina de propietats de compartició de fitxers Konqueror
+ Name[cs]=Stránka vlastností adresáře sdílení Konqueroru
+@@ -42,6 +43,7 @@
+ Name[zh_HK]=檔案分享 Konqueror 目錄屬性頁
+ Comment=Konqueror properties dialog plugin to share a directory with the local network
+ Comment[bg]=Настройка на приставката за браузъра Konqueror за споделяна на директории в локалната мрежа
++Comment[bn]=স্থানীয় নেটওয়ার্কের সঙ্গে একটি ডিরেক্টরী ভাগাভাগি করতে কনকরার বৈশিষ্ট্যাবলী ডায়ালগ প্লাগিন
+ Comment[bs]=Dodatak za prozor Konqueror postavki za dijeljenje direktorija u lokalnoj mreži
+ Comment[ca]=Diàleg de propietats Konqueror de l'endollable per compartir un directori amb la xarxa local
+ Comment[cs]=Modul dialogu vlastností Konqueroru pro sdílení adresářů v lokální síti
+--- filesharing/simple/fileshare.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ filesharing/simple/fileshare.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -11,6 +11,7 @@
+
+ Name=File Sharing
+ Name[bg]=Споделяне на файлове
++Name[bn]=ফাইল ভাগাভাগি
+ Name[br]=Rannañ restroù
+ Name[bs]=Dijeljenje datoteka
+ Name[ca]=Compartició de fitxers
+@@ -58,6 +59,7 @@
+
+ Comment=Enable or disable file sharing
+ Comment[bg]=Настройки на споделянето на файлове
++Comment[bn]=ফাইল ভাগাভাগি সক্রিয় অথবা নিষ্ক্রিয় করুন
+ Comment[bs]=Uključi ili isključi dijeljenje datoteka
+ Comment[ca]=Habilita o deshabilita la compartició de fitxers
+ Comment[cs]=Povolit nebo zakázat sdílení souborů
+--- kdict/applet/kdictapplet.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kdict/applet/kdictapplet.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -5,6 +5,7 @@
+ Comment[ar]=ابحث عن الكلمات في القاموس
+ Comment[az]=Lüğətdən kəlimələrə baxın
+ Comment[bg]=Търсене на фрази в речника
++Comment[bn]=একটি অভিধানে শব্দসমষ্টির খোঁজ করো
+ Comment[bs]=Potražite fraze u rječniku
+ Comment[ca]=Cerca expressions en un diccionari
+ Comment[cs]=Vyhledávač pojmů ve slovníku
+@@ -69,6 +70,7 @@
+ Name[az]=Lüğət
+ Name[be]=Слоўнік
+ Name[bg]=Речник
++Name[bn]=অভিধান
+ Name[br]=Geriadur
+ Name[bs]=Rječnik
+ Name[ca]=Diccionari
+--- kdict/kdict.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kdict/kdict.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -10,6 +10,7 @@
+ Name[az]=Lüğət
+ Name[be]=Слоўнік
+ Name[bg]=Речник
++Name[bn]=অভিধান
+ Name[br]=Geriadur
+ Name[bs]=Rječnik
+ Name[ca]=Diccionari
+@@ -74,6 +75,7 @@
+ GenericName[af]=Aan-lyn Woordeboek
+ GenericName[ar]=قاموس على الإنترنت
+ GenericName[bg]=Мрежови речник
++GenericName[bn]=অনলাইন অভিধান
+ GenericName[bs]=Online rječnik
+ GenericName[ca]=Diccionari en línia
+ GenericName[cs]=Online slovník
+--- wifi/kwireless/kwireless.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ wifi/kwireless/kwireless.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -3,6 +3,7 @@
+ Comment=Displays information about wireless network devices
+ Comment[ar]=عرض معلومات أجهزة الشبكة الاسلكية
+ Comment[bg]=Данни за устройствата поддържащи безжичната мрежа
++Comment[bn]=ওয়্যারলেস নেটওয়ার্ক ডিভাইস সম্বন্ধে তথ্য প্রদর্শন করে
+ Comment[bs]=Prikazuje informacije o bežičnim mrežnim uređajima
+ Comment[ca]=Mostra informació quant als dispositius de la xarxa sense fils
+ Comment[cs]=Zobrazuje informace o bezdrátových síťových zařízeních
+@@ -49,6 +50,7 @@
+ Name=Wireless Network Information
+ Name[ar]=معلومات الشبكة الاسلكية
+ Name[bg]=Данни за безжична мрежа
++Name[bn]=ওয়্যারলেস নেটওয়ার্ক তথ্য
+ Name[br]=Titouroù diwar-benn ar roueded hep neud
+ Name[bs]=Informacije o bežičnoj mreži
+ Name[ca]=Informació de la xarxa sense fils
+--- wifi/kcmwifi/kcmwifi.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ wifi/kcmwifi/kcmwifi.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -9,6 +9,7 @@
+ Name=Wireless Network
+ Name[ar]=شبكة لاسلكية
+ Name[bg]=Безжична мрежа
++Name[bn]=ওয়্যারলেস নেটওয়ার্ক
+ Name[br]=Rouedad hep neud
+ Name[bs]=Bežična mreža
+ Name[ca]=Xarxa sense fils
+@@ -57,6 +58,7 @@
+ Comment=Set up your wireless LAN
+ Comment[ar]=ركب شبكة LAN الاسلكية الخاصةبك
+ Comment[bg]=Настройки на безжична локална мрежа
++Comment[bn]=আপনার ওয়্যারলেস ল্যান স্থাপন করুন
+ Comment[br]=Lakaat ho roueded hep neud
+ Comment[bs]=Podesite vaš bežični LAN
+ Comment[ca]=Configureu la vostra xarxa local sense fils
+--- wifi/kwifimanager.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ wifi/kwifimanager.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -7,6 +7,7 @@
+ Comment=A wireless LAN connection monitor
+ Comment[ar]=مراقب أداء وصلة الشبكة المحلية اللاسلكبة
+ Comment[bg]=Мониторинг на безжичната локална мрежа
++Comment[bn]=একটি ওয়্যারলেস ল্যান সংযোগ মনিটর
+ Comment[bs]=Nadzor bežične LAN konekcije
+ Comment[ca]=Un monitor per a connexions LAN sense fils
+ Comment[cs]=Monitor bezdrátového připojení
+@@ -51,6 +52,7 @@
+ Terminal=false
+ Name=KWiFiManager
+ Name[ar]=إدارة KWiFi
++Name[bn]=কে-ওয়াইফাই-ম্যানেজার
+ Name[cs]=Správce WIFI
+ Name[cy]=KRheolyddDiWi
+ Name[de]=KWiFi-Verwaltung
+@@ -64,6 +66,7 @@
+ GenericName=Wireless LAN Manager
+ GenericName[ar]=إدارة الشبكة المحلية اللاسلكية
+ GenericName[bg]=Безжична мрежа
++GenericName[bn]=ওয়্যারলেস ল্যান ম্যানেজার
+ GenericName[br]=Merour ar rouedad hep neud
+ GenericName[bs]=Upravitelj bežčnim LANom
+ GenericName[ca]=Gestor LAN sense fils
+--- kfile-plugins/torrent/kfile_torrent.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kfile-plugins/torrent/kfile_torrent.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ Type=Service
+ Name=Bit Torrent Info
++Name[bn]=বিট টোরেন্ট তথ্য
+ Name[br]=Titouriñ diwar-benn Bit Torrent
+ Name[ca]=Informació de Bit Torrent
+ Name[cs]=Bit Torrent informace
+--- kppp/pppstats.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kppp/pppstats.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -229,8 +229,7 @@
+ local_ip_address = "";
+ kdDebug(5002) << "Local IP: " << local_ip_address << endl;
+
+- if (ioctl(s, SIOCGIFDSTADDR, &ifr) < 0)
+- ;
++ (void) ioctl(s, SIOCGIFDSTADDR, &ifr);
+
+ sinp = (struct sockaddr_in*)&ifr.ifr_dstaddr;
+
+--- kppp/Kppp.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kppp/Kppp.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -2,6 +2,7 @@
+ Encoding=UTF-8
+ GenericName=Internet Dial-Up Tool
+ GenericName[bg]=Включване в Интернет
++GenericName[bn]=ইন্টারনেট ডায়াল-আপ সরঞ্জাম
+ GenericName[bs]=Program za spajanje na Internet
+ GenericName[ca]=Eina per a la connexió telefònica a Internet
+ GenericName[cs]=Připojení přes vytáčenou linku
+@@ -42,6 +43,7 @@
+ GenericName[zh_HK]=互聯網撥號工具
+ Name=KPPP
+ Name[af]=Kppp
++Name[bn]=কে-পি-পি-পি
+ Name[eo]=Interretkonektilo
+ Name[hi]=केपीपीपी
+ Name[sv]=Kppp
+--- kppp/logview/kppplogview.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kppp/logview/kppplogview.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ Name=KPPPLogview
++Name[bn]=কে-পি-পি-পি লগভিউ
+ Name[de]=KPPP-Protokoll-Betrachter
+ Name[el]=Προβολή καταγραφής KPPP
+ Name[is]=KPPP annálaskoðari
+@@ -14,6 +15,7 @@
+ Name[tr]=KPPP Kayıt Görüntüleyici
+ GenericName=Internet Dial-Up Tool Log Viewer
+ GenericName[bg]=Преглед на журнала на KPPP
++GenericName[bn]=ইন্টারনেট ডায়াল-আপ সরঞ্জাম কার্যবিবরণী প্রদর্শক
+ GenericName[ca]=Visor de la bitàcola de l'eina de connexió telefònica a Internet
+ GenericName[cs]=Prohlížeč záznamů připojení přes vytáčenou linku
+ GenericName[da]=Internet-opkaldsværktøj-logviser
+--- kppp/logview/loginfo.h (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kppp/logview/loginfo.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -40,9 +40,9 @@
+ QString currency() const;
+ double sessionCosts() const;
+ double totalCosts() const;
+- int bytesIn() const;
+- int bytesOut() const;
+- int bytes() const;
++ double bytesIn() const;
++ double bytesOut() const;
++ double bytes() const;
+
+ #ifdef MYDEBUG
+ void dump();
+@@ -56,7 +56,7 @@
+ time_t _from, _until;
+ QString _conname, _currency;
+ double _session_cost, _total_cost;
+- int _bytes_in, _bytes_out;
++ double _bytes_in, _bytes_out;
+ };
+
+
+--- kppp/logview/monthly.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kppp/logview/monthly.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -34,7 +34,7 @@
+ #include "export.h"
+ #include <qstringlist.h>
+
+-static void formatBytes(int bytes, QString &result) {
++static void formatBytes(double bytes, QString &result) {
+ if(bytes < 1024)
+ result.setNum(bytes);
+ else if(bytes < 1024*1024)
+@@ -43,7 +43,7 @@
+ result = i18n("%1 MB").arg(KGlobal::locale()->formatNumber((float)bytes / 1024.0 / 1024.0, 1));
+ }
+
+-static void formatBytesMonth(int bytes, QString &result) {
++static void formatBytesMonth(double bytes, QString &result) {
+
+ int day, days;
+ day = QDate::currentDate().day();
+@@ -158,10 +158,10 @@
+ k.sprintf("%012.2f", li->sessionCosts());
+ break;
+ case 6:
+- k.sprintf("%012d", li->bytesIn());
++ k.sprintf("%012f", li->bytesIn());
+ break;
+ case 7:
+- k.sprintf("%012d", li->bytesOut());
++ k.sprintf("%012f", li->bytesOut());
+ break;
+ }
+ return k;
+@@ -286,7 +286,7 @@
+ // for collecting monthly statistics
+ int count = 0;
+ double costs = 0;
+- int bin = 0, bout = 0;
++ double bin = 0, bout = 0;
+ int duration = 0;
+ lv->clear();
+ selectionItem = 0L;
+@@ -501,7 +501,7 @@
+ // for collecting monthly statistics
+ int count = 0;
+ double costs = 0;
+- int bin = 0, bout = 0;
++ double bin = 0, bout = 0;
+ int duration = 0;
+
+ for(int i = 0; i < (int)logList.count(); i++) {
+@@ -662,7 +662,7 @@
+ {
+ int count = 0;
+ double costs = 0;
+- int bin = 0, bout = 0;
++ double bin = 0, bout = 0;
+ int duration = 0;
+ LogListItem *item;
+ LogInfo *li;
+--- kppp/logview/loginfo.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ kppp/logview/loginfo.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -65,15 +65,15 @@
+ return _total_cost;
+ }
+
+-int LogInfo::bytesIn() const {
++double LogInfo::bytesIn() const {
+ return _bytes_in;
+ }
+
+-int LogInfo::bytesOut() const {
++double LogInfo::bytesOut() const {
+ return _bytes_out;
+ }
+
+-int LogInfo::bytes() const {
++double LogInfo::bytes() const {
+ if(bytesIn() == -1 || bytesOut() == -1)
+ return -1;
+ else
+--- ktalkd/kcmktalkd/kcmktalkd.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ktalkd/kcmktalkd/kcmktalkd.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -14,6 +14,7 @@
+ Name[ar]=تحادث عبر الشبكة المحلية
+ Name[be]=Гутарка па лякальнай сетцы
+ Name[bg]=Разговор в локална мрежа
++Name[bn]=স্থানীয় নেটওয়ার্ক চ্যাট
+ Name[bs]=Chat u lokalnoj mreži
+ Name[ca]=Xat de la xarxa local
+ Name[cs]=Rozhovor v lokální síti
+@@ -70,6 +71,7 @@
+ Comment[ar]=اعدادات مراقب Talh
+ Comment[az]=Talk quraşdırması
+ Comment[bg]=Настройки на демона за разговор в локална мрежа
++Comment[bn]=টক(Talk) ডিমন কনফিগারেশন
+ Comment[bs]=Podešavanje Talk demona
+ Comment[ca]=Configuració del dimoni talk
+ Comment[cs]=Nastavení talk démona
+--- ktalkd/ktalkd/talkd.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ktalkd/ktalkd/talkd.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -334,7 +334,7 @@
+
+ if (Options.answmach && (ret_value>=PROC_REQ_MIN_A))
+ {
+- debug("Launch answer machine, mode %d.", ret_value);
++ ktalk_debug("Launch answer machine, mode %d.", ret_value);
+ AnswMachine::launchAnswMach(*mp, ret_value);
+ new_process();
+ }
+--- ktalkd/ktalkd/repairs.c (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ktalkd/ktalkd/repairs.c (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -140,7 +140,7 @@
+ struct otalk_packet otp;
+ CTL_MSG m;
+
+- debug("Probing for QUIRK_OTALK\n");
++ ktalk_debug("Probing for QUIRK_OTALK\n");
+
+ if (sizeof(otp)!=OTALK_PACKET_SIZE) {
+ syslog(LOG_ERR, "QUIRK_OTALK: struct otalk_packet padding "
+@@ -149,25 +149,25 @@
+ }
+
+ if (len!=sizeof(otp)) {
+- debug("QUIRK_OTALK: wrong size\n");
++ ktalk_debug("QUIRK_OTALK: wrong size\n");
+ return -1;
+ }
+
+ memcpy(&otp, buf, len);
+ if (probe_string(otp.l_name, sizeof(otp.l_name))) {
+- debug("QUIRK_OTALK: l_name not a string\n");
++ ktalk_debug("QUIRK_OTALK: l_name not a string\n");
+ return -1;
+ }
+ if (probe_string(otp.r_name, sizeof(otp.r_name))) {
+- debug("QUIRK_OTALK: r_name not a string\n");
++ ktalk_debug("QUIRK_OTALK: r_name not a string\n");
+ return -1;
+ }
+ if (probe_string(otp.r_tty, sizeof(otp.r_tty))) {
+- debug("QUIRK_OTALK: r_tty not a string\n");
++ ktalk_debug("QUIRK_OTALK: r_tty not a string\n");
+ return -1;
+ }
+ if (probe_addr(&otp.ctl_addr, sn)) {
+- debug("QUIRK_OTALK: addresses do not match\n");
++ ktalk_debug("QUIRK_OTALK: addresses do not match\n");
+ return -1;
+ }
+
+@@ -182,7 +182,7 @@
+ case OLD_AUTO_LOOK_UP: otp.type = LOOK_UP; break;
+ case OLD_AUTO_DELETE: otp.type = DELETE; break;
+ default:
+- debug("QUIRK_OTALK: invalid type field\n");
++ ktalk_debug("QUIRK_OTALK: invalid type field\n");
+ return -1;
+ }
+
+@@ -253,10 +253,10 @@
+ return 0;
+ }
+
+- debug("Malformed packet (length %u)\n", len);
++ ktalk_debug("Malformed packet (length %u)\n", len);
+
+ if (probe_otalk_packet(buf, len, mlen, sn)==0) {
+- debug("Using QUIRK_OTALK\n");
++ ktalk_debug("Using QUIRK_OTALK\n");
+ return QUIRK_OTALK;
+ }
+ return -1;
+--- ktalkd/ktalkd/machines/answmach.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ktalkd/ktalkd/machines/answmach.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -99,8 +99,8 @@
+ int launchIt = 1;
+ if (usercfg) {
+ read_bool_user_config(key,&launchIt);
+- if (launchIt==0)
+- debug("Not launched. Option set to 0 : ", key);
++ /* if (launchIt==0)
++ debug("Not launched. Option set to 0 : ", key);*/
+ }
+ return launchIt;
+ }
+@@ -204,11 +204,11 @@
+ /* try from user config file, otherwise default : */
+ emptymail = 1;
+
+- debug("Connection established");
++ /* debug("Connection established"); */
+
+ if (usercfg) {
+ if (!read_user_config("Msg1",customline,S_CFGLINE-1))
+- { debug("Error reading Msg1"); end_user_config(); usercfg=0; }
++ { /* debug("Error reading Msg1");*/ end_user_config(); usercfg=0; }
+ }
+
+ /* No user-config'ed banner */
+@@ -356,7 +356,7 @@
+ /* There is data on sockt */
+ nb = read(talkconn->get_sockt(), buff, sizeof buff);
+ if (nb <= 0) {
+- debug("Connection closed. Exiting");
++ /* debug("Connection closed. Exiting"); */
+ break;
+ }
+ something = 1;
+--- ktalkd/ktalkd/machines/forwmach.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ktalkd/ktalkd/machines/forwmach.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -84,8 +84,8 @@
+
+ // Get answerer machine address and username
+ if (getNames(forward)) {
+- debug("-- Talking to %s",answ_user);
+- debug("-- On %s",answ_machine_name);
++ ktalk_debug("-- Talking to %s",answ_user);
++ ktalk_debug("-- On %s",answ_machine_name);
+ // Create a new talk connection, to the answerer ...
+ tcAnsw = new TalkConnection(answ_machine_addr,
+ answ_user,
+@@ -210,14 +210,16 @@
+ /** FWT : This is the method in which we take the connection to both
+ * clients and send each character received from one side to the other
+ * side. This allows to pass a firewall for instance. */
+- debug("-- connect_FWT : Waiting for connection from Answerer (%s)", answ_user);
++ /* debug("-- connect_FWT : Waiting for connection from Answerer (%s)", answ_user); */
+ if (tcAnsw->accept())
+ {
+- debug("-- connect_FWT : Trying to connect to Caller (%s)",caller_username);
++ /* debug("-- connect_FWT : Trying to connect to Caller (%s)",caller_username); */
+ if (tcCaller->connect())
+ {
++ /*
+ debug("-- connect_FWT : Connected to caller (%s)", caller_username);
+- debug("-- connect_FWT : Connected to both. Let's go");
++ debug("-- connect_FWT : Connected to both. Let's go");
++ */
+ int socktC = tcCaller->get_sockt();
+ int socktA = tcAnsw->get_sockt();
+ int max_sockt = (socktC>socktA) ? socktC : socktA;
+@@ -256,7 +258,7 @@
+ // i18n() missing
+ sprintf((char *)buf, "Speaking to %s@%s\n", caller_username, hp->h_name);
+ write(socktA, (char *)buf, strlen((char *)buf));
+- } else debug("-- ERROR : Unable to resolve caller_machine_addr !");
++ } else ktalk_debug("-- ERROR : Unable to resolve caller_machine_addr !");
+ }
+ }
+ } // for
+@@ -285,10 +287,10 @@
+ if ((pid=fork())==0) // store pid in the parent
+ {
+ // Send announce to the answerer, and wait for response
+- debug("-------------- ForwMachine : sending ANNOUNCE to %s",answ_user);
++ ktalk_debug("-------------- ForwMachine : sending ANNOUNCE to %s",answ_user);
+ tcAnsw->ctl_transact(ANNOUNCE, caller_id_num);
+ // Copy answer and id_num from the response struct
+- debug("-------------- ForwMachine : got a response");
++ ktalk_debug("-------------- ForwMachine : got a response");
+ NEW_CTL_RESPONSE rp; // build our response struct
+ tcAnsw->getResponseItems(&rp.answer, &answ_id_num, 0L);
+ // answ_id_num stores id_num for delete.
+@@ -296,7 +298,7 @@
+ rp.vers = TALK_VERSION;
+ rp.id_num = htonl(our_id_num);
+
+- debug("Storing response id_num %d",answ_id_num);
++ ktalk_debug("Storing response id_num %d",answ_id_num);
+ // Now send the response to the caller
+ print_response("-- => response (processAnnounce)", &rp);
+ sendResponse(caller_ctl_addr, &rp);
+@@ -305,13 +307,13 @@
+ // store static ref to this forwmachine in this child.
+ pForwMachine = this;
+ // register signal hander
+- if (signal(SIGDELETE,&sig_handler)==SIG_ERR) debug("ERROR for SIGUSR2");
+- debug("Signal handler registered. Waiting...");
++ if (signal(SIGDELETE,&sig_handler)==SIG_ERR) ktalk_debug("ERROR for SIGUSR2");
++ ktalk_debug("Signal handler registered. Waiting...");
+ // infinite loop waiting for signals
+ while(1)
+ sleep(100);
+ }
+- debug("Forwmachine started for Announce (now) and Delete (later). pid : %d",pid);
++ ktalk_debug("Forwmachine started for Announce (now) and Delete (later). pid : %d",pid);
+ // new_process(); // We DON'T register new process.
+ // in case of re-announce, this forwmach will be forgotten.
+ // we don't want ktalkd to wait infinitely for it to die, it won't.
+@@ -323,7 +325,7 @@
+ {
+ if (fork()==0)
+ { // here we are the child
+- debug("------------- Got LOOKUP : send it to caller (%s)", caller_username);
++ ktalk_debug("------------- Got LOOKUP : send it to caller (%s)", caller_username);
+ // Let's send a LOOK_UP on caller's machine, to make sure he still
+ // wants to speak to the callee...
+ TalkConnection * tcCaller = new TalkConnection(caller_machine_addr,
+@@ -334,7 +336,7 @@
+ tcCaller->look_for_invite(0/*no error if no invite*/);
+ NEW_CTL_RESPONSE rp;
+ tcCaller->getResponseItems(&rp.answer, &rp.id_num, &rp.addr);
+- debug("------------- Done. Forward response to answerer");
++ ktalk_debug("------------- Done. Forward response to answerer");
+
+ rp.type = LOOK_UP;
+ rp.vers = mp->vers;
+@@ -372,8 +374,8 @@
+ void ForwMachine::processDelete()
+ {
+ // Send DELETE to the answerer, and don't wait for response
+- debug("-------------- ForwMachine : sending DELETE to %s",answ_user);
+- debug("Using resp->id_num %d",answ_id_num);
++ ktalk_debug("-------------- ForwMachine : sending DELETE to %s",answ_user);
++ ktalk_debug("Using resp->id_num %d",answ_id_num);
+ tcAnsw->ctl_transact(DELETE, answ_id_num);
+ _exit(0); // We exit the child, we have finished.
+ }
+@@ -386,14 +388,14 @@
+ * After a cast to (ForwMachine *), the fwm entries allows us to
+ * speak to currently availabe ForwMachines, to handle correctly
+ * this LOOK_UP */
+- debug("-- forwMachProcessLookup(mp,rp)");
++ ktalk_debug("-- forwMachProcessLookup(mp,rp)");
+ TABLE_ENTRY *ptr;
+ for (ptr = table; ptr != 0L; ptr = ptr->next) {
+ if (ptr->fwm != 0L)
+ {
+ ForwMachine * fwm = (ForwMachine *) ptr->fwm;
+ if (fwm->isLookupForMe(mp)) {
+- debug("-- Found match : id %d", ptr->request.id_num);
++ ktalk_debug("-- Found match : id %d", ptr->request.id_num);
+ fwm->processLookup(mp);
+ return 1;
+ }
+@@ -407,7 +409,7 @@
+ * Then set callee to the initial callee, to display in ktalkdlg */
+ char * ForwMachine::forwMachFindMatch(TABLE_ENTRY * table, NEW_CTL_MSG * mp)
+ {
+- debug("-- forwMachFindMatch(mp)");
++ ktalk_debug("-- forwMachFindMatch(mp)");
+ TABLE_ENTRY *ptr;
+ char * callee;
+ for (ptr = table; ptr != 0L; ptr = ptr->next) {
+@@ -416,7 +418,7 @@
+ ForwMachine * fwm = (ForwMachine *) ptr->fwm;
+ callee = fwm->findMatch(mp);
+ if (callee) {
+- debug("-- Found match : id %d", ptr->request.id_num);
++ ktalk_debug("-- Found match : id %d", ptr->request.id_num);
+ return callee;
+ }
+ }
+@@ -426,7 +428,7 @@
+
+ void sig_handler(int signum)
+ {
+- debug("SIGNAL received : %d",signum);
++ ktalk_debug("SIGNAL received : %d",signum);
+ ForwMachine * fwm = ForwMachine::getForwMachine();
+ fwm->processDelete();
+ }
+--- ktalkd/ktalkd/machines/talkconn.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ktalkd/ktalkd/machines/talkconn.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -194,7 +194,7 @@
+ client.sin_addr.s_addr != htonl (INADDR_ANY))
+ {
+ *result = client.sin_addr;
+- debug("Found reply address");
++ ktalk_debug("Found reply address");
+ ::close (testsock);
+ break;
+ }
+@@ -202,7 +202,7 @@
+ }
+ if (i == 2) {
+ *result = defaultReplyAddr;
+- debug("Couldn't find reply address, using default");
++ ktalk_debug("Couldn't find reply address, using default");
+ }
+ if (Options.debug_mode) {
+ help1 = (unsigned char *) &destination;
+@@ -221,7 +221,7 @@
+ * @return 1 if succeeded to find at least 1 protocol */
+ void TalkConnection::findProtocol() {
+
+- debug("Remote protocol unknown. Trying to find it. findProtocol()");
++ ktalk_debug("Remote protocol unknown. Trying to find it. findProtocol()");
+ /* The existing ctl_sockt will be used for ntalk */
+ int new_socket = ctl_sockt;
+ /* We need a new SOCK_DGRAM socket for otalk */
+@@ -263,7 +263,7 @@
+
+ for (int retry = 0; (retry < 3) && (protocol==noProtocol); retry ++)
+ {
+- debug("Send packets. Retry = %d",retry);
++ ktalk_debug("Send packets. Retry = %d",retry);
+ /* Send the messages */
+ daemon.sin_port = ntalkDaemonPort;
+ int len = sendto (new_socket, (char *) &new_msg, sizeof new_msg, 0,
+@@ -289,11 +289,11 @@
+ // Timeout. Let's exit this loop and retry sending.
+ break;
+ }
+- if (nready == 0) debug("select returned 0 ! ");
++ if (nready == 0) ktalk_debug("select returned 0 ! ");
+
+ /* Analyze response */
+ if (FD_ISSET(old_socket, &read_mask)) {
+- debug("Reading on old_socket");
++ ktalk_debug("Reading on old_socket");
+ cc = ::recv(old_socket, (char *)&old_resp, sizeof (old_resp), 0);
+ if (cc < 0) {
+ if (errno == EINTR)
+@@ -303,7 +303,7 @@
+ if (old_resp.type == LOOK_UP) protocol=talkProtocol; // FOUND
+ }
+ if (FD_ISSET(new_socket, &read_mask)) {
+- debug("Reading on new_socket");
++ ktalk_debug("Reading on new_socket");
+ cc = ::recv(new_socket, (char *)&new_resp, sizeof (new_resp), 0);
+ if (cc < 0) {
+ if (errno == EINTR)
+@@ -323,9 +323,9 @@
+ /* restore old.ctl_addr */
+ old_msg.ctl_addr = new_msg.ctl_addr;
+ ::close(old_socket);
+- debug("Exiting findProtocol");
+- if (protocol==ntalkProtocol) debug("Exiting findProtocol with protocol = NTALK");
+- else if (protocol==talkProtocol) debug("Exiting findProtocol with protocol = NTALK");
++ ktalk_debug("Exiting findProtocol");
++ if (protocol==ntalkProtocol) ktalk_debug("Exiting findProtocol with protocol = NTALK");
++ else if (protocol==talkProtocol) ktalk_debug("Exiting findProtocol with protocol = NTALK");
+ else p_error("FATAL : no protocol found.");
+ }
+
+@@ -412,7 +412,7 @@
+ continue;
+ p_error("Error waiting for daemon response");
+ }
+- if (nready == 0) debug("select returned 0 ! ");
++ if (nready == 0) ktalk_debug("select returned 0 ! ");
+ } while (nready == 0);
+ /*
+ * Keep reading while there are queued messages
+@@ -464,14 +464,14 @@
+ case SUCCESS:
+ new_msg.id_num = htonl(id_num);
+ old_msg.id_num = htonl(id_num);
+- debug("TalkConnection::look_for_invite : got SUCCESS");
++ ktalk_debug("TalkConnection::look_for_invite : got SUCCESS");
+ if (lookup_addr.ta_family != AF_INET)
+ p_error("Response uses invalid network address");
+ return (1);
+
+ default:
+ /* there wasn't an invitation waiting for us */
+- debug("TalkConnection::look_for_invite : didn't get SUCCESS");
++ ktalk_debug("TalkConnection::look_for_invite : didn't get SUCCESS");
+ return (0);
+ }
+ }
+@@ -500,7 +500,7 @@
+ /** Connect to another talk client. */
+ int TalkConnection::connect()
+ {
+- debug("Waiting to connect");
++ ktalk_debug("Waiting to connect");
+ do {
+ errno = 0;
+ if (::connect(sockt, (const sockaddr *)(&lookup_addr), sizeof (struct talk_addr)) != -1)
+@@ -513,7 +513,7 @@
+ * invitation. (We know there are no newer invitations,
+ * the talkd works LIFO.)
+ */
+- debug("ECONNREFUSED");
++ ktalk_debug("ECONNREFUSED");
+ ctl_transact(DELETE, 0);
+ close_sockets();
+ return 0;
+--- ktalkd/ktalkd/announce.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ktalkd/ktalkd/announce.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -217,7 +217,7 @@
+ {
+ syslog(LOG_DEBUG, "Trying to run '%s' at '%s' as '%s'", extprg,
+ getenv("DISPLAY"), request->r_name );
+- if (callee) debug("With mention of callee : %s",callee);
++ if (callee) ktalk_debug("With mention of callee : %s",callee);
+ }
+ /*
+ * point stdout of external program to the pipe
+@@ -257,7 +257,7 @@
+ * does this work on systems other than BSD&Linux??
+ */
+ if (fcntl(readPipe[0], F_SETFL, O_NONBLOCK)== -1)
+- debug("Failed to make pipe non-blocking!!");
++ ktalk_debug("Failed to make pipe non-blocking!!");
+
+ /* Stop this loop when:
+ * the child exited with a value > 0 AND the pipe is empty
+@@ -280,9 +280,9 @@
+ * 42 is: failure to start external program.
+ */
+ if (Xannounceok == 1) {
+- debug("OK - Child process responded");
++ ktalk_debug("OK - Child process responded");
+ } else
+- debug("External program failed with exit status: %i", WEXITSTATUS(status));
++ ktalk_debug("External program failed with exit status: %i", WEXITSTATUS(status));
+
+ // close the pipes: (is this necessary?):
+ close( readPipe[0] );
+@@ -303,7 +303,7 @@
+ // addition to X announce
+ if ((request->r_tty[0]!='\0') && ((int)request->r_tty[3]<(int)'f')) {
+ // Not a pseudo terminal (such as an xterm, ...)
+- debug("Doing also text announce on %s",request->r_tty);
++ ktalk_debug("Doing also text announce on %s",request->r_tty);
+ print_std_mesg(request, remote_machine, usercfg, 1 /*force no sound*/);
+ }
+ #endif
+@@ -442,13 +442,13 @@
+ because the father will close the file soon !! */
+ if ((!usercfg) || (!read_user_config("SoundPlayer",sSoundPlayer,S_CFGLINE)))
+ strcpy(sSoundPlayer,Options.soundplayer);
+- debug(sSoundPlayer);
++ ktalk_debug(sSoundPlayer);
+ if ((!usercfg) || (!read_user_config("SoundPlayerOpt",sSoundPlayerOpt,S_CFGLINE)))
+ strcpy(sSoundPlayerOpt,Options.soundplayeropt);
+- debug(sSoundPlayerOpt);
++ ktalk_debug(sSoundPlayerOpt);
+ if ((!usercfg) || (!read_user_config("SoundFile",sSoundFile,S_CFGLINE)))
+ strcpy(sSoundFile,Options.soundfile);
+- debug(sSoundFile);
++ ktalk_debug(sSoundFile);
+
+ if ((pid = fork())) {
+ /* we are the parent, so wait for the child */
+@@ -470,7 +470,7 @@
+ else
+ returncode = execl(sSoundPlayer,sSoundPlayer/*arg0*/,sSoundFile, (void *)0);
+
+- debug(strerror(errno));
++ ktalk_debug(strerror(errno));
+ syslog(LOG_ERR,"ERROR PLAYING SOUND FILE !!!");
+ syslog(LOG_ERR, "%s,%s,%s",sSoundPlayer,sSoundFile,sSoundPlayerOpt);
+ syslog(LOG_ERR,"RETURN-CODE : %d",returncode);
+@@ -490,7 +490,7 @@
+ if ((!usercfg) || (!read_bool_user_config("Sound",&bSound)))
+ bSound=Options.sound;
+
+- debug("Sound option in sound_or_beep : %d",bSound);
++ ktalk_debug("Sound option in sound_or_beep : %d",bSound);
+
+ if (bSound)
+ {
+--- ktalkd/ktalkd/proto.h (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ktalkd/ktalkd/proto.h (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -48,7 +48,7 @@
+ void print_request(const char *cp, const CTL_MSG *mp);
+ void print_response(const char *cp, const CTL_RESPONSE *rp);
+ void print_broken_packet(const char *pack, size_t len, struct sockaddr_in *);
+-void debug(const char *fmt, ...);
++void ktalk_debug(const char *fmt, ...);
+ void set_debug(int logging, int badpackets);
+
+ /* table.c */
+--- ktalkd/ktalkd/process.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ktalkd/ktalkd/process.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -184,7 +184,7 @@
+ if ((ptr != NULL) && (
+ (mp->id_num <= ptr->id_num) || (mp->id_num == (uint32_t)~0x0L))) {
+ /* a duplicated request, so ignore it */
+- debug("dupannounce %d", mp->id_num);
++ ktalk_debug("dupannounce %d", mp->id_num);
+ rp->id_num = htonl(ptr->id_num);
+ rp->answer = SUCCESS;
+ return PROC_REQ_ERR;
+@@ -212,15 +212,15 @@
+ result = find_user(mp->r_name, tty, disp);
+ strlcpy( mp->r_tty, tty, sizeof( mp->r_tty ));
+
+- debug("find_user : result = %d",result);
++ ktalk_debug("find_user : result = %d",result);
+
+ if (result != SUCCESS) {
+- debug("Couldn t find user ...");
++ ktalk_debug("Couldn t find user ...");
+ if (result == NOT_HERE)
+ { /* Not here ? -> Start answering machine ! */
+ if (getpwnam(mp->r_name)) /* Does the user exist ? */
+ { /* Yes ! -> SUCCESS. */
+- debug("Not logged.");
++ ktalk_debug("Not logged.");
+ rp->answer = SUCCESS;
+ endpwent();
+ return PROC_REQ_ANSWMACH_NOT_LOGGED; /* answer machine. */
+@@ -234,15 +234,15 @@
+
+ switch (Options.NEU_behaviour) {
+ case 2: /* Paranoid setting. Do nothing. */
+- debug("Paranoid setting. Do nothing.");
++ ktalk_debug("Paranoid setting. Do nothing.");
+ rp->answer = NOT_HERE;
+ return PROC_REQ_ERR;
+ case 0: /* Launch answering machine. */
+- debug("Not here.");
++ ktalk_debug("Not here.");
+ rp->answer = SUCCESS;
+ return PROC_REQ_ANSWMACH_NOT_HERE;
+ case 1: /* NEU_user will take the talk. */
+- debug("Not here. I ll take the talk.");
++ ktalk_debug("Not here. I ll take the talk.");
+ fwm = new ForwMachine(mp, Options.NEU_user,
+ Options.NEU_forwardmethod, mp->id_num);
+ /* store in table, because we'll receive the LOOK_UP */
+@@ -253,7 +253,7 @@
+ } /* getpwnam */
+ } /* result */
+ else {
+- debug("not SUCCESS, nor NOT_HERE");
++ ktalk_debug("not SUCCESS, nor NOT_HERE");
+ rp->answer = result; /* not SUCCESS, nor NOT_HERE*/
+ return PROC_REQ_ERR;
+ }
+@@ -267,7 +267,7 @@
+ if (ptr == (NEW_CTL_MSG *) 0) { /* Not already in the table => announce */
+ rp->answer = announce(mp, theirhost, disp, usercfg, callee);
+ if (rp->answer == PERMISSION_DENIED) return PROC_REQ_ERR;
+- debug("Announce done.");
++ ktalk_debug("Announce done.");
+ return PROC_REQ_OK;
+ } else {
+ /* This is an explicit re-announce, so update the id_num
+--- ktalkd/ktalkd/find_user.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ktalkd/ktalkd/find_user.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -74,7 +74,7 @@
+
+ std::ifstream ifstr(buf);
+ if (ifstr.fail()) return 0;
+- /* debug("reading %s...", fname); */
++ /* ktalk_debug("reading %s...", fname); */
+
+ char * dpy = 0;
+ while (!ifstr.eof()) {
+@@ -91,7 +91,7 @@
+ dpy = new char[ l+2 ];
+ strcpy(dpy," ");
+ strcat(dpy, buf + 8); /* returns " "+dpy */
+- /* debug("- %s",dpy); */
++ /* ktalk_debug("- %s",dpy); */
+ }
+ break;
+ }
+@@ -137,9 +137,9 @@
+ errno=0;
+ return 1;
+ }
+- /* else debug("st_uid=%d", statbuf.st_uid); */
+- } /* else debug("st_mode=%d", statbuf.st_mode); */
+- } else debug("stat error : %s", strerror(errno));
++ /* else ktalk_debug("st_uid=%d", statbuf.st_uid); */
++ } /* else ktalk_debug("st_mode=%d", statbuf.st_mode); */
++ } else ktalk_debug("stat error : %s", strerror(errno));
+ }
+
+ errno=0;
+@@ -164,7 +164,7 @@
+ struct dirent **namelist;
+
+ struct passwd * pw = getpwnam(name);
+- debug("find_X_process");
++ ktalk_debug("find_X_process");
+ /* find uid */
+ if ((pw) && ((user_uid=pw->pw_uid)>10))
+ { /* uid<10 : no X detection because any suid program will be taken
+@@ -172,7 +172,7 @@
+ /* scan /proc */
+ int n = scandir("/proc", &namelist, select_process, 0 /*no sort*/);
+ if (n < 0)
+- debug("scandir: %s", strerror(errno));
++ ktalk_debug("scandir: %s", strerror(errno));
+ else
+ while(n--)
+ {
+@@ -264,7 +264,7 @@
+ strcpy(ntty, ubuf->ut_line);
+ if (stat(ftty, &statb) != 0 || (!(statb.st_mode & 020)))
+ {
+- debug("Permission denied on %s", ntty);
++ ktalk_debug("Permission denied on %s", ntty);
+ continue; /* not a char dev */
+ }
+
+@@ -320,18 +320,18 @@
+ }
+ endutent();
+
+- debug("End of Utmp reading");
++ ktalk_debug("End of Utmp reading");
+ #if defined(HAVE_KDE) && defined(ALL_PROCESSES_AND_PROC_FIND_USER)
+ if (Options.XAnnounce && prio < PRIO_DISPLAY)
+ if (find_X_process(name, dispFound))
+- { debug(dispFound); status=SUCCESS; }
++ { ktalk_debug(dispFound); status=SUCCESS; }
+ #endif
+ if (status == SUCCESS) {
+ (void) strcpy(tty, ttyFound);
+ (void) strcpy(disp, dispFound);
+ if (Options.debug_mode)
+ syslog(LOG_DEBUG, "Returning tty '%s', display '%s'", ttyFound, dispFound);
+- } else debug("Returning status %d",status);
++ } else ktalk_debug("Returning status %d",status);
+ return (status);
+ }
+
+--- ktalkd/ktalkd/readcfg++.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ktalkd/ktalkd/readcfg++.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -95,12 +95,12 @@
+ setenv("HOME",pw->pw_dir,1 /* overwrite */);
+ unsetenv("KDEHOME");
+ unsetenv("XAUTHORITY");
+-debug("%s",pw->pw_dir);
++ktalk_debug("%s",pw->pw_dir);
+ KInstance tmpInstance("tmpInstance");
+ cfgFileName = locateLocal("config", "ktalkdrc", &tmpInstance );
+ tkannFileName = locateLocal("config", "ktalkannouncerc", &tmpInstance);
+ endpwent();
+-debug("%s","endpwent");
++ktalk_debug("%s","endpwent");
+
+ //WABA: New KConfig should be able to handle this gracefully:
+ if (stat(QFile::encodeName(tkannFileName),&buf)!=-1) {
+@@ -116,12 +116,12 @@
+ ktalkdcfg = new KConfig(cfgFileName);
+ ktalkdcfg -> setGroup("ktalkd");
+ ktalkdcfg -> setDollarExpansion(true);
+- debug("User config file ok");
++ ktalk_debug("User config file ok");
+ } else {
+ ktalkdcfg = 0L;
+- debug("No user config file %s !",cfgFileName.ascii());
++ ktalk_debug("No user config file %s !",cfgFileName.ascii());
+ }
+-debug("%s","done");
++ktalk_debug("%s","done");
+ return ((ktkanncfg != 0L) || (ktalkdcfg != 0L));
+ /* Return true if at least one file exists */
+ }
+@@ -152,7 +152,7 @@
+ }
+ else
+ {
+- debug("User option %s NOT found", key);
++ ktalk_debug("User option %s NOT found", key);
+ return 0;
+ }
+ }
+@@ -197,35 +197,35 @@
+
+ if (found("AnswMach")) {
+ Options.answmach=booleanresult(result.ascii());
+- debug("AnswMach : %d",Options.answmach);}
++ ktalk_debug("AnswMach : %d",Options.answmach);}
+
+ if (found("XAnnounce")) {
+ Options.XAnnounce=booleanresult(result.ascii());
+- debug("XAnnounce : %d",Options.XAnnounce); }
++ ktalk_debug("XAnnounce : %d",Options.XAnnounce); }
+
+ if (found("Time")) {
+ Options.time_before_answmach=result.toInt();
+- debug("Time : %d",Options.time_before_answmach); }
++ ktalk_debug("Time : %d",Options.time_before_answmach); }
+
+ if (found("Sound")) {
+ Options.sound=booleanresult(result.ascii());
+- debug("Sound : %d",Options.sound); }
++ ktalk_debug("Sound : %d",Options.sound); }
+
+ if (found("SoundFile")) {
+ qstrncpy(Options.soundfile,QFile::encodeName(result),S_CFGLINE);
+- debug("SoundFile = %s",Options.soundfile); }
++ ktalk_debug("SoundFile = %s",Options.soundfile); }
+
+ if (found("SoundPlayer")) {
+ qstrncpy(Options.soundplayer,QFile::encodeName(result),S_CFGLINE);
+- debug("SoundPlayer = %s",Options.soundplayer); }
++ ktalk_debug("SoundPlayer = %s",Options.soundplayer); }
+
+ if (found("SoundPlayerOpt")) {
+ qstrncpy(Options.soundplayeropt,QFile::encodeName(result),S_CFGLINE);
+- debug("SoundPlayerOpt = %s",Options.soundplayeropt); }
++ ktalk_debug("SoundPlayerOpt = %s",Options.soundplayeropt); }
+
+ if (found("MailProg")) {
+ qstrncpy(Options.mailprog,QFile::encodeName(result),S_CFGLINE);
+- debug("Mail prog = %s",Options.mailprog); }
++ ktalk_debug("Mail prog = %s",Options.mailprog); }
+
+ /* text based announcement */
+ if (found("Announce1")) { qstrncpy(Options.announce1,result.local8Bit(),S_CFGLINE); }
+@@ -234,27 +234,27 @@
+
+ if (found("NEUUser")) {
+ qstrncpy(Options.NEU_user,result.local8Bit(),S_CFGLINE);
+- debug("NEUUser = %s", Options.NEU_user);
++ ktalk_debug("NEUUser = %s", Options.NEU_user);
+ }
+ if (found("NEUBehaviour")) {
+ Options.NEU_behaviour=result.toInt();
+- debug("NEUBehaviour : %d",Options.NEU_behaviour);
++ ktalk_debug("NEUBehaviour : %d",Options.NEU_behaviour);
+ }
+ if (found("NEUForwardMethod")) {
+ qstrncpy(Options.NEU_forwardmethod,result.ascii(),5);
+- debug("NEUForwardMethod = %s", Options.NEU_forwardmethod);
++ ktalk_debug("NEUForwardMethod = %s", Options.NEU_forwardmethod);
+ }
+
+ if (found("ExtPrg")) {
+ qstrncpy(Options.extprg,QFile::encodeName(result),S_CFGLINE);
+- debug("Ext prg = %s",Options.extprg); }
++ ktalk_debug("Ext prg = %s",Options.extprg); }
+ else { /* has to work even without config file at all */
+ KStandardDirs stddirs;
+ qstrncpy(Options.extprg, QFile::encodeName(stddirs.findResource("exe","ktalkdlg")), S_CFGLINE-1);
+ }
+
+ delete syscfg;
+- debug("End of global configuration");
++ ktalk_debug("End of global configuration");
+ return 1;
+ }
+
+--- ktalkd/ktalkd/table.cpp (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ktalkd/ktalkd/table.cpp (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -70,7 +70,7 @@
+ for (ptr = table; ptr != NIL; ptr = ptr->next) {
+ if ((ptr->time - current_time) > MAX_LIFE) {
+ /* the entry is too old */
+- debug("deleting expired entry : id %d",
++ ktalk_debug("deleting expired entry : id %d",
+ ptr->request.id_num);
+ delete_entry(ptr);
+ continue;
+@@ -79,7 +79,7 @@
+ (strcmp(request->r_name, ptr->request.l_name) == 0) &&
+ (ptr->request.type == LEAVE_INVITE) && (ptr->fwm == 0L))
+ { /* Not the forw. machines : they aren't stored to match LOOK_UPs */
+- debug("Found match : id %d", ptr->request.id_num);
++ ktalk_debug("Found match : id %d", ptr->request.id_num);
+ return (&ptr->request);
+ }
+ }
+@@ -104,7 +104,7 @@
+ for (ptr = table; ptr != NIL; ptr = ptr->next) {
+ if ((ptr->time - current_time) > MAX_LIFE) {
+ /* the entry is too old */
+- debug("deleting expired entry : id %d",
++ ktalk_debug("deleting expired entry : id %d",
+ ptr->request.id_num);
+ delete_entry(ptr);
+ continue;
+@@ -115,7 +115,7 @@
+ request->pid == ptr->request.pid) {
+ /* update the time if we 'touch' it */
+ ptr->time = current_time;
+- debug("Found identical request : id %d", ptr->request.id_num);
++ ktalk_debug("Found identical request : id %d", ptr->request.id_num);
+ return (&ptr->request);
+ }
+ }
+@@ -130,7 +130,7 @@
+ gettimeofday(&tp, &txp);
+ current_time = tp.tv_sec;
+ request->id_num = new_id();
+- debug("Stored as id %d",request->id_num);
++ ktalk_debug("Stored as id %d",request->id_num);
+ if (response != 0L) response->id_num = htonl(request->id_num);
+ /* insert a new entry into the top of the list */
+ ptr = new TABLE_ENTRY;
+@@ -170,7 +170,7 @@
+ register TABLE_ENTRY *ptr;
+
+ ptr = table;
+- debug("delete_invite(%d)", id_num);
++ ktalk_debug("delete_invite(%d)", id_num);
+ for (ptr = table; ptr != NIL; ptr = ptr->next) {
+ if (ptr->request.id_num == id_num)
+ break;
+@@ -179,7 +179,7 @@
+ if (ptr->fwm) {
+ ptr->fwm->sendDelete(); // Calls processDelete() in the child process.
+ }
+- debug("Deleted : id %d", ptr->request.id_num);
++ ktalk_debug("Deleted : id %d", ptr->request.id_num);
+ delete_entry(ptr);
+ return (SUCCESS);
+ }
+@@ -204,14 +204,14 @@
+ {
+ register TABLE_ENTRY *ptr;
+ ptr = table;
+- debug("final_clean()");
++ ktalk_debug("final_clean()");
+ for (ptr = table; ptr != 0L; ptr = ptr->next) {
+ if (ptr->fwm != 0L)
+ {
+- debug("CLEAN : Found a forwarding machine to clean : id %d",ptr->request.id_num);
++ ktalk_debug("CLEAN : Found a forwarding machine to clean : id %d",ptr->request.id_num);
+ delete ptr->fwm;
+ }
+- debug("CLEAN : Deleting id %d", ptr->request.id_num);
++ ktalk_debug("CLEAN : Deleting id %d", ptr->request.id_num);
+ delete_entry(ptr);
+ }
+ }
+--- ktalkd/ktalkd/print.c (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ktalkd/ktalkd/print.c (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -196,7 +196,7 @@
+ }
+
+ void
+-debug(const char *format, ...)
++ktalk_debug(const char *format, ...)
+ {
+ char buf[1024];
+ va_list ap;
+--- ksirc/ksirc.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ksirc/ksirc.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -5,6 +5,7 @@
+ GenericName[ar]=عميل IRC
+ GenericName[be]=Кліент IRC
+ GenericName[bg]=Клиент за IRC
++GenericName[bn]=আই-আর-সি ক্লায়েন্ট
+ GenericName[br]=Kliant IRC
+ GenericName[ca]=Client IRC
+ GenericName[cs]=IRC klient
+@@ -64,6 +65,7 @@
+ SwallowExec=
+ Name=KSirc
+ Name[af]=Ksirc
++Name[bn]=কে-এস-আর-আই-সি
+ Name[eo]=IRC-kliento
+ Name[hi]=के-एसआईआरसी
+ Name[sv]=Ksirc
+--- ksirc/eventsrc (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ ksirc/eventsrc (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -2,6 +2,7 @@
+ IconName=ksirc
+ Comment=KSirc
+ Comment[af]=Ksirc
++Comment[bn]=কে-এস-আর-আই-সি
+ Comment[hi]=के-एसआईआरसी
+ Comment[sv]=Ksirc
+
+@@ -11,6 +12,7 @@
+ Name[ar]=حدث القناة
+ Name[be]=Падзея канала
+ Name[bg]=Има събитие в канала
++Name[bn]=চ্যানেল ঘটনা
+ Name[bs]=Događaj na kanalu
+ Name[ca]=Esdeveniment del canal
+ Name[cs]=Událost v kanálu
+@@ -66,6 +68,7 @@
+ Comment[ar]=IRC حدث قناة
+ Comment[be]=Падзея канала IRC
+ Comment[bg]=Има събитие в канала
++Comment[bn]=আই-আর-সি চ্যানেল ঘটনা
+ Comment[bs]=Događaj na IRC kanalu
+ Comment[ca]=Esdeveniment del canal d'IRC
+ Comment[cs]=Událost IRC kanálu
+@@ -126,6 +129,7 @@
+ Name[ar]=رسالة شخصية في القناة
+ Name[be]=Пэрсанальнае паведамленьне ў канале
+ Name[bg]=Някой спомена псевдонима Ви
++Name[bn]=চ্যানেলে ব্যক্তিগত বার্তা
+ Name[bs]=Lična poruka na kanalu
+ Name[ca]=Missatge personal en el canal
+ Name[cs]=Osobní zpráva v kanálu
+@@ -181,6 +185,7 @@
+ Comment[af]=Iemand genoem jou by op Irc
+ Comment[ar]=شخص ما ذكر اسمك على الايرسي
+ Comment[bg]=Някой спомена псевдонима Ви
++Comment[bn]=কেউ একজন আই-আর-সিতে আপনার ডাকনাম উল্লেখ করল
+ Comment[bs]=Neko je spomenuo vaš nick na IRCu
+ Comment[ca]=Algú a mencionat el vostre sobrenom a l'IRC
+ Comment[cs]=Někdo zmínil vaši přezdívku na IRC
+@@ -238,6 +243,7 @@
+ [BeepReceived]
+ Name=Beep received
+ Name[bg]=Звуков сигнал
++Name[bn]=বিপ গ্রহণ করল
+ Name[ca]=S'ha rebut un bip
+ Name[cs]=Obdrženo pípnutí
+ Name[da]=Lydsignal modtaget
+@@ -270,6 +276,7 @@
+ Name[zh_HK]=收到響聲
+ Comment=A beep has been received from the server
+ Comment[bg]=Пристигна звуков сигнал от сървъра
++Comment[bn]=সার্ভার থেকে একটি বিপ গ্রহণ করা হয়েছে
+ Comment[ca]=S'ha rebut un bip des del servidor
+ Comment[cs]=Bylo obdrženo pípnutí ze serveru
+ Comment[da]=Et lydsignal er modtaget fra serveren.
+--- dcoprss/rssservice.desktop (.../tags/KDE/3.5.1/kdenetwork) (revision 502708)
++++ dcoprss/rssservice.desktop (.../branches/KDE/3.5/kdenetwork) (revision 502708)
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Type=Service
+ Name=rssservice
++Name[bn]=আর-এস-এস সার্ভিস
+ Name[ca]=Servei RSS
+ Name[cs]=RSS služba
+ Name[de]=RSS-Dienst
+@@ -26,6 +27,7 @@
+ Comment=RSS DCOP services
+ Comment[ar]= خدمات RSS DCOP
+ Comment[be]=RSS DCOP сэрвісы
++Comment[bn]=আর-এস-এস ডিকপ সার্ভিস
+ Comment[bs]=RSS DCOP servisi
+ Comment[ca]=Serveis RSS de DCOP
+ Comment[cs]=RSS DCOP služby
Modified: tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/12_kopete_meanwhile.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/12_kopete_meanwhile.diff 2006-01-25 12:47:56 UTC (rev 2983)
+++ tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/12_kopete_meanwhile.diff 2006-01-27 19:04:10 UTC (rev 2988)
@@ -1,56 +1,3 @@
---- kde.orig/kopete/protocols/meanwhile/kopete_meanwhile.desktop
-+++ kde.patched/kopete/protocols/meanwhile/kopete_meanwhile.desktop
-@@ -6,8 +6,8 @@
- ServiceTypes=Kopete/Protocol
- X-KDE-Library=kopete_meanwhile
- X-Kopete-Messaging-Protocol=messaging/meanwhile
--X-KDE-PluginInfo-Author=Sivaram Gottimukkala
--X-KDE-PluginInfo-Email=sivaram at somewhere.net
-+X-KDE-PluginInfo-Author=Jeremy Kerr
-+X-KDE-PluginInfo-Email=jk at ozlabs.org
- X-KDE-PluginInfo-Name=kopete_meanwhile
- X-KDE-PluginInfo-Version=0.0.1
- X-KDE-PluginInfo-Website=http://kopete.kde.org
-@@ -20,38 +20,4 @@
- Name[mk]=Во меѓувреме
- Name[nb]=Imens
- Name[ta]=இடைப்பட்ட பொழுதில்
--Comment=Meanwhile protocol plugin
--Comment[bg]=Протокол за връзка с Meanwhile
--Comment[ca]=Connector de protocol Meanwhile
--Comment[cs]=Modul protokolu Meanwhile
--Comment[da]=Meanwhile-protokol-plugin
--Comment[de]=Meanwhile Protokoll-Modul
--Comment[el]=Πρόσθετο του πρωτοκόλλου Meanwhile
--Comment[es]=Plugin del protocolo de Meanwhile
--Comment[et]=Meanwhile protokolli plugin
--Comment[eu]=Meanwhile protokolo plugin-a
--Comment[fi]=Meanwhile-yhteyskäytäntöliitännäinen
--Comment[fr]=Module du protocole Meanwhile
--Comment[gl]=Plugin para o protocolo Meanwhile
--Comment[he]=תוסף פרוטוקול של Meanwhile
--Comment[hu]=Meanwhile modul
--Comment[is]=Á meðan samskiptureglu íforrit
--Comment[it]=Plugin del protocollo di Meanwhile
--Comment[lt]=Meanwhile protokolo įskiepis
--Comment[nb]=Programtillegg for Imens-protokoll
--Comment[nl]=Procotol voor Meanwhile
--Comment[nn]=Programtillegg for Meanwhile-protokollen
--Comment[pl]=Wtyczka protokołu Meanwhile
--Comment[pt]='Plugin' de protocolo Meanwhile
--Comment[pt_BR]=Plugin para o protocolo Meanwhile
--Comment[ro]=Modul de protocol Meanwhile
--Comment[ru]=Модуль протокола Meanwhile
--Comment[sl]=Vstavek za protokol Meanwhile
--Comment[sr]=Прикључак за протокол Meanwhile
--Comment[sr at Latn]=Priključak za protokol Meanwhile
--Comment[sv]=Meanwhile-protokollinsticksprogram
--Comment[ta]=இடைப்பட்ட நெறிமுறை சொருகுப்பொருள்
--Comment[tr]=Meanwhile iletişim kuralı eklentisi
--Comment[uk]=Втулок протоколу для Meanwhile
--Comment[uz]=Meanwhile учун протокол
--Comment[zh_CN]=Meanwhile 协议插件
-+Comment=Meanwhile (Lotus Sametime) Protocol
--- kde.orig/kopete/protocols/meanwhile/Makefile.am
+++ kde.patched/kopete/protocols/meanwhile/Makefile.am
@@ -5,7 +5,6 @@
@@ -3475,3 +3422,16 @@
# testbed protocol
dnl define the configure option that disables testbed protocol
+--- kde.orig/kopete/protocols/meanwhile/kopete_meanwhile.desktop
++++ kde.patched/kopete/protocols/meanwhile/kopete_meanwhile.desktop
+@@ -6,8 +6,8 @@
+ ServiceTypes=Kopete/Protocol
+ X-KDE-Library=kopete_meanwhile
+ X-Kopete-Messaging-Protocol=messaging/meanwhile
+-X-KDE-PluginInfo-Author=Sivaram Gottimukkala
+-X-KDE-PluginInfo-Email=sivaram at somewhere.net
++X-KDE-PluginInfo-Author=Jeremy Kerr
++X-KDE-PluginInfo-Email=jk at ozlabs.org
+ X-KDE-PluginInfo-Name=kopete_meanwhile
+ X-KDE-PluginInfo-Version=0.0.1
+ X-KDE-PluginInfo-Website=http://kopete.kde.org
Modified: tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/98_buildprep.diff 2006-01-25 12:47:56 UTC (rev 2983)
+++ tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/patches/98_buildprep.diff 2006-01-27 19:04:10 UTC (rev 2988)
@@ -2948,21 +2948,18 @@
--disable-fast-perl disable fast Makefile generation (needs perl)
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
-@@ -1062,9 +1064,10 @@
- toolchain hidden visibility default=no
- --disable-largefile omit support for large files
+@@ -1064,8 +1066,8 @@
--disable-slp don't require libslp (Browsing in krfb and krdc not possible)
-- --enable-smpppd enable support for smpppd
+ --enable-smpppd enable support for the SuSE Meta PPP Daemon (smpppd)
+ (default is NO)
- --enable-sametime-plugin
- build the Kopete Sametime plugin [default=no]
-+ --enable-smpppd enable support for the SuSE Meta PPP Daemon (smpppd)
-+ (default is NO)
+ --disable-meanwhile disable the Kopete Meanwhile plugin (Lotus Sametime
+ support) [default=enabled]
--disable-testbed disable kopete testbed protocol compilation
Optional Packages:
-@@ -1201,7 +1204,7 @@
+@@ -1202,7 +1204,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
@@ -2971,7 +2968,7 @@
done
fi
-@@ -2104,6 +2107,31 @@
+@@ -2105,6 +2107,31 @@
@@ -3003,7 +3000,7 @@
unset CDPATH
-@@ -3037,8 +3065,7 @@
+@@ -3038,8 +3065,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3013,7 +3010,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3096,8 +3123,7 @@
+@@ -3097,8 +3123,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3023,7 +3020,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3213,8 +3239,7 @@
+@@ -3214,8 +3239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3033,7 +3030,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3268,8 +3293,7 @@
+@@ -3269,8 +3293,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3043,7 +3040,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3314,8 +3338,7 @@
+@@ -3315,8 +3338,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3053,7 +3050,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3359,8 +3382,7 @@
+@@ -3360,8 +3382,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3063,7 +3060,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3917,8 +3939,7 @@
+@@ -3918,8 +3939,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3073,7 +3070,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3976,8 +3997,7 @@
+@@ -3977,8 +3997,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3083,7 +3080,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4048,8 +4068,7 @@
+@@ -4049,8 +4068,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3093,7 +3090,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4093,8 +4112,7 @@
+@@ -4094,8 +4112,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3103,7 +3100,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4272,8 +4290,7 @@
+@@ -4273,8 +4290,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3113,7 +3110,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4384,8 +4401,7 @@
+@@ -4385,8 +4401,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3123,7 +3120,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4473,8 +4489,7 @@
+@@ -4474,8 +4489,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3133,7 +3130,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4576,8 +4591,7 @@
+@@ -4577,8 +4591,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3143,7 +3140,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4676,8 +4690,7 @@
+@@ -4677,8 +4690,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3153,7 +3150,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4761,8 +4774,7 @@
+@@ -4762,8 +4774,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3163,7 +3160,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4851,8 +4863,7 @@
+@@ -4852,8 +4863,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3173,7 +3170,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4939,8 +4950,7 @@
+@@ -4940,8 +4950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3183,7 +3180,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5027,8 +5037,7 @@
+@@ -5028,8 +5037,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3193,7 +3190,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5134,8 +5143,7 @@
+@@ -5135,8 +5143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3203,7 +3200,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5222,8 +5230,7 @@
+@@ -5223,8 +5230,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3213,7 +3210,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5310,8 +5317,7 @@
+@@ -5311,8 +5317,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3223,7 +3220,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5398,8 +5404,7 @@
+@@ -5399,8 +5404,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3233,7 +3230,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5530,8 +5535,7 @@
+@@ -5531,8 +5535,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3243,7 +3240,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5619,8 +5623,7 @@
+@@ -5620,8 +5623,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3253,7 +3250,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5707,8 +5710,7 @@
+@@ -5708,8 +5710,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3263,7 +3260,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5795,8 +5797,7 @@
+@@ -5796,8 +5797,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3273,7 +3270,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5883,8 +5884,7 @@
+@@ -5884,8 +5884,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3283,7 +3280,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5971,8 +5971,7 @@
+@@ -5972,8 +5971,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3293,7 +3290,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6395,8 +6394,7 @@
+@@ -6396,8 +6394,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3303,7 +3300,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6522,8 +6520,7 @@
+@@ -6523,8 +6520,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3313,7 +3310,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6611,8 +6608,7 @@
+@@ -6612,8 +6608,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3323,7 +3320,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6695,185 +6691,6 @@
+@@ -6696,185 +6691,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -3509,7 +3506,7 @@
fi
-@@ -7037,7 +6854,7 @@
+@@ -7038,7 +6854,7 @@
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -3518,7 +3515,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7142,7 +6959,7 @@
+@@ -7143,7 +6959,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -3527,7 +3524,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -7176,7 +6993,7 @@
+@@ -7177,7 +6993,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3536,7 +3533,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7206,6 +7023,15 @@
+@@ -7207,6 +7023,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -3552,7 +3549,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7292,44 +7118,36 @@
+@@ -7293,44 +7118,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3607,7 +3604,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7345,7 +7163,7 @@
+@@ -7346,7 +7163,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -3616,7 +3613,7 @@
ia64*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7362,42 +7180,21 @@
+@@ -7363,42 +7180,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -3666,7 +3663,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7416,19 +7213,14 @@
+@@ -7417,19 +7213,14 @@
;;
openbsd*)
@@ -3688,7 +3685,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7438,7 +7230,6 @@
+@@ -7439,7 +7230,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -3696,16 +3693,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7515,7 +7306,7 @@
+@@ -7516,7 +7306,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7518 "configure"' > conftest.$ac_ext
+- echo '#line 7519 "configure"' > conftest.$ac_ext
+ echo '#line 7309 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7558,14 +7349,13 @@
+@@ -7559,14 +7349,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -3722,7 +3719,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7577,7 +7367,6 @@
+@@ -7578,7 +7367,6 @@
esac
;;
*64-bit*)
@@ -3730,7 +3727,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7637,8 +7426,7 @@
+@@ -7638,8 +7426,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3740,7 +3737,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7713,8 +7501,7 @@
+@@ -7714,8 +7501,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3750,7 +3747,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7884,8 +7671,7 @@
+@@ -7885,8 +7671,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3760,7 +3757,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7952,8 +7738,7 @@
+@@ -7953,8 +7738,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3770,7 +3767,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8068,6 +7853,243 @@
+@@ -8069,6 +7853,243 @@
done
@@ -4014,16 +4011,16 @@
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8160,7 +8182,7 @@
+@@ -8161,7 +8182,7 @@
# Provide some information about the compiler.
--echo "$as_me:8163:" \
+-echo "$as_me:8164:" \
+echo "$as_me:8185:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8206,8 +8228,7 @@
+@@ -8207,8 +8228,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4033,7 +4030,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8256,8 +8277,7 @@
+@@ -8257,8 +8277,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4043,7 +4040,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8315,7 +8335,7 @@
+@@ -8316,7 +8335,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -4052,7 +4049,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8344,20 +8364,53 @@
+@@ -8345,20 +8364,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -4112,7 +4109,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -8394,9 +8447,6 @@
+@@ -8395,9 +8447,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -4122,7 +4119,7 @@
# Transform an extracted symbol line into a proper C declaration
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-@@ -8418,6 +8468,13 @@
+@@ -8419,6 +8468,13 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -4136,7 +4133,7 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8425,7 +8482,7 @@
+@@ -8426,7 +8482,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -4145,7 +4142,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8443,14 +8500,17 @@
+@@ -8444,14 +8500,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -4165,7 +4162,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8612,7 +8672,7 @@
+@@ -8613,7 +8672,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -4174,7 +4171,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8632,7 +8692,7 @@
+@@ -8633,7 +8692,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -4183,7 +4180,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8917,6 +8977,17 @@
+@@ -8918,6 +8977,17 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -4201,7 +4198,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8942,7 +9013,7 @@
+@@ -8943,7 +9013,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4210,7 +4207,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9004,7 +9075,7 @@
+@@ -9005,7 +9075,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4219,7 +4216,7 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
-@@ -9103,6 +9174,20 @@
+@@ -9104,6 +9174,20 @@
compiler=$CC
@@ -4240,7 +4237,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -9139,11 +9224,16 @@
+@@ -9140,11 +9224,16 @@
LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -4258,7 +4255,7 @@
else
lt_prog_compiler_static_works=yes
fi
-@@ -9189,18 +9279,20 @@
+@@ -9190,18 +9279,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -4266,12 +4263,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9195: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9196: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9285: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9199: \$? = $ac_status" >&5
+- echo "$as_me:9200: \$? = $ac_status" >&5
+ echo "$as_me:9289: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -4284,7 +4281,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9277,7 +9369,7 @@
+@@ -9278,7 +9369,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4293,7 +4290,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9303,6 +9395,16 @@
+@@ -9304,6 +9395,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -4310,7 +4307,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9314,7 +9416,7 @@
+@@ -9315,7 +9416,7 @@
lt_prog_compiler_wl='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4319,7 +4316,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9338,12 +9440,19 @@
+@@ -9339,12 +9440,19 @@
;;
linux*)
@@ -4340,7 +4337,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9364,9 +9473,14 @@
+@@ -9365,9 +9473,14 @@
;;
solaris*)
@@ -4356,7 +4353,7 @@
;;
sunos4*)
-@@ -9388,6 +9502,11 @@
+@@ -9389,6 +9502,11 @@
fi
;;
@@ -4368,7 +4365,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9422,18 +9541,20 @@
+@@ -9423,18 +9541,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -4376,12 +4373,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9428: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9429: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9547: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9432: \$? = $ac_status" >&5
+- echo "$as_me:9433: \$? = $ac_status" >&5
+ echo "$as_me:9551: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -4394,7 +4391,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9454,7 +9575,7 @@
+@@ -9455,7 +9575,7 @@
fi
fi
@@ -4403,7 +4400,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9476,38 +9597,36 @@
+@@ -9477,38 +9597,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4424,12 +4421,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9495: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9496: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9609: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9499: \$? = $ac_status" >&5
+- echo "$as_me:9500: \$? = $ac_status" >&5
+ echo "$as_me:9613: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
@@ -4454,7 +4451,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9578,6 +9697,16 @@
+@@ -9579,6 +9697,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -4471,7 +4468,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9598,6 +9727,27 @@
+@@ -9599,6 +9727,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -4499,7 +4496,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9635,7 +9785,7 @@
+@@ -9636,7 +9785,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4508,7 +4505,7 @@
else
ld_shlibs=no
fi
-@@ -9645,13 +9795,13 @@
+@@ -9646,13 +9795,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -4525,17 +4522,18 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9660,19 +9810,51 @@
+@@ -9661,19 +9810,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-+ else
-+ ld_shlibs=no
-+ fi
-+ ;;
-+
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+- netbsd*)
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -4563,12 +4561,11 @@
+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ link_all_deplibs=no
- else
- ld_shlibs=no
- fi
- ;;
-
-- netbsd*)
++ else
++ ld_shlibs=no
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -4581,7 +4578,7 @@
fi
;;
-@@ -9690,8 +9872,8 @@
+@@ -9691,8 +9872,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4592,7 +4589,7 @@
else
ld_shlibs=no
fi
-@@ -9706,24 +9888,19 @@
+@@ -9707,24 +9888,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4624,7 +4621,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9757,9 +9934,20 @@
+@@ -9758,9 +9934,20 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -4647,7 +4644,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9776,7 +9964,7 @@
+@@ -9777,7 +9964,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -4656,7 +4653,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -9797,6 +9985,9 @@
+@@ -9798,6 +9985,9 @@
fi
esac
shared_flag='-shared'
@@ -4666,7 +4663,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9805,21 +9996,22 @@
+@@ -9806,21 +9996,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -4694,7 +4691,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9843,8 +10035,7 @@
+@@ -9844,8 +10035,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4704,7 +4701,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9871,14 +10062,13 @@
+@@ -9872,14 +10062,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -4722,7 +4719,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9905,8 +10095,7 @@
+@@ -9906,8 +10095,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4732,7 +4729,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9943,8 +10132,8 @@
+@@ -9944,8 +10132,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
@@ -4743,7 +4740,7 @@
fi
fi
;;
-@@ -9957,7 +10146,7 @@
+@@ -9958,7 +10146,7 @@
ld_shlibs=no
;;
@@ -4752,7 +4749,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -9967,13 +10156,13 @@
+@@ -9968,13 +10156,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -4769,7 +4766,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -9983,52 +10172,52 @@
+@@ -9984,52 +10172,52 @@
;;
darwin* | rhapsody*)
@@ -4862,7 +4859,7 @@
fi
;;
-@@ -10062,8 +10251,8 @@
+@@ -10063,8 +10251,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -4873,7 +4870,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -10071,7 +10260,7 @@
+@@ -10072,7 +10260,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -4882,7 +4879,7 @@
else
archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -10087,16 +10276,16 @@
+@@ -10088,16 +10276,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -4903,7 +4900,7 @@
hppa*64*|ia64*)
archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -10106,7 +10295,7 @@
+@@ -10107,7 +10295,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -4912,7 +4909,7 @@
hppa*64*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10139,7 +10328,7 @@
+@@ -10140,7 +10328,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -4921,7 +4918,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10149,7 +10338,7 @@
+@@ -10150,7 +10338,7 @@
link_all_deplibs=yes
;;
@@ -4930,7 +4927,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10172,7 +10361,8 @@
+@@ -10173,7 +10361,8 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -4940,7 +4937,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10182,7 +10372,7 @@
+@@ -10183,7 +10372,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -4949,7 +4946,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10193,14 +10383,14 @@
+@@ -10194,14 +10383,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -4966,7 +4963,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10212,13 +10402,13 @@
+@@ -10213,13 +10402,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -4982,7 +4979,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10237,10 +10427,12 @@
+@@ -10238,10 +10427,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -4997,7 +4994,7 @@
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10249,8 +10441,18 @@
+@@ -10250,8 +10441,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5018,7 +5015,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10259,7 +10461,7 @@
+@@ -10260,7 +10461,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -5027,7 +5024,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10319,9 +10521,9 @@
+@@ -10320,9 +10521,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5039,7 +5036,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10427,7 +10629,7 @@
+@@ -10428,7 +10629,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5048,7 +5045,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10437,7 +10639,20 @@
+@@ -10438,7 +10639,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5070,7 +5067,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10502,7 +10717,7 @@
+@@ -10503,7 +10717,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5079,7 +5076,7 @@
;;
beos*)
-@@ -10511,7 +10726,7 @@
+@@ -10512,7 +10726,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -5088,7 +5085,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10527,7 +10742,7 @@
+@@ -10528,7 +10742,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5097,7 +5094,7 @@
need_version=no
need_lib_prefix=no
-@@ -10539,7 +10754,8 @@
+@@ -10540,7 +10754,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -5107,7 +5104,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10569,7 +10785,7 @@
+@@ -10570,7 +10785,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5116,7 +5113,7 @@
;;
esac
;;
-@@ -10592,7 +10808,7 @@
+@@ -10593,7 +10808,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5125,7 +5122,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10615,7 +10831,7 @@
+@@ -10616,7 +10831,7 @@
dynamic_linker=no
;;
@@ -5134,7 +5131,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10627,8 +10843,17 @@
+@@ -10628,8 +10843,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -5154,7 +5151,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10646,7 +10871,7 @@
+@@ -10647,7 +10871,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -5163,7 +5160,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10673,9 +10898,9 @@
+@@ -10674,9 +10898,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -5175,7 +5172,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10690,7 +10915,7 @@
+@@ -10691,7 +10915,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5184,7 +5181,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10701,7 +10926,7 @@
+@@ -10702,7 +10926,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5193,7 +5190,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10762,30 +10987,51 @@
+@@ -10763,30 +10987,51 @@
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -5266,7 +5263,7 @@
;;
netbsd*)
-@@ -10797,7 +11043,7 @@
+@@ -10798,7 +11043,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5275,7 +5272,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10826,7 +11072,11 @@
+@@ -10827,7 +11072,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5288,7 +5285,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -10846,7 +11096,7 @@
+@@ -10847,7 +11096,7 @@
os2*)
libname_spec='$name'
@@ -5297,7 +5294,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10948,8 +11198,8 @@
+@@ -10949,8 +11198,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
@@ -5308,7 +5305,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -11075,8 +11325,7 @@
+@@ -11076,8 +11325,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5318,7 +5315,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11179,8 +11428,7 @@
+@@ -11180,8 +11428,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5328,7 +5325,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11245,8 +11493,7 @@
+@@ -11246,8 +11493,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5338,7 +5335,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11339,8 +11586,7 @@
+@@ -11340,8 +11586,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5348,7 +5345,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11405,8 +11651,7 @@
+@@ -11406,8 +11651,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5358,7 +5355,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11472,8 +11717,7 @@
+@@ -11473,8 +11717,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5368,7 +5365,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11539,8 +11783,7 @@
+@@ -11540,8 +11783,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5378,16 +5375,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11615,7 +11858,7 @@
+@@ -11616,7 +11858,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11618 "configure"
+-#line 11619 "configure"
+#line 11861 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11681,7 +11924,7 @@
+@@ -11682,7 +11924,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5396,16 +5393,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11713,7 +11956,7 @@
+@@ -11714,7 +11956,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11716 "configure"
+-#line 11717 "configure"
+#line 11959 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11779,7 +12022,7 @@
+@@ -11780,7 +12022,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5414,7 +5411,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11829,7 +12072,7 @@
+@@ -11830,7 +12072,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -5423,7 +5420,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11838,47 +12081,10 @@
+@@ -11839,47 +12081,10 @@
fi
;;
@@ -5472,7 +5469,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11904,7 +12110,8 @@
+@@ -11905,7 +12110,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -5482,7 +5479,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -12018,11 +12225,11 @@
+@@ -12019,11 +12225,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5496,7 +5493,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -12052,6 +12259,12 @@
+@@ -12053,6 +12259,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -5509,7 +5506,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12082,7 +12295,7 @@
+@@ -12083,7 +12295,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5518,7 +5515,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12113,7 +12326,7 @@
+@@ -12114,7 +12326,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5527,7 +5524,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12128,7 +12341,7 @@
+@@ -12129,7 +12341,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -5536,7 +5533,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12355,7 +12568,10 @@
+@@ -12356,7 +12568,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -5548,7 +5545,7 @@
fi
-@@ -12420,7 +12636,9 @@
+@@ -12421,7 +12636,9 @@
case $tagname in
CXX)
@@ -5559,7 +5556,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12457,7 +12675,7 @@
+@@ -12458,7 +12675,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -5568,7 +5565,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12478,6 +12696,20 @@
+@@ -12479,6 +12696,20 @@
compiler=$CC
@@ -5589,7 +5586,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12499,7 +12731,16 @@
+@@ -12500,7 +12731,16 @@
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -5607,7 +5604,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12570,7 +12811,7 @@
+@@ -12571,7 +12811,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -5616,7 +5613,7 @@
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
-@@ -12604,7 +12845,7 @@
+@@ -12605,7 +12845,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5625,7 +5622,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12623,8 +12864,8 @@
+@@ -12624,8 +12864,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -5636,7 +5633,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12650,7 +12891,7 @@
+@@ -12651,7 +12891,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -5645,7 +5642,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12681,8 +12922,22 @@
+@@ -12682,8 +12922,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -5670,7 +5667,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12699,7 +12954,7 @@
+@@ -12700,7 +12954,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -5679,7 +5676,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -12720,6 +12975,9 @@
+@@ -12721,6 +12975,9 @@
fi
esac
shared_flag='-shared'
@@ -5689,7 +5686,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12728,15 +12986,16 @@
+@@ -12729,15 +12986,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5710,7 +5707,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -12766,8 +13025,7 @@
+@@ -12767,8 +13025,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5720,7 +5717,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12796,13 +13054,12 @@
+@@ -12797,13 +13054,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -5736,7 +5733,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12829,8 +13086,7 @@
+@@ -12830,8 +13086,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5746,7 +5743,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12867,8 +13123,8 @@
+@@ -12868,8 +13123,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
@@ -5757,7 +5754,7 @@
fi
fi
;;
-@@ -12881,16 +13137,17 @@
+@@ -12882,16 +13137,17 @@
esac
;;
@@ -5777,7 +5774,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12899,70 +13156,81 @@
+@@ -12900,70 +13156,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -5911,7 +5908,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12973,14 +13241,14 @@
+@@ -12974,14 +13241,14 @@
;;
esac
;;
@@ -5928,7 +5925,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12997,12 +13265,12 @@
+@@ -12998,12 +13265,12 @@
# location of the library.
case $cc_basename in
@@ -5944,7 +5941,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13011,11 +13279,11 @@
+@@ -13012,11 +13279,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -5958,7 +5955,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13025,7 +13293,7 @@
+@@ -13026,7 +13293,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -5967,7 +5964,7 @@
hppa*64*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -13041,7 +13309,7 @@
+@@ -13042,7 +13309,7 @@
;;
esac
fi
@@ -5976,7 +5973,7 @@
hppa*64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -13062,17 +13330,17 @@
+@@ -13063,17 +13330,17 @@
esac
case $cc_basename in
@@ -5998,7 +5995,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13088,12 +13356,12 @@
+@@ -13089,12 +13356,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -6013,7 +6010,7 @@
;;
esac
fi
-@@ -13106,9 +13374,9 @@
+@@ -13107,9 +13374,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -6025,7 +6022,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13119,9 +13387,9 @@
+@@ -13120,9 +13387,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -6037,7 +6034,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13132,14 +13400,14 @@
+@@ -13133,14 +13400,14 @@
;;
linux*)
case $cc_basename in
@@ -6055,7 +6052,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13157,20 +13425,44 @@
+@@ -13158,20 +13425,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6106,7 +6103,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13198,7 +13490,7 @@
+@@ -13199,7 +13490,7 @@
;;
mvs*)
case $cc_basename in
@@ -6115,7 +6112,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13208,7 +13500,7 @@
+@@ -13209,7 +13500,7 @@
;;
esac
;;
@@ -6124,7 +6121,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13219,15 +13511,31 @@
+@@ -13220,15 +13511,31 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -6158,7 +6155,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13237,14 +13545,14 @@
+@@ -13238,14 +13545,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6176,7 +6173,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13262,7 +13570,7 @@
+@@ -13263,7 +13570,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6185,7 +6182,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13281,13 +13589,13 @@
+@@ -13282,13 +13589,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -6201,7 +6198,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13296,17 +13604,17 @@
+@@ -13297,17 +13604,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -6223,7 +6220,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13325,7 +13633,7 @@
+@@ -13326,7 +13633,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6232,7 +6229,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13349,7 +13657,7 @@
+@@ -13350,7 +13657,7 @@
sco*)
archive_cmds_need_lc_CXX=no
case $cc_basename in
@@ -6241,7 +6238,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13361,12 +13669,12 @@
+@@ -13362,12 +13669,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6256,7 +6253,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13379,36 +13687,33 @@
+@@ -13380,36 +13687,33 @@
;;
solaris*)
case $cc_basename in
@@ -6305,7 +6302,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13416,9 +13721,9 @@
+@@ -13417,9 +13721,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -6317,7 +6314,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13428,9 +13733,9 @@
+@@ -13429,9 +13733,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -6329,7 +6326,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13439,9 +13744,9 @@
+@@ -13440,9 +13744,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6341,7 +6338,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13459,7 +13764,7 @@
+@@ -13460,7 +13764,7 @@
;;
tandem*)
case $cc_basename in
@@ -6350,7 +6347,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13516,7 +13821,7 @@
+@@ -13517,7 +13821,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -6359,7 +6356,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13556,7 +13861,7 @@
+@@ -13557,7 +13861,7 @@
fi
;;
@@ -6368,7 +6365,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13592,6 +13897,20 @@
+@@ -13593,6 +13897,20 @@
$rm -f confest.$objext
@@ -6389,7 +6386,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13647,7 +13966,7 @@
+@@ -13648,7 +13966,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -6398,7 +6395,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13672,18 +13991,28 @@
+@@ -13673,18 +13991,28 @@
;;
chorus*)
case $cc_basename in
@@ -6430,7 +6427,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13691,22 +14020,22 @@
+@@ -13692,22 +14020,22 @@
;;
esac
;;
@@ -6457,7 +6454,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13721,7 +14050,7 @@
+@@ -13722,7 +14050,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -6466,7 +6463,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13732,18 +14061,24 @@
+@@ -13733,18 +14061,24 @@
;;
linux*)
case $cc_basename in
@@ -6494,7 +6491,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13760,25 +14095,25 @@
+@@ -13761,25 +14095,25 @@
;;
mvs*)
case $cc_basename in
@@ -6525,7 +6522,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13794,7 +14129,7 @@
+@@ -13795,7 +14129,7 @@
;;
sco*)
case $cc_basename in
@@ -6534,7 +6531,7 @@
lt_prog_compiler_pic_CXX='-fPIC'
;;
*)
-@@ -13803,13 +14138,13 @@
+@@ -13804,13 +14138,13 @@
;;
solaris*)
case $cc_basename in
@@ -6550,7 +6547,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13819,12 +14154,12 @@
+@@ -13820,12 +14154,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6565,7 +6562,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13834,7 +14169,7 @@
+@@ -13835,7 +14169,7 @@
;;
tandem*)
case $cc_basename in
@@ -6574,7 +6571,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13875,18 +14210,20 @@
+@@ -13876,18 +14210,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -6582,12 +6579,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13881: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13882: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14216: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13885: \$? = $ac_status" >&5
+- echo "$as_me:13886: \$? = $ac_status" >&5
+ echo "$as_me:14220: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -6600,7 +6597,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13907,7 +14244,7 @@
+@@ -13908,7 +14244,7 @@
fi
fi
@@ -6609,7 +6606,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13929,38 +14266,36 @@
+@@ -13930,38 +14266,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6630,12 +6627,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13948: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13949: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14278: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13952: \$? = $ac_status" >&5
+- echo "$as_me:13953: \$? = $ac_status" >&5
+ echo "$as_me:14282: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
@@ -6660,7 +6657,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -14010,7 +14345,10 @@
+@@ -14011,7 +14345,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -6672,7 +6669,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14093,7 +14431,7 @@
+@@ -14094,7 +14431,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6681,7 +6678,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14103,7 +14441,20 @@
+@@ -14104,7 +14441,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6703,7 +6700,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14168,7 +14519,7 @@
+@@ -14169,7 +14519,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6712,7 +6709,7 @@
;;
beos*)
-@@ -14177,7 +14528,7 @@
+@@ -14178,7 +14528,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -6721,7 +6718,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14193,7 +14544,7 @@
+@@ -14194,7 +14544,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6730,7 +6727,7 @@
need_version=no
need_lib_prefix=no
-@@ -14205,7 +14556,8 @@
+@@ -14206,7 +14556,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -6740,7 +6737,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14235,7 +14587,7 @@
+@@ -14236,7 +14587,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6749,7 +6746,7 @@
;;
esac
;;
-@@ -14258,7 +14610,7 @@
+@@ -14259,7 +14610,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6758,7 +6755,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14281,7 +14633,7 @@
+@@ -14282,7 +14633,7 @@
dynamic_linker=no
;;
@@ -6767,7 +6764,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14293,8 +14645,17 @@
+@@ -14294,8 +14645,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -6787,7 +6784,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14312,7 +14673,7 @@
+@@ -14313,7 +14673,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -6796,7 +6793,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14339,9 +14700,9 @@
+@@ -14340,9 +14700,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -6808,7 +6805,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14356,7 +14717,7 @@
+@@ -14357,7 +14717,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6817,7 +6814,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14367,7 +14728,7 @@
+@@ -14368,7 +14728,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6826,7 +6823,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14429,22 +14790,19 @@
+@@ -14430,22 +14790,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -6855,7 +6852,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -14454,6 +14812,30 @@
+@@ -14455,6 +14812,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6886,7 +6883,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14463,7 +14845,7 @@
+@@ -14464,7 +14845,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6895,7 +6892,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14492,7 +14874,11 @@
+@@ -14493,7 +14874,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -6908,7 +6905,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -14512,7 +14898,7 @@
+@@ -14513,7 +14898,7 @@
os2*)
libname_spec='$name'
@@ -6917,7 +6914,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14614,8 +15000,8 @@
+@@ -14615,8 +15000,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
@@ -6928,7 +6925,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14741,8 +15127,7 @@
+@@ -14742,8 +15127,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6938,7 +6935,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14845,8 +15230,7 @@
+@@ -14846,8 +15230,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6948,7 +6945,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14911,8 +15295,7 @@
+@@ -14912,8 +15295,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6958,7 +6955,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15005,8 +15388,7 @@
+@@ -15006,8 +15388,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6968,7 +6965,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15071,8 +15453,7 @@
+@@ -15072,8 +15453,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6978,7 +6975,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15138,8 +15519,7 @@
+@@ -15139,8 +15519,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6988,7 +6985,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15205,8 +15585,7 @@
+@@ -15206,8 +15585,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6998,16 +6995,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15281,7 +15660,7 @@
+@@ -15282,7 +15660,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15284 "configure"
+-#line 15285 "configure"
+#line 15663 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15347,7 +15726,7 @@
+@@ -15348,7 +15726,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7016,16 +7013,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15379,7 +15758,7 @@
+@@ -15380,7 +15758,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15382 "configure"
+-#line 15383 "configure"
+#line 15761 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15445,7 +15824,7 @@
+@@ -15446,7 +15824,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7034,7 +7031,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15496,7 +15875,8 @@
+@@ -15497,7 +15875,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -7044,7 +7041,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -15596,6 +15976,12 @@
+@@ -15597,6 +15976,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7057,7 +7054,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -15626,7 +16012,7 @@
+@@ -15627,7 +16012,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7066,7 +7063,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15657,7 +16043,7 @@
+@@ -15658,7 +16043,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7075,7 +7072,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15672,7 +16058,7 @@
+@@ -15673,7 +16058,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -7084,7 +7081,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15874,7 +16260,10 @@
+@@ -15875,7 +16260,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -7096,7 +7093,7 @@
fi
-@@ -15950,12 +16339,35 @@
+@@ -15951,12 +16339,35 @@
compiler=$CC
@@ -7133,7 +7130,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15968,7 +16380,7 @@
+@@ -15969,7 +16380,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7142,7 +7139,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -15976,8 +16388,10 @@
+@@ -15977,8 +16388,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7155,7 +7152,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16054,7 +16468,7 @@
+@@ -16055,7 +16468,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7164,7 +7161,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16080,6 +16494,16 @@
+@@ -16081,6 +16494,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -7181,7 +7178,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16091,7 +16515,7 @@
+@@ -16092,7 +16515,7 @@
lt_prog_compiler_wl_F77='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7190,7 +7187,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16115,12 +16539,19 @@
+@@ -16116,12 +16539,19 @@
;;
linux*)
@@ -7211,7 +7208,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16141,9 +16572,14 @@
+@@ -16142,9 +16572,14 @@
;;
solaris*)
@@ -7227,7 +7224,7 @@
;;
sunos4*)
-@@ -16165,6 +16601,11 @@
+@@ -16166,6 +16601,11 @@
fi
;;
@@ -7239,7 +7236,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16199,18 +16640,20 @@
+@@ -16200,18 +16640,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -7247,12 +7244,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16205: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16206: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16646: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16209: \$? = $ac_status" >&5
+- echo "$as_me:16210: \$? = $ac_status" >&5
+ echo "$as_me:16650: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -7265,7 +7262,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16231,7 +16674,7 @@
+@@ -16232,7 +16674,7 @@
fi
fi
@@ -7274,7 +7271,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16253,38 +16696,36 @@
+@@ -16254,38 +16696,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7295,12 +7292,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16272: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16273: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16708: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16276: \$? = $ac_status" >&5
+- echo "$as_me:16277: \$? = $ac_status" >&5
+ echo "$as_me:16712: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
@@ -7325,7 +7322,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16355,6 +16796,16 @@
+@@ -16356,6 +16796,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -7342,7 +7339,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16375,6 +16826,27 @@
+@@ -16376,6 +16826,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -7370,7 +7367,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16412,7 +16884,7 @@
+@@ -16413,7 +16884,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -7379,7 +7376,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16422,13 +16894,13 @@
+@@ -16423,13 +16894,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -7396,7 +7393,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16437,19 +16909,51 @@
+@@ -16438,19 +16909,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7453,7 +7450,7 @@
fi
;;
-@@ -16467,8 +16971,8 @@
+@@ -16468,8 +16971,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7464,7 +7461,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16483,24 +16987,19 @@
+@@ -16484,24 +16987,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7496,7 +7493,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16534,9 +17033,20 @@
+@@ -16535,9 +17033,20 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -7519,7 +7516,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16553,7 +17063,7 @@
+@@ -16554,7 +17063,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -7528,7 +7525,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -16574,6 +17084,9 @@
+@@ -16575,6 +17084,9 @@
fi
esac
shared_flag='-shared'
@@ -7538,7 +7535,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16582,21 +17095,22 @@
+@@ -16583,21 +17095,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7566,7 +7563,7 @@
program main
end
-@@ -16610,8 +17124,7 @@
+@@ -16611,8 +17124,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7576,7 +7573,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16638,14 +17151,13 @@
+@@ -16639,14 +17151,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7594,7 +7591,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16662,8 +17174,7 @@
+@@ -16663,8 +17174,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7604,7 +7601,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16700,8 +17211,8 @@
+@@ -16701,8 +17211,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
@@ -7615,7 +7612,7 @@
fi
fi
;;
-@@ -16714,7 +17225,7 @@
+@@ -16715,7 +17225,7 @@
ld_shlibs_F77=no
;;
@@ -7624,7 +7621,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16724,68 +17235,68 @@
+@@ -16725,68 +17235,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -7737,7 +7734,7 @@
fi
;;
-@@ -16819,8 +17330,8 @@
+@@ -16820,8 +17330,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -7748,7 +7745,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16828,7 +17339,7 @@
+@@ -16829,7 +17339,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -7757,7 +7754,7 @@
else
archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -16844,16 +17355,16 @@
+@@ -16845,16 +17355,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -7778,7 +7775,7 @@
hppa*64*|ia64*)
archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -16863,7 +17374,7 @@
+@@ -16864,7 +17374,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -7787,7 +7784,7 @@
hppa*64*)
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16896,7 +17407,7 @@
+@@ -16897,7 +17407,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -7796,7 +7793,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -16906,7 +17417,7 @@
+@@ -16907,7 +17417,7 @@
link_all_deplibs_F77=yes
;;
@@ -7805,7 +7802,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16929,7 +17440,8 @@
+@@ -16930,7 +17440,8 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -7815,7 +7812,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16939,7 +17451,7 @@
+@@ -16940,7 +17451,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -7824,7 +7821,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16950,14 +17462,14 @@
+@@ -16951,14 +17462,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -7841,7 +7838,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -16969,13 +17481,13 @@
+@@ -16970,13 +17481,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -7857,7 +7854,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16994,10 +17506,12 @@
+@@ -16995,10 +17506,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -7872,7 +7869,7 @@
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17006,8 +17520,18 @@
+@@ -17007,8 +17520,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -7893,7 +7890,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -17016,7 +17540,7 @@
+@@ -17017,7 +17540,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -7902,7 +7899,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -17076,9 +17600,9 @@
+@@ -17077,9 +17600,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -7914,7 +7911,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17184,7 +17708,7 @@
+@@ -17185,7 +17708,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -7923,7 +7920,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17194,7 +17718,20 @@
+@@ -17195,7 +17718,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7945,7 +7942,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17259,7 +17796,7 @@
+@@ -17260,7 +17796,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7954,7 +7951,7 @@
;;
beos*)
-@@ -17268,7 +17805,7 @@
+@@ -17269,7 +17805,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -7963,7 +7960,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17284,7 +17821,7 @@
+@@ -17285,7 +17821,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7972,7 +7969,7 @@
need_version=no
need_lib_prefix=no
-@@ -17296,7 +17833,8 @@
+@@ -17297,7 +17833,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -7982,7 +7979,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17326,7 +17864,7 @@
+@@ -17327,7 +17864,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7991,7 +7988,7 @@
;;
esac
;;
-@@ -17349,7 +17887,7 @@
+@@ -17350,7 +17887,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8000,7 +7997,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17372,7 +17910,7 @@
+@@ -17373,7 +17910,7 @@
dynamic_linker=no
;;
@@ -8009,7 +8006,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17384,8 +17922,17 @@
+@@ -17385,8 +17922,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8029,7 +8026,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17403,7 +17950,7 @@
+@@ -17404,7 +17950,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8038,7 +8035,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17430,9 +17977,9 @@
+@@ -17431,9 +17977,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8050,7 +8047,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17447,7 +17994,7 @@
+@@ -17448,7 +17994,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8059,7 +8056,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17458,7 +18005,7 @@
+@@ -17459,7 +18005,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8068,7 +8065,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17520,22 +18067,19 @@
+@@ -17521,22 +18067,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -8097,7 +8094,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -17545,6 +18089,30 @@
+@@ -17546,6 +18089,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8128,7 +8125,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17554,7 +18122,7 @@
+@@ -17555,7 +18122,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8137,7 +8134,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17583,7 +18151,11 @@
+@@ -17584,7 +18151,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8150,7 +8147,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -17603,7 +18175,7 @@
+@@ -17604,7 +18175,7 @@
os2*)
libname_spec='$name'
@@ -8159,7 +8156,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17705,8 +18277,8 @@
+@@ -17706,8 +18277,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
@@ -8170,7 +8167,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17782,7 +18354,8 @@
+@@ -17783,7 +18354,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -8180,7 +8177,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -17882,6 +18455,12 @@
+@@ -17883,6 +18455,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8193,7 +8190,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17912,7 +18491,7 @@
+@@ -17913,7 +18491,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8202,7 +8199,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17943,7 +18522,7 @@
+@@ -17944,7 +18522,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8211,7 +8208,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17958,7 +18537,7 @@
+@@ -17959,7 +18537,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -8220,7 +8217,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18160,7 +18739,10 @@
+@@ -18161,7 +18739,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -8232,7 +8229,7 @@
fi
-@@ -18193,7 +18775,7 @@
+@@ -18194,7 +18775,7 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -8241,7 +8238,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18204,15 +18786,41 @@
+@@ -18205,15 +18786,41 @@
compiler=$CC
@@ -8283,7 +8280,7 @@
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
## the running order or otherwise move them around unless you know exactly
-@@ -18239,18 +18847,20 @@
+@@ -18240,18 +18847,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -8291,12 +8288,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18245: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18246: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18853: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18249: \$? = $ac_status" >&5
+- echo "$as_me:18250: \$? = $ac_status" >&5
+ echo "$as_me:18857: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -8309,7 +8306,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18327,7 +18937,7 @@
+@@ -18328,7 +18937,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8318,7 +8315,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18353,6 +18963,16 @@
+@@ -18354,6 +18963,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -8335,7 +8332,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18364,7 +18984,7 @@
+@@ -18365,7 +18984,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8344,7 +8341,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18388,12 +19008,19 @@
+@@ -18389,12 +19008,19 @@
;;
linux*)
@@ -8365,7 +8362,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18414,9 +19041,14 @@
+@@ -18415,9 +19041,14 @@
;;
solaris*)
@@ -8381,7 +8378,7 @@
;;
sunos4*)
-@@ -18438,6 +19070,11 @@
+@@ -18439,6 +19070,11 @@
fi
;;
@@ -8393,7 +8390,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18472,18 +19109,20 @@
+@@ -18473,18 +19109,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -8401,12 +8398,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18478: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18479: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19115: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18482: \$? = $ac_status" >&5
+- echo "$as_me:18483: \$? = $ac_status" >&5
+ echo "$as_me:19119: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
@@ -8419,7 +8416,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18504,7 +19143,7 @@
+@@ -18505,7 +19143,7 @@
fi
fi
@@ -8428,7 +8425,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18526,38 +19165,36 @@
+@@ -18527,38 +19165,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8449,12 +8446,12 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18545: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18546: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19177: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18549: \$? = $ac_status" >&5
+- echo "$as_me:18550: \$? = $ac_status" >&5
+ echo "$as_me:19181: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
@@ -8479,7 +8476,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18628,6 +19265,16 @@
+@@ -18629,6 +19265,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -8496,7 +8493,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18648,6 +19295,27 @@
+@@ -18649,6 +19295,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8524,7 +8521,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18685,7 +19353,7 @@
+@@ -18686,7 +19353,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8533,7 +8530,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18695,13 +19363,13 @@
+@@ -18696,13 +19363,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -8550,7 +8547,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18710,19 +19378,51 @@
+@@ -18711,19 +19378,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -8607,7 +8604,7 @@
fi
;;
-@@ -18740,8 +19440,8 @@
+@@ -18741,8 +19440,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8618,7 +8615,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18756,24 +19456,19 @@
+@@ -18757,24 +19456,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8650,7 +8647,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18807,9 +19502,20 @@
+@@ -18808,9 +19502,20 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -8673,7 +8670,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18826,7 +19532,7 @@
+@@ -18827,7 +19532,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -8682,7 +8679,7 @@
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
collect2name=`${CC} -print-prog-name=collect2`
-@@ -18847,6 +19553,9 @@
+@@ -18848,6 +19553,9 @@
fi
esac
shared_flag='-shared'
@@ -8692,7 +8689,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18855,21 +19564,22 @@
+@@ -18856,21 +19564,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -8720,7 +8717,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18893,8 +19603,7 @@
+@@ -18894,8 +19603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8730,7 +8727,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18921,14 +19630,13 @@
+@@ -18922,14 +19630,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8748,7 +8745,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18955,8 +19663,7 @@
+@@ -18956,8 +19663,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8758,7 +8755,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18993,8 +19700,8 @@
+@@ -18994,8 +19700,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
@@ -8769,7 +8766,7 @@
fi
fi
;;
-@@ -19007,7 +19714,7 @@
+@@ -19008,7 +19714,7 @@
ld_shlibs_GCJ=no
;;
@@ -8778,7 +8775,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -19017,68 +19724,68 @@
+@@ -19018,68 +19724,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -8891,7 +8888,7 @@
fi
;;
-@@ -19112,8 +19819,8 @@
+@@ -19113,8 +19819,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8902,7 +8899,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19121,7 +19828,7 @@
+@@ -19122,7 +19828,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -8911,7 +8908,7 @@
else
archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -19137,16 +19844,16 @@
+@@ -19138,16 +19844,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -8932,7 +8929,7 @@
hppa*64*|ia64*)
archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -19156,7 +19863,7 @@
+@@ -19157,7 +19863,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -8941,7 +8938,7 @@
hppa*64*)
hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19189,7 +19896,7 @@
+@@ -19190,7 +19896,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -8950,7 +8947,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19199,7 +19906,7 @@
+@@ -19200,7 +19906,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -8959,7 +8956,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19222,7 +19929,8 @@
+@@ -19223,7 +19929,8 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -8969,7 +8966,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19232,7 +19940,7 @@
+@@ -19233,7 +19940,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -8978,7 +8975,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19243,14 +19951,14 @@
+@@ -19244,14 +19951,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -8995,7 +8992,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19262,13 +19970,13 @@
+@@ -19263,13 +19970,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -9011,7 +9008,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19287,10 +19995,12 @@
+@@ -19288,10 +19995,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -9026,7 +9023,7 @@
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19299,8 +20009,18 @@
+@@ -19300,8 +20009,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9047,7 +9044,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19309,7 +20029,7 @@
+@@ -19310,7 +20029,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -9056,7 +9053,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19369,9 +20089,9 @@
+@@ -19370,9 +20089,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -9068,7 +9065,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19477,7 +20197,7 @@
+@@ -19478,7 +20197,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -9077,7 +9074,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19487,7 +20207,20 @@
+@@ -19488,7 +20207,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9099,7 +9096,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19552,7 +20285,7 @@
+@@ -19553,7 +20285,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9108,7 +9105,7 @@
;;
beos*)
-@@ -19561,7 +20294,7 @@
+@@ -19562,7 +20294,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -9117,7 +9114,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19577,7 +20310,7 @@
+@@ -19578,7 +20310,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9126,7 +9123,7 @@
need_version=no
need_lib_prefix=no
-@@ -19589,7 +20322,8 @@
+@@ -19590,7 +20322,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -9136,7 +9133,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19619,7 +20353,7 @@
+@@ -19620,7 +20353,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9145,7 +9142,7 @@
;;
esac
;;
-@@ -19642,7 +20376,7 @@
+@@ -19643,7 +20376,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9154,7 +9151,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19665,7 +20399,7 @@
+@@ -19666,7 +20399,7 @@
dynamic_linker=no
;;
@@ -9163,7 +9160,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19677,8 +20411,17 @@
+@@ -19678,8 +20411,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -9183,7 +9180,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19696,7 +20439,7 @@
+@@ -19697,7 +20439,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9192,7 +9189,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19723,9 +20466,9 @@
+@@ -19724,9 +20466,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9204,7 +9201,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19740,7 +20483,7 @@
+@@ -19741,7 +20483,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9213,7 +9210,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19751,7 +20494,7 @@
+@@ -19752,7 +20494,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9222,7 +9219,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19813,22 +20556,19 @@
+@@ -19814,22 +20556,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -9251,7 +9248,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -19838,6 +20578,30 @@
+@@ -19839,6 +20578,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9282,7 +9279,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19847,7 +20611,7 @@
+@@ -19848,7 +20611,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9291,7 +9288,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19876,7 +20640,11 @@
+@@ -19877,7 +20640,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9304,7 +9301,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -19896,7 +20664,7 @@
+@@ -19897,7 +20664,7 @@
os2*)
libname_spec='$name'
@@ -9313,7 +9310,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -19998,8 +20766,8 @@
+@@ -19999,8 +20766,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
@@ -9324,7 +9321,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_GCJ" != no &&
-@@ -20125,8 +20893,7 @@
+@@ -20126,8 +20893,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9334,7 +9331,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20229,8 +20996,7 @@
+@@ -20230,8 +20996,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9344,7 +9341,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20295,8 +21061,7 @@
+@@ -20296,8 +21061,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9354,7 +9351,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20389,8 +21154,7 @@
+@@ -20390,8 +21154,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9364,7 +9361,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20455,8 +21219,7 @@
+@@ -20456,8 +21219,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9374,7 +9371,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20522,8 +21285,7 @@
+@@ -20523,8 +21285,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9384,7 +9381,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20589,8 +21351,7 @@
+@@ -20590,8 +21351,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9394,16 +9391,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20665,7 +21426,7 @@
+@@ -20666,7 +21426,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20668 "configure"
+-#line 20669 "configure"
+#line 21429 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20731,7 +21492,7 @@
+@@ -20732,7 +21492,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9412,16 +9409,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20763,7 +21524,7 @@
+@@ -20764,7 +21524,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20766 "configure"
+-#line 20767 "configure"
+#line 21527 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20829,7 +21590,7 @@
+@@ -20830,7 +21590,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9430,7 +9427,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20880,7 +21641,8 @@
+@@ -20881,7 +21641,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -9440,7 +9437,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -20980,6 +21742,12 @@
+@@ -20981,6 +21742,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9453,7 +9450,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21010,7 +21778,7 @@
+@@ -21011,7 +21778,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9462,7 +9459,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21041,7 +21809,7 @@
+@@ -21042,7 +21809,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9471,7 +9468,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21056,7 +21824,7 @@
+@@ -21057,7 +21824,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -9480,7 +9477,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21258,7 +22026,10 @@
+@@ -21259,7 +22026,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -9492,7 +9489,7 @@
fi
-@@ -21301,11 +22072,35 @@
+@@ -21302,11 +22072,35 @@
compiler=$CC
@@ -9528,7 +9525,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21321,7 +22116,8 @@
+@@ -21322,7 +22116,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -9538,7 +9535,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21421,6 +22217,12 @@
+@@ -21422,6 +22217,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9551,7 +9548,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21451,7 +22253,7 @@
+@@ -21452,7 +22253,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9560,7 +9557,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21482,7 +22284,7 @@
+@@ -21483,7 +22284,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9569,7 +9566,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21497,7 +22299,7 @@
+@@ -21498,7 +22299,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -9578,7 +9575,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21699,7 +22501,10 @@
+@@ -21700,7 +22501,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -9590,7 +9587,7 @@
fi
-@@ -21746,7 +22551,7 @@
+@@ -21747,7 +22551,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -9599,7 +9596,7 @@
# Prevent multiple expansion
-@@ -21987,8 +22792,7 @@
+@@ -21988,8 +22792,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9609,7 +9606,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22062,9 +22866,6 @@
+@@ -22063,9 +22866,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9619,7 +9616,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22098,8 +22899,7 @@
+@@ -22099,8 +22899,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9629,7 +9626,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22203,8 +23003,7 @@
+@@ -22204,8 +23003,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9639,7 +9636,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22283,9 +23082,6 @@
+@@ -22284,9 +23082,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9649,7 +9646,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22318,8 +23114,7 @@
+@@ -22319,8 +23114,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9659,7 +9656,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22422,8 +23217,7 @@
+@@ -22423,8 +23217,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9669,7 +9666,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22513,8 +23307,7 @@
+@@ -22514,8 +23307,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9679,7 +9676,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22575,8 +23368,7 @@
+@@ -22576,8 +23368,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9689,7 +9686,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22644,8 +23436,7 @@
+@@ -22645,8 +23436,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9699,7 +9696,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22711,8 +23502,7 @@
+@@ -22712,8 +23502,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9709,7 +9706,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22805,8 +23595,7 @@
+@@ -22806,8 +23595,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9719,7 +9716,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22884,8 +23673,7 @@
+@@ -22885,8 +23673,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9729,7 +9726,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22969,8 +23757,7 @@
+@@ -22970,8 +23757,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9739,7 +9736,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23038,8 +23825,7 @@
+@@ -23039,8 +23825,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9749,7 +9746,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23134,8 +23920,7 @@
+@@ -23135,8 +23920,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9759,7 +9756,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23199,8 +23984,7 @@
+@@ -23200,8 +23984,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9769,7 +9766,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23295,8 +24079,7 @@
+@@ -23296,8 +24079,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9779,7 +9776,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23360,8 +24143,7 @@
+@@ -23361,8 +24143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9789,7 +9786,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23457,8 +24239,7 @@
+@@ -23458,8 +24239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9799,7 +9796,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23522,8 +24303,7 @@
+@@ -23523,8 +24303,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9809,7 +9806,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23620,8 +24400,7 @@
+@@ -23621,8 +24400,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9819,7 +9816,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23686,8 +24465,7 @@
+@@ -23687,8 +24465,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9829,7 +9826,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23755,8 +24533,7 @@
+@@ -23756,8 +24533,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9839,7 +9836,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23907,8 +24684,7 @@
+@@ -23908,8 +24684,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9849,7 +9846,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24063,8 +24839,7 @@
+@@ -24064,8 +24839,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9859,7 +9856,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24129,8 +24904,7 @@
+@@ -24130,8 +24904,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9869,7 +9866,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24277,8 +25051,7 @@
+@@ -24278,8 +25051,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9879,7 +9876,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24433,8 +25206,7 @@
+@@ -24434,8 +25206,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9889,7 +9886,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24490,9 +25262,6 @@
+@@ -24491,9 +25262,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9899,7 +9896,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24526,8 +25295,7 @@
+@@ -24527,8 +25295,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9909,7 +9906,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24631,8 +25399,7 @@
+@@ -24632,8 +25399,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9919,7 +9916,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24732,8 +25499,7 @@
+@@ -24733,8 +25499,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9929,7 +9926,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24807,8 +25573,7 @@
+@@ -24808,8 +25573,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9939,7 +9936,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24871,8 +25636,7 @@
+@@ -24872,8 +25636,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9949,7 +9946,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24934,8 +25698,7 @@
+@@ -24935,8 +25698,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9959,7 +9956,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24975,8 +25738,7 @@
+@@ -24976,8 +25738,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9969,7 +9966,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25032,8 +25794,7 @@
+@@ -25033,8 +25794,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9979,7 +9976,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25073,8 +25834,7 @@
+@@ -25074,8 +25834,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9989,7 +9986,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25138,8 +25898,7 @@
+@@ -25139,8 +25898,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9999,7 +9996,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25170,10 +25929,8 @@
+@@ -25171,10 +25929,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10012,7 +10009,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25284,8 +26041,7 @@
+@@ -25285,8 +26041,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10022,7 +10019,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25347,8 +26103,7 @@
+@@ -25348,8 +26103,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10032,7 +10029,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25388,8 +26143,7 @@
+@@ -25389,8 +26143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10042,7 +10039,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25445,8 +26199,7 @@
+@@ -25446,8 +26199,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10052,7 +10049,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25486,8 +26239,7 @@
+@@ -25487,8 +26239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10062,7 +10059,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25551,8 +26303,7 @@
+@@ -25552,8 +26303,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10072,7 +10069,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25583,10 +26334,8 @@
+@@ -25584,10 +26334,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10085,7 +10082,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25697,8 +26446,7 @@
+@@ -25698,8 +26446,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10095,7 +10092,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25760,8 +26508,7 @@
+@@ -25761,8 +26508,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10105,7 +10102,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25801,8 +26548,7 @@
+@@ -25802,8 +26548,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10115,7 +10112,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25858,8 +26604,7 @@
+@@ -25859,8 +26604,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10125,7 +10122,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25899,8 +26644,7 @@
+@@ -25900,8 +26644,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10135,7 +10132,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25964,8 +26708,7 @@
+@@ -25965,8 +26708,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10145,7 +10142,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25996,10 +26739,8 @@
+@@ -25997,10 +26739,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10158,7 +10155,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26110,8 +26851,7 @@
+@@ -26111,8 +26851,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10168,7 +10165,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26173,8 +26913,7 @@
+@@ -26174,8 +26913,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10178,7 +10175,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26214,8 +26953,7 @@
+@@ -26215,8 +26953,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10188,7 +10185,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26271,8 +27009,7 @@
+@@ -26272,8 +27009,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10198,7 +10195,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26312,8 +27049,7 @@
+@@ -26313,8 +27049,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10208,7 +10205,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26377,8 +27113,7 @@
+@@ -26378,8 +27113,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10218,7 +10215,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26409,10 +27144,8 @@
+@@ -26410,10 +27144,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10231,7 +10228,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26531,8 +27264,7 @@
+@@ -26532,8 +27264,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10241,7 +10238,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26603,8 +27335,7 @@
+@@ -26604,8 +27335,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10251,7 +10248,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26674,8 +27405,7 @@
+@@ -26675,8 +27405,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10261,7 +10258,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26737,8 +27467,7 @@
+@@ -26738,8 +27467,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10271,7 +10268,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26778,8 +27507,7 @@
+@@ -26779,8 +27507,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10281,7 +10278,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26835,8 +27563,7 @@
+@@ -26836,8 +27563,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10291,7 +10288,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26876,8 +27603,7 @@
+@@ -26877,8 +27603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10301,7 +10298,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26941,8 +27667,7 @@
+@@ -26942,8 +27667,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10311,7 +10308,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26973,10 +27698,8 @@
+@@ -26974,10 +27698,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10324,7 +10321,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27088,8 +27811,7 @@
+@@ -27089,8 +27811,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10334,7 +10331,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27151,8 +27873,7 @@
+@@ -27152,8 +27873,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10344,7 +10341,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27192,8 +27913,7 @@
+@@ -27193,8 +27913,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10354,7 +10351,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27249,8 +27969,7 @@
+@@ -27250,8 +27969,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10364,7 +10361,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27290,8 +28009,7 @@
+@@ -27291,8 +28009,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10374,7 +10371,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27355,8 +28073,7 @@
+@@ -27356,8 +28073,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10384,7 +10381,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27387,10 +28104,8 @@
+@@ -27388,10 +28104,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10397,7 +10394,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27501,8 +28216,7 @@
+@@ -27502,8 +28216,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10407,7 +10404,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27583,8 +28297,7 @@
+@@ -27584,8 +28297,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10417,7 +10414,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27684,8 +28397,7 @@
+@@ -27685,8 +28397,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10427,7 +10424,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27865,8 +28577,7 @@
+@@ -27866,8 +28577,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10437,7 +10434,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27975,8 +28686,7 @@
+@@ -27976,8 +28686,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10447,7 +10444,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28200,8 +28910,7 @@
+@@ -28201,8 +28910,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10457,7 +10454,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28424,8 +29133,7 @@
+@@ -28425,8 +29133,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10467,7 +10464,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28501,8 +29209,7 @@
+@@ -28502,8 +29209,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10477,7 +10474,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28728,8 +29435,7 @@
+@@ -28729,8 +29435,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10487,7 +10484,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28804,8 +29510,7 @@
+@@ -28805,8 +29510,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10497,7 +10494,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28865,8 +29570,7 @@
+@@ -28866,8 +29570,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10507,7 +10504,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28949,8 +29653,7 @@
+@@ -28950,8 +29653,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10517,7 +10514,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29043,8 +29746,7 @@
+@@ -29044,8 +29746,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10527,7 +10524,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29218,8 +29920,7 @@
+@@ -29219,8 +29920,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10537,7 +10534,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29317,8 +30018,7 @@
+@@ -29318,8 +30018,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10547,7 +10544,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29405,8 +30105,7 @@
+@@ -29406,8 +30105,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10557,7 +10554,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29483,8 +30182,7 @@
+@@ -29484,8 +30182,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10567,25 +10564,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29537,7 +30235,7 @@
+@@ -29538,7 +30235,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29540: $i/$j" >&5
+- echo "configure: 29541: $i/$j" >&5
+ echo "configure: 30238: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29835,7 +30533,7 @@
+@@ -29836,7 +30533,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29838: $i/$j" >&5
+- echo "configure: 29839: $i/$j" >&5
+ echo "configure: 30536: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30512,8 +31210,7 @@
+@@ -30513,8 +31210,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10595,43 +10592,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30672,7 +31369,7 @@
+@@ -30673,7 +31369,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30675: $i/$j" >&5
+- echo "configure: 30676: $i/$j" >&5
+ echo "configure: 31372: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30702,7 +31399,7 @@
+@@ -30703,7 +31399,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30705: $i/$j" >&5
+- echo "configure: 30706: $i/$j" >&5
+ echo "configure: 31402: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30720,7 +31417,7 @@
+@@ -30721,7 +31417,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30723: $i/$j" >&5
+- echo "configure: 30724: $i/$j" >&5
+ echo "configure: 31420: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32243,7 +32940,7 @@
+@@ -32244,7 +32940,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32246: $i/$j" >&5
+- echo "configure: 32247: $i/$j" >&5
+ echo "configure: 32943: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32501,8 +33198,7 @@
+@@ -32502,8 +33198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10641,7 +10638,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32597,8 +33293,7 @@
+@@ -32598,8 +33293,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10651,7 +10648,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32691,8 +33386,7 @@
+@@ -32692,8 +33386,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10661,16 +10658,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32764,7 +33458,7 @@
+@@ -32765,7 +33458,7 @@
do
for j in qsql.html;
do
-- echo "configure: 32767: $i/$j" >&5
+- echo "configure: 32768: $i/$j" >&5
+ echo "configure: 33461: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -32957,8 +33651,7 @@
+@@ -32958,8 +33651,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10680,7 +10677,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33108,8 +33801,7 @@
+@@ -33109,8 +33801,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10690,7 +10687,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33258,8 +33950,7 @@
+@@ -33259,8 +33950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10700,7 +10697,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33412,8 +34103,7 @@
+@@ -33413,8 +34103,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10710,7 +10707,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33567,8 +34257,7 @@
+@@ -33568,8 +34257,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10720,7 +10717,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33720,8 +34409,7 @@
+@@ -33721,8 +34409,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10730,7 +10727,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33860,8 +34548,7 @@
+@@ -33861,8 +34548,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10740,7 +10737,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33938,8 +34625,7 @@
+@@ -33939,8 +34625,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10750,7 +10747,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33968,8 +34654,7 @@
+@@ -33969,8 +34654,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10760,7 +10757,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34039,8 +34724,7 @@
+@@ -34040,8 +34724,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10770,7 +10767,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34092,8 +34776,7 @@
+@@ -34093,8 +34776,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10780,7 +10777,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34164,8 +34847,7 @@
+@@ -34165,8 +34847,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10790,7 +10787,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34217,8 +34899,7 @@
+@@ -34218,8 +34899,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10800,7 +10797,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34329,8 +35010,7 @@
+@@ -34330,8 +35010,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10810,7 +10807,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34384,9 +35064,6 @@
+@@ -34385,9 +35064,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10820,7 +10817,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34419,8 +35096,7 @@
+@@ -34420,8 +35096,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10830,7 +10827,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34523,8 +35199,7 @@
+@@ -34524,8 +35199,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10840,7 +10837,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34655,8 +35330,7 @@
+@@ -34656,8 +35330,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10850,7 +10847,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34710,9 +35384,6 @@
+@@ -34711,9 +35384,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10860,7 +10857,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34743,8 +35414,7 @@
+@@ -34744,8 +35414,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10870,7 +10867,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34845,8 +35515,7 @@
+@@ -34846,8 +35515,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10880,7 +10877,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34925,9 +35594,6 @@
+@@ -34926,9 +35594,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10890,7 +10887,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34958,8 +35624,7 @@
+@@ -34959,8 +35624,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10900,7 +10897,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35060,8 +35725,7 @@
+@@ -35061,8 +35725,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10910,7 +10907,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35140,9 +35804,6 @@
+@@ -35141,9 +35804,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10920,7 +10917,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35178,8 +35839,7 @@
+@@ -35179,8 +35839,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10930,7 +10927,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35286,8 +35946,7 @@
+@@ -35287,8 +35946,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10940,7 +10937,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35366,9 +36025,6 @@
+@@ -35367,9 +36025,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10950,7 +10947,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -35403,8 +36059,7 @@
+@@ -35404,8 +36059,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10960,7 +10957,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35509,8 +36164,7 @@
+@@ -35510,8 +36164,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10970,7 +10967,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35602,8 +36256,7 @@
+@@ -35603,8 +36256,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10980,7 +10977,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35645,8 +36298,7 @@
+@@ -35646,8 +36298,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10990,7 +10987,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35703,8 +36355,7 @@
+@@ -35704,8 +36355,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11000,7 +10997,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35863,8 +36514,7 @@
+@@ -35864,8 +36514,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11010,7 +11007,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35928,8 +36578,7 @@
+@@ -35929,8 +36578,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11020,7 +11017,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35994,8 +36643,7 @@
+@@ -35995,8 +36643,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11030,7 +11027,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36059,8 +36707,7 @@
+@@ -36060,8 +36707,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11040,7 +11037,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36136,8 +36783,7 @@
+@@ -36137,8 +36783,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11050,7 +11047,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36285,8 +36931,7 @@
+@@ -36286,8 +36931,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11060,16 +11057,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36363,7 +37008,7 @@
+@@ -36364,7 +37008,7 @@
do
for j in qsql.html;
do
-- echo "configure: 36366: $i/$j" >&5
+- echo "configure: 36367: $i/$j" >&5
+ echo "configure: 37011: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -36553,8 +37198,7 @@
+@@ -36554,8 +37198,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11079,7 +11076,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36635,8 +37279,7 @@
+@@ -36636,8 +37279,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11089,7 +11086,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37094,8 +37737,7 @@
+@@ -37095,8 +37737,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11099,7 +11096,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37165,8 +37807,7 @@
+@@ -37166,8 +37807,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11109,7 +11106,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37228,8 +37869,7 @@
+@@ -37229,8 +37869,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11119,7 +11116,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37269,8 +37909,7 @@
+@@ -37270,8 +37909,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11129,7 +11126,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37326,8 +37965,7 @@
+@@ -37327,8 +37965,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11139,7 +11136,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37367,8 +38005,7 @@
+@@ -37368,8 +38005,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11149,7 +11146,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37432,8 +38069,7 @@
+@@ -37433,8 +38069,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11159,7 +11156,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37464,10 +38100,8 @@
+@@ -37465,10 +38100,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11172,7 +11169,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37578,8 +38212,7 @@
+@@ -37579,8 +38212,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11182,7 +11179,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37641,8 +38274,7 @@
+@@ -37642,8 +38274,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11192,7 +11189,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37682,8 +38314,7 @@
+@@ -37683,8 +38314,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11202,7 +11199,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37739,8 +38370,7 @@
+@@ -37740,8 +38370,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11212,7 +11209,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37780,8 +38410,7 @@
+@@ -37781,8 +38410,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11222,7 +11219,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37845,8 +38474,7 @@
+@@ -37846,8 +38474,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11232,7 +11229,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37877,10 +38505,8 @@
+@@ -37878,10 +38505,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11245,7 +11242,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -37991,8 +38617,7 @@
+@@ -37992,8 +38617,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11255,7 +11252,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38054,8 +38679,7 @@
+@@ -38055,8 +38679,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11265,7 +11262,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38095,8 +38719,7 @@
+@@ -38096,8 +38719,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11275,7 +11272,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38152,8 +38775,7 @@
+@@ -38153,8 +38775,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11285,7 +11282,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38193,8 +38815,7 @@
+@@ -38194,8 +38815,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11295,7 +11292,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38258,8 +38879,7 @@
+@@ -38259,8 +38879,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11305,7 +11302,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38290,10 +38910,8 @@
+@@ -38291,10 +38910,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11318,7 +11315,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -38404,8 +39022,7 @@
+@@ -38405,8 +39022,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11328,7 +11325,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38467,8 +39084,7 @@
+@@ -38468,8 +39084,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11338,7 +11335,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38508,8 +39124,7 @@
+@@ -38509,8 +39124,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11348,7 +11345,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38565,8 +39180,7 @@
+@@ -38566,8 +39180,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11358,7 +11355,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38606,8 +39220,7 @@
+@@ -38607,8 +39220,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11368,7 +11365,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38671,8 +39284,7 @@
+@@ -38672,8 +39284,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11378,7 +11375,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38703,10 +39315,8 @@
+@@ -38704,10 +39315,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11391,7 +11388,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -38841,8 +39451,7 @@
+@@ -38842,8 +39451,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11401,7 +11398,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39011,8 +39620,7 @@
+@@ -39012,8 +39620,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11411,7 +11408,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39089,8 +39697,7 @@
+@@ -39090,8 +39697,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11421,7 +11418,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39249,8 +39856,7 @@
+@@ -39250,8 +39856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11431,7 +11428,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39313,8 +39919,7 @@
+@@ -39314,8 +39919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11441,7 +11438,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39396,8 +40001,7 @@
+@@ -39397,8 +40001,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11451,7 +11448,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39477,8 +40081,7 @@
+@@ -39478,8 +40081,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11461,7 +11458,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39608,8 +40211,7 @@
+@@ -39609,8 +40211,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11471,7 +11468,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39737,8 +40339,20 @@
+@@ -39738,8 +40339,20 @@
int main()
{
#if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
@@ -11494,7 +11491,7 @@
if ( maj != 1 ) {
return 1;
}
-@@ -39891,8 +40505,7 @@
+@@ -39892,8 +40505,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11504,16 +11501,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39981,7 +40594,7 @@
+@@ -39982,7 +40594,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 39984: $i/$j" >&5
+- echo "configure: 39985: $i/$j" >&5
+ echo "configure: 40597: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -40036,8 +40649,7 @@
+@@ -40037,8 +40649,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11523,7 +11520,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40353,8 +40965,7 @@
+@@ -40354,8 +40965,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11533,7 +11530,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40459,8 +41070,7 @@
+@@ -40460,8 +41070,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11543,7 +11540,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40559,8 +41169,7 @@
+@@ -40560,8 +41169,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11553,7 +11550,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40730,8 +41339,7 @@
+@@ -40731,8 +41339,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11563,7 +11560,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40798,26 +41406,21 @@
+@@ -40799,26 +41406,21 @@
@@ -11594,8 +11591,8 @@
+ # Check and setup for libmeanwhile
- PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
-@@ -40879,23 +41482,23 @@
+ PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
+@@ -40880,23 +41482,23 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -11624,7 +11621,7 @@
echo "$as_me:$LINENO: result: $MEANWHILE_LIBS" >&5
echo "${ECHO_T}$MEANWHILE_LIBS" >&6
else
-@@ -40903,7 +41506,7 @@
+@@ -40904,7 +41506,7 @@
MEANWHILE_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
@@ -11633,7 +11630,7 @@
fi
-@@ -40916,14 +41519,24 @@
+@@ -40917,14 +41519,24 @@
fi
if test $succeeded = yes; then
@@ -11661,7 +11658,7 @@
# Check and setup for GLib library
-@@ -41035,21 +41648,20 @@
+@@ -41036,21 +41648,20 @@
@@ -11683,17 +11680,17 @@
-echo $ECHO_N "checking if Sametime Plugin should be compiled... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $compile_meanwhile" >&5
-echo "${ECHO_T}$compile_meanwhile" >&6
--
--# Here we go
+# Set the flag to compile meanwhile
+-# Here we go
+-
-if test "x$compile_meanwhile" = "xyes"; then
+if test "x$enable_meanwhile" != "xno"; then
include_meanwhile_TRUE=
include_meanwhile_FALSE='#'
else
-@@ -41058,10 +41670,6 @@
+@@ -41059,10 +41670,6 @@
fi
@@ -11704,7 +11701,7 @@
# testbed protocol
# Check whether --enable-testbed or --disable-testbed was given.
if test "${enable_testbed+set}" = set; then
-@@ -41149,8 +41757,7 @@
+@@ -41150,8 +41757,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11714,7 +11711,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41192,8 +41799,7 @@
+@@ -41193,8 +41799,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11724,7 +11721,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41250,8 +41856,7 @@
+@@ -41251,8 +41856,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11734,7 +11731,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41419,8 +42024,7 @@
+@@ -41420,8 +42024,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11744,7 +11741,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41480,8 +42084,7 @@
+@@ -41481,8 +42084,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11754,7 +11751,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41554,8 +42157,7 @@
+@@ -41555,8 +42157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11764,7 +11761,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41619,8 +42221,7 @@
+@@ -41620,8 +42221,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11774,7 +11771,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41684,8 +42285,7 @@
+@@ -41685,8 +42285,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11784,7 +11781,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41750,8 +42350,7 @@
+@@ -41751,8 +42350,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11794,7 +11791,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41816,8 +42415,7 @@
+@@ -41817,8 +42415,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11804,7 +11801,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41920,8 +42518,7 @@
+@@ -41921,8 +42518,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11814,7 +11811,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42059,8 +42656,7 @@
+@@ -42060,8 +42656,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11824,7 +11821,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42126,8 +42722,7 @@
+@@ -42127,8 +42722,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11834,7 +11831,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42283,8 +42878,7 @@
+@@ -42284,8 +42878,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11844,16 +11841,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42371,7 +42965,7 @@
+@@ -42372,7 +42965,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 42374: $i/$j" >&5
+- echo "configure: 42375: $i/$j" >&5
+ echo "configure: 42968: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -42426,8 +43020,7 @@
+@@ -42427,8 +43020,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11863,7 +11860,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42659,8 +43252,7 @@
+@@ -42660,8 +43252,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11873,7 +11870,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42817,8 +43409,7 @@
+@@ -42818,8 +43409,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11883,7 +11880,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42997,8 +43588,7 @@
+@@ -42998,8 +43588,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11893,7 +11890,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43064,8 +43654,7 @@
+@@ -43065,8 +43654,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11903,7 +11900,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43214,8 +43803,7 @@
+@@ -43215,8 +43803,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11913,7 +11910,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43297,8 +43885,7 @@
+@@ -43298,8 +43885,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11923,7 +11920,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43403,8 +43990,7 @@
+@@ -43404,8 +43990,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11933,7 +11930,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43470,8 +44056,7 @@
+@@ -43471,8 +44056,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11943,7 +11940,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43517,8 +44102,7 @@
+@@ -43518,8 +44102,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11953,7 +11950,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43606,8 +44190,7 @@
+@@ -43607,8 +44190,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11963,7 +11960,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43669,8 +44252,7 @@
+@@ -43670,8 +44252,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11973,7 +11970,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43730,8 +44312,7 @@
+@@ -43731,8 +44312,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11983,7 +11980,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44744,6 +45325,13 @@
+@@ -44176,6 +44756,8 @@
+
+ ac_config_files="$ac_config_files kopete/plugins/smpppdcs/libsmpppdclient/Makefile"
+
++ ac_config_files="$ac_config_files kopete/plugins/smpppdcs/unittest/Makefile"
++
+ ac_config_files="$ac_config_files kopete/plugins/statistics/Makefile"
+
+ ac_config_files="$ac_config_files kopete/plugins/statistics/sqlite/Makefile"
+@@ -44747,6 +45329,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -11997,7 +12003,15 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -45869,6 +46457,9 @@
+@@ -45512,6 +46101,7 @@
+ "kopete/plugins/smpppdcs/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/config/Makefile" ;;
+ "kopete/plugins/smpppdcs/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/icons/Makefile" ;;
+ "kopete/plugins/smpppdcs/libsmpppdclient/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/libsmpppdclient/Makefile" ;;
++ "kopete/plugins/smpppdcs/unittest/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/smpppdcs/unittest/Makefile" ;;
+ "kopete/plugins/statistics/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/statistics/Makefile" ;;
+ "kopete/plugins/statistics/sqlite/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/statistics/sqlite/Makefile" ;;
+ "kopete/plugins/texteffect/Makefile" ) CONFIG_FILES="$CONFIG_FILES kopete/plugins/texteffect/Makefile" ;;
+@@ -45873,6 +46463,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -12007,7 +12021,7 @@
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -46307,11 +46898,6 @@
+@@ -46311,11 +46904,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -12019,7 +12033,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -46350,6 +46936,12 @@
+@@ -46354,6 +46942,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -12036,24 +12050,14 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdenetwork, "3.5.0") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdenetwork, "3.5.1") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-@@ -214,7 +216,8 @@
-
- KOPETE_INCLUDES='-I$(top_srcdir)/kopete/libkopete -I$(top_builddir)/kopete/libkopete -I$(top_srcdir)/kopete/libkopete/avdevice -I$(top_srcdir)/kopete/libkopete/ui -I$(top_builddir)/kopete/libkopete/ui'
-
--AC_ARG_ENABLE(smpppd, [ --enable-smpppd enable support for smpppd],
-+AC_ARG_ENABLE(smpppd,
-+[AC_HELP_STRING([--enable-smpppd], [enable support for the SuSE Meta PPP Daemon (smpppd) (default is NO)])],
- [
- if test $enableval = yes; then
- AC_DEFINE(USE_SMPPPD, 1, [enable support for the smpppd])
-@@ -526,8 +529,20 @@
+@@ -527,8 +529,20 @@
int main()
{
#if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
@@ -12076,7 +12080,7 @@
if ( maj != 1 ) {
return 1;
}
-@@ -646,28 +661,32 @@
+@@ -647,28 +661,32 @@
AC_SUBST(IDN_CPPFLAGS)
AC_SUBST(IDN_LIBS)
@@ -12124,7 +12128,7 @@
AC_SUBST(MEANWHILE_CFLAGS)
AC_SUBST(MEANWHILE_LIBS)
-@@ -680,21 +699,15 @@
+@@ -681,21 +699,15 @@
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
@@ -12153,6 +12157,14 @@
# testbed protocol
dnl define the configure option that disables testbed protocol
+@@ -1112,6 +1124,7 @@
+ AC_CONFIG_FILES([ kopete/plugins/smpppdcs/config/Makefile ])
+ AC_CONFIG_FILES([ kopete/plugins/smpppdcs/icons/Makefile ])
+ AC_CONFIG_FILES([ kopete/plugins/smpppdcs/libsmpppdclient/Makefile ])
++AC_CONFIG_FILES([ kopete/plugins/smpppdcs/unittest/Makefile ])
+ AC_CONFIG_FILES([ kopete/plugins/statistics/Makefile ])
+ AC_CONFIG_FILES([ kopete/plugins/statistics/sqlite/Makefile ])
+ AC_CONFIG_FILES([ kopete/plugins/texteffect/Makefile ])
--- dcoprss/Makefile.in
+++ dcoprss/Makefile.in
@@ -265,6 +265,9 @@
@@ -16393,22 +16405,176 @@
echo "#define KDE_USE_FINAL 1" >> kopete_nowlistening_la.all_cpp.final; \
--- kopete/plugins/smpppdcs/config/Makefile.in
+++ kopete/plugins/smpppdcs/config/Makefile.in
-@@ -64,12 +64,12 @@
- kcm_kopete_smpppdcs_la_DEPENDENCIES = ../../../libkopete/libkopete.la \
- $(am__DEPENDENCIES_1)
- am_kcm_kopete_smpppdcs_la_OBJECTS = smpppdcspreferences.lo \
-- smpppdsearcher.lo smpppdcsprefsimpl.lo
+@@ -247,6 +247,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -460,7 +463,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -498,9 +501,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+--- kopete/plugins/smpppdcs/icons/Makefile.in
++++ kopete/plugins/smpppdcs/icons/Makefile.in
+@@ -196,6 +196,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -394,7 +397,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -432,9 +435,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+--- kopete/plugins/smpppdcs/libsmpppdclient/Makefile.in
++++ kopete/plugins/smpppdcs/libsmpppdclient/Makefile.in
+@@ -234,6 +234,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -439,7 +442,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -477,9 +480,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ clean-noinstLTLIBRARIES:
+--- kopete/plugins/smpppdcs/Makefile.in
++++ kopete/plugins/smpppdcs/Makefile.in
+@@ -57,19 +57,34 @@
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(servicedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kcmdir)" \
++ "$(DESTDIR)$(kde_kcfgdir)" "$(DESTDIR)$(servicedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++kcm_kopete_smpppdcs_la_DEPENDENCIES = \
++ libsmpppdclient/libsmpppdclient.la \
++ ../../libkopete/libkopete.la $(am__DEPENDENCIES_1)
++am_kcm_kopete_smpppdcs_la_OBJECTS = smpppdcspreferences.lo \
+ smpppdsearcher.lo smpppdcsprefsimpl.lo smpppdlocationwidget.lo
- #>- kcm_kopete_smpppdcs_la_OBJECTS = $(am_kcm_kopete_smpppdcs_la_OBJECTS)
- #>+ 5
- kcm_kopete_smpppdcs_la_final_OBJECTS = kcm_kopete_smpppdcs_la.all_cpp.lo
- kcm_kopete_smpppdcs_la_nofinal_OBJECTS = smpppdcspreferences.lo \
-- smpppdsearcher.lo smpppdcsprefsimpl.lo smpppdcsprefs.lo
-+ smpppdsearcher.lo smpppdcsprefsimpl.lo smpppdlocationwidget.lo smpppdcsprefs.lo smpppdlocationui.lo
- @KDE_USE_FINAL_FALSE at kcm_kopete_smpppdcs_la_OBJECTS = $(kcm_kopete_smpppdcs_la_nofinal_OBJECTS)
- @KDE_USE_FINAL_TRUE at kcm_kopete_smpppdcs_la_OBJECTS = $(kcm_kopete_smpppdcs_la_final_OBJECTS)
++#>- kcm_kopete_smpppdcs_la_OBJECTS = $(am_kcm_kopete_smpppdcs_la_OBJECTS)
++#>+ 5
++kcm_kopete_smpppdcs_la_final_OBJECTS = kcm_kopete_smpppdcs_la.all_cpp.lo
++kcm_kopete_smpppdcs_la_nofinal_OBJECTS = smpppdcspreferences.lo \
++ smpppdsearcher.lo smpppdcsprefsimpl.lo smpppdlocationwidget.lo smpppdcsprefs.lo smpppdlocationui.lo smpppdcsconfig.lo
++ at KDE_USE_FINAL_FALSE@kcm_kopete_smpppdcs_la_OBJECTS = $(kcm_kopete_smpppdcs_la_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@kcm_kopete_smpppdcs_la_OBJECTS = $(kcm_kopete_smpppdcs_la_final_OBJECTS)
+ kopete_smpppdcs_la_DEPENDENCIES = libsmpppdclient/libsmpppdclient.la \
+ ../../libkopete/libkopete.la
+ am_kopete_smpppdcs_la_OBJECTS = smpppdcsplugin.lo onlineinquiry.lo \
+- detectordcop.lo detectorsmpppd.lo detectornetstat.lo
++ detectordcop.lo detectorsmpppd.lo detectornetstat.lo \
++ detectornetworkstatus.lo
+ #>- kopete_smpppdcs_la_OBJECTS = $(am_kopete_smpppdcs_la_OBJECTS)
+-#>+ 5
++#>+ 6
+ kopete_smpppdcs_la_final_OBJECTS = kopete_smpppdcs_la.all_cpp.lo
+ kopete_smpppdcs_la_nofinal_OBJECTS = smpppdcsplugin.lo onlineinquiry.lo \
+- detectordcop.lo detectorsmpppd.lo detectornetstat.lo smpppdcsiface_skel.lo
++ detectordcop.lo detectorsmpppd.lo detectornetstat.lo \
++ detectornetworkstatus.lo kinternetiface_stub.lo smpppdcsiface_skel.lo smpppdcsconfig.lo
+ @KDE_USE_FINAL_FALSE at kopete_smpppdcs_la_OBJECTS = $(kopete_smpppdcs_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE at kopete_smpppdcs_la_OBJECTS = $(kopete_smpppdcs_la_final_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -247,6 +247,9 @@
+@@ -93,8 +108,10 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kopete_smpppdcs_la_SOURCES)
+-DIST_SOURCES = $(kopete_smpppdcs_la_SOURCES)
++SOURCES = $(kcm_kopete_smpppdcs_la_SOURCES) \
++ $(kopete_smpppdcs_la_SOURCES)
++DIST_SOURCES = $(kcm_kopete_smpppdcs_la_SOURCES) \
++ $(kopete_smpppdcs_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ #>- html-recursive info-recursive install-data-recursive \
+ #>- install-exec-recursive install-info-recursive \
+@@ -108,12 +125,14 @@
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive nmcheck-recursive bcheck-recursive
++kcmDATA_INSTALL = $(INSTALL_DATA)
++kde_kcfgDATA_INSTALL = $(INSTALL_DATA)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(service_DATA)
++DATA = $(kcm_DATA) $(kde_kcfg_DATA) $(service_DATA)
+ HEADERS = $(noinst_HEADERS)
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = icons libsmpppdclient config
++DIST_SUBDIRS = $(SUBDIRS)
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 1
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+@@ -261,6 +280,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16418,28 +16584,62 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,10 +445,10 @@
- AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
- kde_module_LTLIBRARIES = kcm_kopete_smpppdcs.la
- #>- kcm_kopete_smpppdcs_la_SOURCES = smpppdcsprefs.ui smpppdcspreferences.cpp \
--#>- smpppdsearcher.cpp smpppdcsprefsimpl.cpp
-+#>- smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdlocationui.ui smpppdlocationwidget.cpp
- #>+ 2
- kcm_kopete_smpppdcs_la_SOURCES= smpppdcspreferences.cpp \
-- smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdcsprefs.cpp
-+ smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdlocationwidget.cpp smpppdcsprefs.cpp smpppdlocationui.cpp
+@@ -452,26 +474,45 @@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+- at include_smpppdcs_TRUE@SMPPPDCS_SUBDIR = config
+ #>- METASOURCES = AUTO
+-SUBDIRS = icons libsmpppdclient $(SMPPPDCS_SUBDIR)
++SUBDIRS = icons libsmpppdclient unittest
+ EXTRA_DIST = Changelog.smpppdcs
+ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes) -Ilibsmpppdclient
+-kde_module_LTLIBRARIES = kopete_smpppdcs.la
+-#>- kopete_smpppdcs_la_SOURCES = smpppdcsplugin.cpp onlineinquiry.cpp \
+-#>- smpppdcsiface.skel detectordcop.cpp detectorsmpppd.cpp detectornetstat.cpp
+-#>+ 2
+-kopete_smpppdcs_la_SOURCES=smpppdcsplugin.cpp onlineinquiry.cpp \
+- detectordcop.cpp detectorsmpppd.cpp detectornetstat.cpp smpppdcsiface_skel.cpp
++kde_module_LTLIBRARIES = kopete_smpppdcs.la kcm_kopete_smpppdcs.la
++#>- kopete_smpppdcs_la_SOURCES = kinternetiface.stub smpppdcsplugin.cpp \
++#>- onlineinquiry.cpp smpppdcsiface.skel detectordcop.cpp detectorsmpppd.cpp \
++#>- detectornetstat.cpp detectornetworkstatus.cpp smpppdcsconfig.kcfgc
++#>+ 3
++kopete_smpppdcs_la_SOURCES= smpppdcsplugin.cpp \
++ onlineinquiry.cpp detectordcop.cpp detectorsmpppd.cpp \
++ detectornetstat.cpp detectornetworkstatus.cpp kinternetiface_stub.cpp smpppdcsiface_skel.cpp smpppdcsconfig.cpp
- #>- kcm_kopete_smpppdcs_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+ kopete_smpppdcs_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+ kopete_smpppdcs_la_LIBADD = \
+ libsmpppdclient/libsmpppdclient.la ../../libkopete/libkopete.la
+
++#>- kcm_kopete_smpppdcs_la_SOURCES = smpppdcsprefs.ui smpppdcspreferences.cpp \
++#>- smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdlocationui.ui smpppdlocationwidget.cpp \
++#>- smpppdcsconfig.kcfgc
++#>+ 3
++kcm_kopete_smpppdcs_la_SOURCES= smpppdcspreferences.cpp \
++ smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdlocationwidget.cpp \
++ smpppdcsprefs.cpp smpppdlocationui.cpp smpppdcsconfig.cpp
++
++#>- kcm_kopete_smpppdcs_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
++#>+ 1
++kcm_kopete_smpppdcs_la_LDFLAGS = -module -no-undefined $(KDE_NO_UNDEFINED) $(KDE_PLUGIN) $(all_libraries)
++kcm_kopete_smpppdcs_la_LIBADD = libsmpppdclient/libsmpppdclient.la \
++ ../../libkopete/libkopete.la $(LIB_KUTILS)
++
+ service_DATA = kopete_smpppdcs.desktop
+ servicedir = $(kde_servicesdir)
++kcm_DATA = kopete_smpppdcs_config.desktop
++kcmdir = $(kde_servicesdir)/kconfiguredialog
++kde_kcfg_DATA = smpppdcs.kcfg
+ noinst_HEADERS = smpppdcsiface.h detectordcop.h detectorsmpppd.h \
+- detectornetstat.h
++ detectornetstat.h kinternetiface.h detectornetworkstatus.h \
++ smpppdsearcher.h smpppdcsprefsimpl.h smpppdlocationwidget.h
+
+ #>- all: all-recursive
#>+ 1
-@@ -453,14 +456,14 @@
- kcm_kopete_smpppdcs_la_LIBADD = ../../../libkopete/libkopete.la $(LIB_KUTILS)
- kcm_DATA = kopete_smpppdcs_config.desktop
- kcmdir = $(kde_servicesdir)/kconfiguredialog
--noinst_HEADERS = smpppdsearcher.h smpppdcsprefsimpl.h
-+noinst_HEADERS = smpppdsearcher.h smpppdcsprefsimpl.h smpppdlocationwidget.h
- #>- all: all-am
- #>+ 1
- all: docs-am all-am
+@@ -479,7 +520,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16448,7 +16648,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -517,9 +558,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16460,18 +16660,185 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -543,6 +546,7 @@
+@@ -548,6 +589,11 @@
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
++#>- kcm_kopete_smpppdcs.la: $(kcm_kopete_smpppdcs_la_OBJECTS) $(kcm_kopete_smpppdcs_la_DEPENDENCIES)
++#>+ 2
++ at KDE_USE_CLOSURE_TRUE@kcm_kopete_smpppdcs.la: kcm_kopete_smpppdcs.la.closure $(kcm_kopete_smpppdcs_la_OBJECTS) $(kcm_kopete_smpppdcs_la_DEPENDENCIES)
++ at KDE_USE_CLOSURE_FALSE@kcm_kopete_smpppdcs.la: $(kcm_kopete_smpppdcs_la_OBJECTS) $(kcm_kopete_smpppdcs_la_DEPENDENCIES)
++ $(CXXLINK) -rpath $(kde_moduledir) $(kcm_kopete_smpppdcs_la_LDFLAGS) $(kcm_kopete_smpppdcs_la_OBJECTS) $(kcm_kopete_smpppdcs_la_LIBADD) $(LIBS)
+ #>- kopete_smpppdcs.la: $(kopete_smpppdcs_la_OBJECTS) $(kopete_smpppdcs_la_DEPENDENCIES)
+ #>+ 2
+ @KDE_USE_CLOSURE_TRUE at kopete_smpppdcs.la: kopete_smpppdcs.la.closure $(kopete_smpppdcs_la_OBJECTS) $(kopete_smpppdcs_la_DEPENDENCIES)
+@@ -562,9 +608,14 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdcspreferences.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdcsprefsimpl.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/detectordcop.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/detectornetstat.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/detectornetworkstatus.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/detectorsmpppd.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/onlineinquiry.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdcsplugin.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdcspreferences.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdcsprefsimpl.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdlocationwidget.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdsearcher.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdsearcher.Plo at am__quote@
.cpp.o:
-@@ -801,6 +805,13 @@
- mocs: smpppdcspreferences.moc
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@@ -596,6 +647,40 @@
+ distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
++install-kcmDATA: $(kcm_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(kcmdir)" || $(mkdir_p) "$(DESTDIR)$(kcmdir)"
++ @list='$(kcm_DATA)'; for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ f=$(am__strip_dir) \
++ echo " $(kcmDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kcmdir)/$$f'"; \
++ $(kcmDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kcmdir)/$$f"; \
++ done
++
++uninstall-kcmDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(kcm_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(kcmdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(kcmdir)/$$f"; \
++ done
++install-kde_kcfgDATA: $(kde_kcfg_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(kde_kcfgdir)" || $(mkdir_p) "$(DESTDIR)$(kde_kcfgdir)"
++ @list='$(kde_kcfg_DATA)'; for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ f=$(am__strip_dir) \
++ echo " $(kde_kcfgDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_kcfgdir)/$$f'"; \
++ $(kde_kcfgDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_kcfgdir)/$$f"; \
++ done
++
++uninstall-kde_kcfgDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(kde_kcfg_DATA)'; for p in $$list; do \
++ f=$(am__strip_dir) \
++ echo " rm -f '$(DESTDIR)$(kde_kcfgdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(kde_kcfgdir)/$$f"; \
++ done
+ install-serviceDATA: $(service_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+@@ -793,7 +878,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"; do \
++ for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kcmdir)" "$(DESTDIR)$(kde_kcfgdir)" "$(DESTDIR)$(servicedir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-recursive
+@@ -827,7 +912,7 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ #>- mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-idl clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
++clean-am: clean-metasources clean-idl clean-ui clean-kcfg clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
+ mostlyclean-am
+ distclean: distclean-recursive
+@@ -846,9 +931,11 @@
+
+ info-am:
+
+-#>- install-data-am: install-kde_moduleLTLIBRARIES install-serviceDATA
+-#>+ 1
+-install-data-am: install-serviceDATA
++#>- install-data-am: install-kcmDATA install-kde_kcfgDATA \
++#>- install-kde_moduleLTLIBRARIES install-serviceDATA
++#>+ 2
++install-data-am: install-kcmDATA install-kde_kcfgDATA \
++ install-serviceDATA
+
+ #>- install-exec-am:
+ #>+ 1
+@@ -878,7 +965,8 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
++uninstall-am: uninstall-info-am uninstall-kcmDATA \
++ uninstall-kde_kcfgDATA uninstall-kde_moduleLTLIBRARIES \
+ uninstall-serviceDATA
+
+ uninstall-info: uninstall-info-recursive
+@@ -890,35 +978,44 @@
+ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+- install-info-am install-kde_moduleLTLIBRARIES install-man \
+- install-serviceDATA install-strip installcheck installcheck-am \
+- installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-info-am \
++ install-info-am install-kcmDATA install-kde_kcfgDATA \
++ install-kde_moduleLTLIBRARIES install-man install-serviceDATA \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am maintainer-clean maintainer-clean-generic \
++ maintainer-clean-recursive mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
++ uninstall-info-am uninstall-kcmDATA uninstall-kde_kcfgDATA \
+ uninstall-kde_moduleLTLIBRARIES uninstall-serviceDATA
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+
+-#>+ 5
+-smpppdcsiface.kidl: $(srcdir)/smpppdcsiface.h $(DCOP_DEPENDENCIES)
+- $(DCOPIDL) $(srcdir)/smpppdcsiface.h > smpppdcsiface.kidl || ( rm -f smpppdcsiface.kidl ; false )
+-smpppdcsiface_skel.cpp: smpppdcsiface.kidl
+- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub smpppdcsiface.kidl
+-
+ #>+ 8
+-kopete_smpppdcs.la.closure: $(kopete_smpppdcs_la_OBJECTS) $(kopete_smpppdcs_la_DEPENDENCIES)
+- @echo "int main() {return 0;}" > kopete_smpppdcs_la_closure.cpp
+- @$(LTCXXCOMPILE) -c kopete_smpppdcs_la_closure.cpp
+- $(CXXLINK) kopete_smpppdcs_la_closure.lo $(kopete_smpppdcs_la_LDFLAGS) $(kopete_smpppdcs_la_OBJECTS) $(kopete_smpppdcs_la_LIBADD) $(LIBS)
+- @rm -f kopete_smpppdcs_la_closure.* kopete_smpppdcs.la.closure
+- @echo "timestamp" > kopete_smpppdcs.la.closure
++kcm_kopete_smpppdcs.la.closure: $(kcm_kopete_smpppdcs_la_OBJECTS) $(kcm_kopete_smpppdcs_la_DEPENDENCIES)
++ @echo "int main() {return 0;}" > kcm_kopete_smpppdcs_la_closure.cpp
++ @$(LTCXXCOMPILE) -c kcm_kopete_smpppdcs_la_closure.cpp
++ $(CXXLINK) kcm_kopete_smpppdcs_la_closure.lo $(kcm_kopete_smpppdcs_la_LDFLAGS) $(kcm_kopete_smpppdcs_la_OBJECTS) $(kcm_kopete_smpppdcs_la_LIBADD) $(LIBS)
++ @rm -f kcm_kopete_smpppdcs_la_closure.* kcm_kopete_smpppdcs.la.closure
++ @echo "timestamp" > kcm_kopete_smpppdcs.la.closure
+
+
#>+ 3
++smpppdcsprefsimpl.moc: $(srcdir)/smpppdcsprefsimpl.h
++ $(MOC) $(srcdir)/smpppdcsprefsimpl.h -o smpppdcsprefsimpl.moc
++
++#>+ 2
++mocs: smpppdcsprefsimpl.moc
++
++#>+ 3
++smpppdcspreferences.moc: $(srcdir)/smpppdcspreferences.h
++ $(MOC) $(srcdir)/smpppdcspreferences.h -o smpppdcspreferences.moc
++
++#>+ 2
++mocs: smpppdcspreferences.moc
++
++#>+ 3
+ detectornetstat.moc: $(srcdir)/detectornetstat.h
+ $(MOC) $(srcdir)/detectornetstat.h -o detectornetstat.moc
+
+@@ -926,6 +1023,13 @@
+ mocs: detectornetstat.moc
+
+ #>+ 3
+smpppdlocationwidget.moc: $(srcdir)/smpppdlocationwidget.h
+ $(MOC) $(srcdir)/smpppdlocationwidget.h -o smpppdlocationwidget.moc
+
@@ -16479,73 +16846,170 @@
+mocs: smpppdlocationwidget.moc
+
+#>+ 3
- smpppdsearcher.moc: $(srcdir)/smpppdsearcher.h
- $(MOC) $(srcdir)/smpppdsearcher.h -o smpppdsearcher.moc
+ smpppdcsplugin.moc: $(srcdir)/smpppdcsplugin.h
+ $(MOC) $(srcdir)/smpppdcsplugin.h -o smpppdcsplugin.moc
-@@ -809,15 +820,16 @@
+@@ -933,20 +1037,66 @@
+ mocs: smpppdcsplugin.moc
#>+ 3
++detectornetworkstatus.moc: $(srcdir)/detectornetworkstatus.h
++ $(MOC) $(srcdir)/detectornetworkstatus.h -o detectornetworkstatus.moc
++
++#>+ 2
++mocs: detectornetworkstatus.moc
++
++#>+ 3
++smpppdsearcher.moc: $(srcdir)/smpppdsearcher.h
++ $(MOC) $(srcdir)/smpppdsearcher.h -o smpppdsearcher.moc
++
++#>+ 2
++mocs: smpppdsearcher.moc
++
++#>+ 9
++kinternetiface.kidl: $(srcdir)/kinternetiface.h $(DCOP_DEPENDENCIES)
++ $(DCOPIDL) $(srcdir)/kinternetiface.h > kinternetiface.kidl || ( rm -f kinternetiface.kidl ; false )
++kinternetiface_stub.h: kinternetiface.kidl
++ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel kinternetiface.kidl
++smpppdcsiface.kidl: $(srcdir)/smpppdcsiface.h $(DCOP_DEPENDENCIES)
++ $(DCOPIDL) $(srcdir)/smpppdcsiface.h > smpppdcsiface.kidl || ( rm -f smpppdcsiface.kidl ; false )
++smpppdcsiface_skel.cpp: smpppdcsiface.kidl
++ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub smpppdcsiface.kidl
++
++#>+ 8
++kopete_smpppdcs.la.closure: $(kopete_smpppdcs_la_OBJECTS) $(kopete_smpppdcs_la_DEPENDENCIES)
++ @echo "int main() {return 0;}" > kopete_smpppdcs_la_closure.cpp
++ @$(LTCXXCOMPILE) -c kopete_smpppdcs_la_closure.cpp
++ $(CXXLINK) kopete_smpppdcs_la_closure.lo $(kopete_smpppdcs_la_LDFLAGS) $(kopete_smpppdcs_la_OBJECTS) $(kopete_smpppdcs_la_LIBADD) $(LIBS)
++ @rm -f kopete_smpppdcs_la_closure.* kopete_smpppdcs.la.closure
++ @echo "timestamp" > kopete_smpppdcs.la.closure
++
++
++#>+ 3
clean-metasources:
-- -rm -f smpppdcsprefsimpl.moc smpppdcspreferences.moc smpppdsearcher.moc
-+ -rm -f smpppdcsprefsimpl.moc smpppdcspreferences.moc smpppdlocationwidget.moc smpppdsearcher.moc
+- -rm -f detectornetstat.moc smpppdcsplugin.moc
++ -rm -f smpppdcsprefsimpl.moc smpppdcspreferences.moc detectornetstat.moc smpppdlocationwidget.moc smpppdcsplugin.moc detectornetworkstatus.moc smpppdsearcher.moc
#>+ 2
--KDE_DIST=kopete_smpppdcs_config.desktop smpppdcspreferences.h smpppdcsprefs.ui Makefile.in Makefile.am
-+KDE_DIST=kopete_smpppdcs_config.desktop smpppdlocationui.ui smpppdcspreferences.h smpppdcsprefs.ui Makefile.in Makefile.am
+-KDE_DIST=onlineinquiry.h kopete_smpppdcs.desktop iconnector.h Makefile.in detector.h smpppdcsplugin.h Makefile.am
++KDE_DIST=kopete_smpppdcs_config.desktop smpppdcsconfig.kcfgc smpppdlocationui.ui onlineinquiry.h smpppdcspreferences.h smpppdcsprefs.ui kopete_smpppdcs.desktop iconnector.h smpppdcs.kcfg Makefile.in detector.h smpppdcsplugin.h Makefile.am
-#>+ 4
+#>+ 5
- clean-ui:
+ clean-idl:
-rm -f \
-- smpppdcsprefs.cpp smpppdcsprefs.h smpppdcsprefs.moc
++ kinternetiface_stub.cpp kinternetiface_stub.h kinternetiface.kidl \
+ smpppdcsiface_skel.cpp smpppdcsiface_skel.h smpppdcsiface.kidl
+
++#>+ 5
++clean-ui:
++ -rm -f \
+ smpppdcsprefs.cpp smpppdcsprefs.h smpppdcsprefs.moc \
+ smpppdlocationui.cpp smpppdlocationui.h smpppdlocationui.moc
-
++
++#>+ 5
++clean-kcfg:
++ -rm -f \
++ smpppdcsconfig.cpp smpppdcsconfig.h \
++ smpppdcsconfig.cpp smpppdcsconfig.h
++
#>+ 3
clean-closures:
-@@ -865,11 +877,11 @@
+- -rm -f kopete_smpppdcs.la.closure
++ -rm -f kcm_kopete_smpppdcs.la.closure kopete_smpppdcs.la.closure
+ #>+ 2
+ docs-am:
+@@ -990,11 +1140,23 @@
+
#>+ 11
--kcm_kopete_smpppdcs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smpppdcspreferences.cpp $(srcdir)/smpppdsearcher.cpp $(srcdir)/smpppdcsprefsimpl.cpp smpppdcsprefs.cpp smpppdcspreferences.moc smpppdcsprefsimpl.moc smpppdsearcher.moc smpppdcsprefs.moc
-+kcm_kopete_smpppdcs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smpppdcspreferences.cpp $(srcdir)/smpppdsearcher.cpp $(srcdir)/smpppdcsprefsimpl.cpp $(srcdir)/smpppdlocationwidget.cpp smpppdcsprefs.cpp smpppdlocationui.cpp smpppdcspreferences.moc smpppdcsprefsimpl.moc smpppdlocationwidget.moc smpppdlocationui.moc smpppdsearcher.moc smpppdcsprefs.moc
- @echo 'creating kcm_kopete_smpppdcs_la.all_cpp.cpp ...'; \
- rm -f kcm_kopete_smpppdcs_la.all_cpp.files kcm_kopete_smpppdcs_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kcm_kopete_smpppdcs_la.all_cpp.final; \
-- for file in smpppdcspreferences.cpp smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdcsprefs.cpp ; do \
-+ for file in smpppdcspreferences.cpp smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdlocationwidget.cpp smpppdcsprefs.cpp smpppdlocationui.cpp ; do \
- echo "#include \"$$file\"" >> kcm_kopete_smpppdcs_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcm_kopete_smpppdcs_la.all_cpp.final; \
+-kopete_smpppdcs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smpppdcsplugin.cpp $(srcdir)/onlineinquiry.cpp $(srcdir)/detectordcop.cpp $(srcdir)/detectorsmpppd.cpp $(srcdir)/detectornetstat.cpp smpppdcsiface_skel.cpp detectornetstat.moc smpppdcsplugin.moc
++kcm_kopete_smpppdcs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smpppdcspreferences.cpp $(srcdir)/smpppdsearcher.cpp $(srcdir)/smpppdcsprefsimpl.cpp $(srcdir)/smpppdlocationwidget.cpp smpppdcsprefs.cpp smpppdlocationui.cpp smpppdcsconfig.cpp smpppdsearcher.moc smpppdcsprefsimpl.moc smpppdcspreferences.moc smpppdlocationui.moc smpppdlocationwidget.moc smpppdcsprefs.moc
++ @echo 'creating kcm_kopete_smpppdcs_la.all_cpp.cpp ...'; \
++ rm -f kcm_kopete_smpppdcs_la.all_cpp.files kcm_kopete_smpppdcs_la.all_cpp.final; \
++ echo "#define KDE_USE_FINAL 1" >> kcm_kopete_smpppdcs_la.all_cpp.final; \
++ for file in smpppdcspreferences.cpp smpppdsearcher.cpp smpppdcsprefsimpl.cpp smpppdlocationwidget.cpp smpppdcsprefs.cpp smpppdlocationui.cpp smpppdcsconfig.cpp ; do \
++ echo "#include \"$$file\"" >> kcm_kopete_smpppdcs_la.all_cpp.files; \
++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcm_kopete_smpppdcs_la.all_cpp.final; \
++ done; \
++ cat kcm_kopete_smpppdcs_la.all_cpp.final kcm_kopete_smpppdcs_la.all_cpp.files > kcm_kopete_smpppdcs_la.all_cpp.cpp; \
++ rm -f kcm_kopete_smpppdcs_la.all_cpp.final kcm_kopete_smpppdcs_la.all_cpp.files
++
++#>+ 11
++kopete_smpppdcs_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smpppdcsplugin.cpp $(srcdir)/onlineinquiry.cpp $(srcdir)/detectordcop.cpp $(srcdir)/detectorsmpppd.cpp $(srcdir)/detectornetstat.cpp $(srcdir)/detectornetworkstatus.cpp kinternetiface_stub.cpp smpppdcsiface_skel.cpp smpppdcsconfig.cpp detectornetstat.moc smpppdcsplugin.moc detectornetworkstatus.moc
+ @echo 'creating kopete_smpppdcs_la.all_cpp.cpp ...'; \
+ rm -f kopete_smpppdcs_la.all_cpp.files kopete_smpppdcs_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_smpppdcs_la.all_cpp.final; \
+- for file in smpppdcsplugin.cpp onlineinquiry.cpp detectordcop.cpp detectorsmpppd.cpp detectornetstat.cpp smpppdcsiface_skel.cpp ; do \
++ for file in smpppdcsplugin.cpp onlineinquiry.cpp detectordcop.cpp detectorsmpppd.cpp detectornetstat.cpp detectornetworkstatus.cpp kinternetiface_stub.cpp smpppdcsiface_skel.cpp smpppdcsconfig.cpp ; do \
+ echo "#include \"$$file\"" >> kopete_smpppdcs_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kopete_smpppdcs_la.all_cpp.final; \
done; \
-@@ -900,20 +912,38 @@
+@@ -1003,32 +1165,90 @@
+
+ #>+ 3
+ clean-final:
+- -rm -f kopete_smpppdcs_la.all_cpp.cpp
++ -rm -f kcm_kopete_smpppdcs_la.all_cpp.cpp kopete_smpppdcs_la.all_cpp.cpp
+
+ #>+ 3
+ final:
+- $(MAKE) kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_final_OBJECTS)" all-am
++ $(MAKE) kcm_kopete_smpppdcs_la_OBJECTS="$(kcm_kopete_smpppdcs_la_final_OBJECTS)" kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_final_OBJECTS)" all-am
+
+ #>+ 3
+ final-install:
+- $(MAKE) kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_final_OBJECTS)" install-am
++ $(MAKE) kcm_kopete_smpppdcs_la_OBJECTS="$(kcm_kopete_smpppdcs_la_final_OBJECTS)" kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_final_OBJECTS)" install-am
+
+ #>+ 3
+ no-final:
+- $(MAKE) kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_nofinal_OBJECTS)" all-am
++ $(MAKE) kcm_kopete_smpppdcs_la_OBJECTS="$(kcm_kopete_smpppdcs_la_nofinal_OBJECTS)" kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_nofinal_OBJECTS)" all-am
+
+ #>+ 3
+ no-final-install:
+- $(MAKE) kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_nofinal_OBJECTS)" install-am
++ $(MAKE) kcm_kopete_smpppdcs_la_OBJECTS="$(kcm_kopete_smpppdcs_la_nofinal_OBJECTS)" kopete_smpppdcs_la_OBJECTS="$(kopete_smpppdcs_la_nofinal_OBJECTS)" install-am
+
+ #>+ 3
kde-rpo-clean:
-rm -f *.rpo
--#>+ 12
+-#>+ 7
-nmcheck:
-+#>+ 15
-+$(srcdir)/smpppdcsprefsimpl.cpp: smpppdcsprefs.h smpppdlocationui.h
++#>+ 28
++$(srcdir)/detectorsmpppd.cpp: kinternetiface_stub.h smpppdcsconfig.h
+ smpppdcsplugin.o: smpppdcsplugin.moc
++$(srcdir)/smpppdcsprefsimpl.cpp: smpppdcsprefs.h smpppdlocationui.h smpppdcsconfig.h
+ smpppdcsplugin.lo: smpppdcsplugin.moc
+smpppdlocationwidget.lo: smpppdlocationwidget.moc
+smpppdcsprefsimpl.lo: smpppdcsprefsimpl.moc
++$(srcdir)/detectornetstat.cpp: kinternetiface_stub.h smpppdcsconfig.h
+smpppdlocationwidget.o: smpppdlocationwidget.moc
-+$(srcdir)/smpppdcspreferences.cpp: smpppdcsprefs.h smpppdlocationui.h
++detectornetstat.lo: detectornetstat.moc
++$(srcdir)/detectornetworkstatus.cpp: kinternetiface_stub.h smpppdcsconfig.h
++$(srcdir)/smpppdcspreferences.cpp: smpppdcsprefs.h smpppdlocationui.h smpppdcsconfig.h
++$(srcdir)/onlineinquiry.cpp: kinternetiface_stub.h smpppdcsconfig.h
++kinternetiface_stub.cpp: kinternetiface_stub.h
+smpppdcspreferences.lo: smpppdcspreferences.moc
- smpppdsearcher.lo: smpppdsearcher.moc
--$(srcdir)/smpppdsearcher.cpp: smpppdcsprefs.h
--$(srcdir)/smpppdcsprefsimpl.cpp: smpppdcsprefs.h
++$(srcdir)/smpppdcsplugin.cpp: kinternetiface_stub.h smpppdcsconfig.h
+nmcheck:
- smpppdsearcher.o: smpppdsearcher.moc
--smpppdcsprefsimpl.lo: smpppdcsprefsimpl.moc
-+$(srcdir)/smpppdsearcher.cpp: smpppdcsprefs.h smpppdlocationui.h
- smpppdcsprefsimpl.o: smpppdcsprefsimpl.moc
++smpppdsearcher.lo: smpppdsearcher.moc
++detectornetworkstatus.lo: detectornetworkstatus.moc
++smpppdsearcher.o: smpppdsearcher.moc
++$(srcdir)/smpppdsearcher.cpp: smpppdcsprefs.h smpppdlocationui.h smpppdcsconfig.h
++smpppdcsprefsimpl.o: smpppdcsprefsimpl.moc
+ detectornetstat.o: detectornetstat.moc
nmcheck-am: nmcheck
--$(srcdir)/smpppdcspreferences.cpp: smpppdcsprefs.h
-+$(srcdir)/smpppdlocationwidget.cpp: smpppdcsprefs.h smpppdlocationui.h
- smpppdcspreferences.o: smpppdcspreferences.moc
--smpppdcspreferences.lo: smpppdcspreferences.moc
-
--#>+ 15
-+#>+ 30
+-detectornetstat.lo: detectornetstat.moc
++$(srcdir)/detectordcop.cpp: kinternetiface_stub.h smpppdcsconfig.h
++$(srcdir)/smpppdlocationwidget.cpp: smpppdcsprefs.h smpppdlocationui.h smpppdcsconfig.h
++detectornetworkstatus.o: detectornetworkstatus.moc
++smpppdcspreferences.o: smpppdcspreferences.moc
++
++#>+ 36
+smpppdlocationui.cpp: $(srcdir)/smpppdlocationui.ui smpppdlocationui.h smpppdlocationui.moc
+ rm -f smpppdlocationui.cpp
+ echo '#include <kdialog.h>' > smpppdlocationui.cpp
@@ -16561,75 +17025,836 @@
+smpppdlocationui.moc: smpppdlocationui.h
+ $(MOC) smpppdlocationui.h -o smpppdlocationui.moc
+
- smpppdcsprefs.cpp: $(srcdir)/smpppdcsprefs.ui smpppdcsprefs.h smpppdcsprefs.moc
- rm -f smpppdcsprefs.cpp
- echo '#include <kdialog.h>' > smpppdcsprefs.cpp
---- kopete/plugins/smpppdcs/icons/Makefile.in
-+++ kopete/plugins/smpppdcs/icons/Makefile.in
-@@ -196,6 +196,9 @@
- LIB_XSS = @LIB_XSS@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
++smpppdcsprefs.cpp: $(srcdir)/smpppdcsprefs.ui smpppdcsprefs.h smpppdcsprefs.moc
++ rm -f smpppdcsprefs.cpp
++ echo '#include <kdialog.h>' > smpppdcsprefs.cpp
++ echo '#include <klocale.h>' >> smpppdcsprefs.cpp
++ $(UIC) -tr ${UIC_TR} -i smpppdcsprefs.h $(srcdir)/smpppdcsprefs.ui > smpppdcsprefs.cpp.temp ; ret=$$?; \
++ $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" smpppdcsprefs.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_smpppdcsprefs,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> smpppdcsprefs.cpp ;\
++ rm -f smpppdcsprefs.cpp.temp ;\
++ if test "$$ret" = 0; then echo '#include "smpppdcsprefs.moc"' >> smpppdcsprefs.cpp; else rm -f smpppdcsprefs.cpp ; exit $$ret ; fi
++
++smpppdcsprefs.h: $(srcdir)/smpppdcsprefs.ui
++ rm -rf smpppdcsprefs.h;
++ $(UIC) $(srcdir)/smpppdcsprefs.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> smpppdcsprefs.h ;
++smpppdcsprefs.moc: smpppdcsprefs.h
++ $(MOC) smpppdcsprefs.h -o smpppdcsprefs.moc
++
++smpppdcsconfig.cpp: smpppdcsconfig.h
++smpppdcsconfig.h: $(srcdir)/smpppdcs.kcfg $(srcdir)/smpppdcsconfig.kcfgc $(KCFG_DEPENDENCIES)
++ $(KCONFIG_COMPILER) $(srcdir)/smpppdcs.kcfg $(srcdir)/smpppdcsconfig.kcfgc; ret=$$?; \
++ if test "$$ret" != 0; then rm -f smpppdcsconfig.h ; exit $$ret ; fi
++
+--- kopete/plugins/smpppdcs/unittest/Makefile.in
++++ kopete/plugins/smpppdcs/unittest/Makefile.in
+@@ -0,0 +1,807 @@
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# KDE tags expanded automatically by am_edit - $Revision: 483858 $
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++ at SET_MAKE@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../../../..
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++target_triplet = @target@
++check_PROGRAMS = smpppdcstests$(EXEEXT)
++subdir = kopete/plugins/smpppdcs/unittest
++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
++ $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++ $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am_smpppdcstests_OBJECTS = main.$(OBJEXT) clienttest.$(OBJEXT)
++#>- smpppdcstests_OBJECTS = $(am_smpppdcstests_OBJECTS)
++#>+ 4
++smpppdcstests_final_OBJECTS = smpppdcstests.all_cpp.o
++smpppdcstests_nofinal_OBJECTS = main.$(OBJEXT) clienttest.$(OBJEXT)
++ at KDE_USE_FINAL_FALSE@smpppdcstests_OBJECTS = $(smpppdcstests_nofinal_OBJECTS)
++ at KDE_USE_FINAL_TRUE@smpppdcstests_OBJECTS = $(smpppdcstests_final_OBJECTS)
++smpppdcstests_DEPENDENCIES = ../libsmpppdclient/libsmpppdclient.la
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
++am__depfiles_maybe = depfiles
++#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 2
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++#>- $(AM_CXXFLAGS) $(CXXFLAGS)
++#>+ 3
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
++CXXLD = $(CXX)
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>+ 2
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(smpppdcstests_SOURCES)
++DIST_SOURCES = $(smpppdcstests_SOURCES)
++HEADERS = $(noinst_HEADERS)
++ETAGS = etags
++CTAGS = ctags
++#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++#>+ 1
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
++ARTSCCONFIG = @ARTSCCONFIG@
++AUTOCONF = @AUTOCONF@
++AUTODIRS = @AUTODIRS@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++COMPILE_GADU = @COMPILE_GADU@
++COMPILE_GETIFADDRS = @COMPILE_GETIFADDRS@
++CONF_FILES = @CONF_FILES@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DCOPIDL = @DCOPIDL@
++DCOPIDL2CPP = @DCOPIDL2CPP@
++DCOPIDLNG = @DCOPIDLNG@
++DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DOXYGEN = @DOXYGEN@
++DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
++DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
++ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
++EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
++FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
++GLIB_CFLAGS = @GLIB_CFLAGS@
++GLIB_LIBS = @GLIB_LIBS@
++GLINC = @GLINC@
++GLLIB = @GLLIB@
++GMSGFMT = @GMSGFMT@
++HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
++IDN_CPPFLAGS = @IDN_CPPFLAGS@
++IDN_LDFLAGS = @IDN_LDFLAGS@
++IDN_LIBS = @IDN_LIBS@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
++KCONFIG_COMPILER = @KCONFIG_COMPILER@
++KDECONFIG = @KDECONFIG@
++KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
++KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
++KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
++KDE_HAVE_DOT = @KDE_HAVE_DOT@
++KDE_INCLUDES = @KDE_INCLUDES@
++KDE_INSTALLED_FALSE = @KDE_INSTALLED_FALSE@
++KDE_INSTALLED_TRUE = @KDE_INSTALLED_TRUE@
++KDE_LDFLAGS = @KDE_LDFLAGS@
++KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
++KDE_MT_LIBS = @KDE_MT_LIBS@
++KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
++KDE_PLUGIN = @KDE_PLUGIN@
++KDE_RPATH = @KDE_RPATH@
++KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
++KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
++KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
++KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
++KDE_USE_FPIE = @KDE_USE_FPIE@
++KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
++KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
++KDE_USE_PIE = @KDE_USE_PIE@
++KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
++KOPETE_COMPAT_INCLUDES = @KOPETE_COMPAT_INCLUDES@
++KOPETE_INCLUDES = @KOPETE_INCLUDES@
++LDFLAGS = @LDFLAGS@
++LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
++LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
++LIBBSD = @LIBBSD@
++LIBCOMPAT = @LIBCOMPAT@
++LIBCRYPT = @LIBCRYPT@
++LIBDL = @LIBDL@
++LIBGG_INCLUDES = @LIBGG_INCLUDES@
++LIBGG_LIBS = @LIBGG_LIBS@
++LIBJPEG = @LIBJPEG@
++LIBOBJS = @LIBOBJS@
++LIBPNG = @LIBPNG@
++LIBPTHREAD = @LIBPTHREAD@
++LIBRESOLV = @LIBRESOLV@
++LIBS = @LIBS@
++LIBSM = @LIBSM@
++LIBSOCKET = @LIBSOCKET@
++LIBSSL = @LIBSSL@
++LIBTOOL = @LIBTOOL@
++LIBUCB = @LIBUCB@
++LIBUTIL = @LIBUTIL@
++LIBXF86VIDMODE = @LIBXF86VIDMODE@
++LIBXML_CFLAGS = @LIBXML_CFLAGS@
++LIBXML_LIBS = @LIBXML_LIBS@
++LIBXML_RPATH = @LIBXML_RPATH@
++LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
++LIBXSLT_LIBS = @LIBXSLT_LIBS@
++LIBXSLT_RPATH = @LIBXSLT_RPATH@
++LIBZ = @LIBZ@
++LIB_KAB = @LIB_KAB@
++LIB_KABC = @LIB_KABC@
++LIB_KDECORE = @LIB_KDECORE@
++LIB_KDED = @LIB_KDED@
++LIB_KDEPIM = @LIB_KDEPIM@
++LIB_KDEPRINT = @LIB_KDEPRINT@
++LIB_KDEUI = @LIB_KDEUI@
++LIB_KDNSSD = @LIB_KDNSSD@
++LIB_KFILE = @LIB_KFILE@
++LIB_KFM = @LIB_KFM@
++LIB_KHTML = @LIB_KHTML@
++LIB_KIMPROXY = @LIB_KIMPROXY@
++LIB_KIO = @LIB_KIO@
++LIB_KJS = @LIB_KJS@
++LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
++LIB_KOPETECOMPAT = @LIB_KOPETECOMPAT@
++LIB_KPARTS = @LIB_KPARTS@
++LIB_KSPELL = @LIB_KSPELL@
++LIB_KSYCOCA = @LIB_KSYCOCA@
++LIB_KUNITTEST = @LIB_KUNITTEST@
++LIB_KUTILS = @LIB_KUTILS@
++LIB_POLL = @LIB_POLL@
++LIB_QPE = @LIB_QPE@
++LIB_QT = @LIB_QT@
++LIB_SLP = @LIB_SLP@
++LIB_SMB = @LIB_SMB@
++LIB_X11 = @LIB_X11@
++LIB_XEXT = @LIB_XEXT@
++LIB_XRENDER = @LIB_XRENDER@
++LIB_XSS = @LIB_XSS@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
- all: docs-am all-am
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++MAKEINFO = @MAKEINFO@
++MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
++MCOPIDL = @MCOPIDL@
++MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
++MEANWHILE_LIBS = @MEANWHILE_LIBS@
++MEINPROC = @MEINPROC@
++MOC = @MOC@
++MSGFMT = @MSGFMT@
++NOOPT_CFLAGS = @NOOPT_CFLAGS@
++NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PERL = @PERL@
++PKG_CONFIG = @PKG_CONFIG@
++QTDOCDIR = @QTDOCDIR@
++QTE_NORTTI = @QTE_NORTTI@
++QT_INCLUDES = @QT_INCLUDES@
++QT_LDFLAGS = @QT_LDFLAGS@
++RANLIB = @RANLIB@
++SAMPLE_CLIENT_FALSE = @SAMPLE_CLIENT_FALSE@
++SAMPLE_CLIENT_TRUE = @SAMPLE_CLIENT_TRUE@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++SSL_INCLUDES = @SSL_INCLUDES@
++SSL_LDFLAGS = @SSL_LDFLAGS@
++STRIP = @STRIP@
++TOPSUBDIRS = @TOPSUBDIRS@
++UIC = @UIC@
++UIC_TR = @UIC_TR@
++USER_INCLUDES = @USER_INCLUDES@
++USER_LDFLAGS = @USER_LDFLAGS@
++USE_EXCEPTIONS = @USE_EXCEPTIONS@
++USE_RTTI = @USE_RTTI@
++USE_THREADS = @USE_THREADS@
++VERSION = @VERSION@
++WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
++XGETTEXT = @XGETTEXT@
++XMLLINT = @XMLLINT@
++XMMS_INCLUDES = @XMMS_INCLUDES@
++XMMS_LDFLAGS = @XMMS_LDFLAGS@
++XMMS_LIBS = @XMMS_LIBS@
++X_EXTRA_LIBS = @X_EXTRA_LIBS@
++X_INCLUDES = @X_INCLUDES@
++X_LDFLAGS = @X_LDFLAGS@
++X_PRE_LIBS = @X_PRE_LIBS@
++X_RPATH = @X_RPATH@
++YAHOO2_VERSION = @YAHOO2_VERSION@
++YAHOOPKGREQ = @YAHOOPKGREQ@
++ac_ct_AR = @ac_ct_AR@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_F77 = @ac_ct_F77@
++ac_ct_RANLIB = @ac_ct_RANLIB@
++ac_ct_STRIP = @ac_ct_STRIP@
++all_includes = @all_includes@
++all_libraries = @all_libraries@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++dcoprss_SUBDIR_included_FALSE = @dcoprss_SUBDIR_included_FALSE@
++dcoprss_SUBDIR_included_TRUE = @dcoprss_SUBDIR_included_TRUE@
++doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
++doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
++exec_prefix = @exec_prefix@
++filesharing_SUBDIR_included_FALSE = @filesharing_SUBDIR_included_FALSE@
++filesharing_SUBDIR_included_TRUE = @filesharing_SUBDIR_included_TRUE@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++include_ARTS_FALSE = @include_ARTS_FALSE@
++include_ARTS_TRUE = @include_ARTS_TRUE@
++include_gadu_FALSE = @include_gadu_FALSE@
++include_gadu_TRUE = @include_gadu_TRUE@
++include_jabber_FALSE = @include_jabber_FALSE@
++include_jabber_TRUE = @include_jabber_TRUE@
++include_libggcopy_FALSE = @include_libggcopy_FALSE@
++include_libggcopy_TRUE = @include_libggcopy_TRUE@
++include_meanwhile_FALSE = @include_meanwhile_FALSE@
++include_meanwhile_TRUE = @include_meanwhile_TRUE@
++include_motionautoaway_FALSE = @include_motionautoaway_FALSE@
++include_motionautoaway_TRUE = @include_motionautoaway_TRUE@
++include_msn_webcam_FALSE = @include_msn_webcam_FALSE@
++include_msn_webcam_TRUE = @include_msn_webcam_TRUE@
++include_smpppdcs_FALSE = @include_smpppdcs_FALSE@
++include_smpppdcs_TRUE = @include_smpppdcs_TRUE@
++include_testbed_FALSE = @include_testbed_FALSE@
++include_testbed_TRUE = @include_testbed_TRUE@
++include_x11_FALSE = @include_x11_FALSE@
++include_x11_TRUE = @include_x11_TRUE@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++kde_appsdir = @kde_appsdir@
++kde_bindir = @kde_bindir@
++kde_confdir = @kde_confdir@
++kde_datadir = @kde_datadir@
++kde_htmldir = @kde_htmldir@
++kde_icondir = @kde_icondir@
++kde_includes = @kde_includes@
++kde_kcfgdir = @kde_kcfgdir@
++kde_libraries = @kde_libraries@
++kde_libs_htmldir = @kde_libs_htmldir@
++kde_libs_prefix = @kde_libs_prefix@
++kde_locale = @kde_locale@
++kde_mimedir = @kde_mimedir@
++kde_moduledir = @kde_moduledir@
++kde_qtver = @kde_qtver@
++kde_servicesdir = @kde_servicesdir@
++kde_servicetypesdir = @kde_servicetypesdir@
++kde_sounddir = @kde_sounddir@
++kde_styledir = @kde_styledir@
++kde_templatesdir = @kde_templatesdir@
++kde_wallpaperdir = @kde_wallpaperdir@
++kde_widgetdir = @kde_widgetdir@
++kdeinitdir = @kdeinitdir@
++kdict_SUBDIR_included_FALSE = @kdict_SUBDIR_included_FALSE@
++kdict_SUBDIR_included_TRUE = @kdict_SUBDIR_included_TRUE@
++kdnssd_SUBDIR_included_FALSE = @kdnssd_SUBDIR_included_FALSE@
++kdnssd_SUBDIR_included_TRUE = @kdnssd_SUBDIR_included_TRUE@
++kfile_plugins_SUBDIR_included_FALSE = @kfile_plugins_SUBDIR_included_FALSE@
++kfile_plugins_SUBDIR_included_TRUE = @kfile_plugins_SUBDIR_included_TRUE@
++kget_SUBDIR_included_FALSE = @kget_SUBDIR_included_FALSE@
++kget_SUBDIR_included_TRUE = @kget_SUBDIR_included_TRUE@
++knewsticker_SUBDIR_included_FALSE = @knewsticker_SUBDIR_included_FALSE@
++knewsticker_SUBDIR_included_TRUE = @knewsticker_SUBDIR_included_TRUE@
++kopete_SUBDIR_included_FALSE = @kopete_SUBDIR_included_FALSE@
++kopete_SUBDIR_included_TRUE = @kopete_SUBDIR_included_TRUE@
++kpf_SUBDIR_included_FALSE = @kpf_SUBDIR_included_FALSE@
++kpf_SUBDIR_included_TRUE = @kpf_SUBDIR_included_TRUE@
++kppp_SUBDIR_included_FALSE = @kppp_SUBDIR_included_FALSE@
++kppp_SUBDIR_included_TRUE = @kppp_SUBDIR_included_TRUE@
++krdc_SUBDIR_included_FALSE = @krdc_SUBDIR_included_FALSE@
++krdc_SUBDIR_included_TRUE = @krdc_SUBDIR_included_TRUE@
++krfb_SUBDIR_included_FALSE = @krfb_SUBDIR_included_FALSE@
++krfb_SUBDIR_included_TRUE = @krfb_SUBDIR_included_TRUE@
++ksirc_SUBDIR_included_FALSE = @ksirc_SUBDIR_included_FALSE@
++ksirc_SUBDIR_included_TRUE = @ksirc_SUBDIR_included_TRUE@
++ktalkd_SUBDIR_included_FALSE = @ktalkd_SUBDIR_included_FALSE@
++ktalkd_SUBDIR_included_TRUE = @ktalkd_SUBDIR_included_TRUE@
++lanbrowsing_SUBDIR_included_FALSE = @lanbrowsing_SUBDIR_included_FALSE@
++lanbrowsing_SUBDIR_included_TRUE = @lanbrowsing_SUBDIR_included_TRUE@
++libdir = @libdir@
++libexecdir = @libexecdir@
++librss_SUBDIR_included_FALSE = @librss_SUBDIR_included_FALSE@
++librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++qt_includes = @qt_includes@
++qt_libraries = @qt_libraries@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target = @target@
++target_alias = @target_alias@
++target_cpu = @target_cpu@
++target_os = @target_os@
++target_vendor = @target_vendor@
++unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
++unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
++wifi_SUBDIR_included_FALSE = @wifi_SUBDIR_included_FALSE@
++wifi_SUBDIR_included_TRUE = @wifi_SUBDIR_included_TRUE@
++x_includes = @x_includes@
++x_libraries = @x_libraries@
++xdg_appsdir = @xdg_appsdir@
++xdg_directorydir = @xdg_directorydir@
++xdg_menudir = @xdg_menudir@
++INCLUDES = -I$(top_srcdir)/src $(all_includes) -I../libsmpppdclient
++#>- METASOURCES = AUTO
++smpppdcstests_SOURCES = main.cpp clienttest.cpp
++smpppdcstests_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -lkunittestgui
++noinst_HEADERS = clienttest.h
++#>- all: all-am
++#>+ 1
++all: docs-am all-am
++
++.SUFFIXES:
++.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -432,9 +435,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
++#>- @for dep in $?; do \
++#>- case '$(am__configure_deps)' in \
++#>- *$$dep*) \
++#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++#>- && exit 0; \
++#>- exit 1;; \
++#>- esac; \
++#>- done; \
++#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kopete/plugins/smpppdcs/unittest/Makefile'; \
++#>- cd $(top_srcdir) && \
++#>- $(AUTOMAKE) --foreign kopete/plugins/smpppdcs/unittest/Makefile
++#>+ 12
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kopete/plugins/smpppdcs/unittest/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign kopete/plugins/smpppdcs/unittest/Makefile
++ cd $(top_srcdir) && perl admin/am_edit kopete/plugins/smpppdcs/unittest/Makefile.in
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ @case '$?' in \
++ *config.status*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++ *) \
++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++ esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
---- kopete/plugins/smpppdcs/Makefile.in
-+++ kopete/plugins/smpppdcs/Makefile.in
-@@ -260,6 +260,9 @@
- LIB_XSS = @LIB_XSS@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -509,9 +512,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++clean-checkPROGRAMS:
++ @list='$(check_PROGRAMS)'; for p in $$list; do \
++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++ echo " rm -f $$p $$f"; \
++ rm -f $$p $$f ; \
++ done
++smpppdcstests$(EXEEXT): $(smpppdcstests_OBJECTS) $(smpppdcstests_DEPENDENCIES)
++ @rm -f smpppdcstests$(EXEEXT)
++ $(CXXLINK) $(smpppdcstests_LDFLAGS) $(smpppdcstests_OBJECTS) $(smpppdcstests_LDADD) $(LIBS)
++
++mostlyclean-compile:
++ -rm -f *.$(OBJEXT)
++
++distclean-compile:
++ -rm -f *.tab.c
++
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/clienttest.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
++
++.cpp.o:
++ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
++
++.cpp.obj:
++ at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++
++.cpp.lo:
++ at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
++
++mostlyclean-libtool:
++ -rm -f *.lo
++
++clean-libtool:
++ -rm -rf .libs _libs
++
++distclean-libtool:
++ -rm -f libtool
++uninstall-info-am:
++
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ mkid -fID $$unique
++tags: TAGS
++
++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ tags=; \
++ here=`pwd`; \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++ test -n "$$unique" || unique=$$empty_fix; \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique; \
++ fi
++ctags: CTAGS
++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ tags=; \
++ here=`pwd`; \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ test -z "$(CTAGS_ARGS)$$tags$$unique" \
++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ $$tags $$unique
++
++GTAGS:
++ here=`$(am__cd) $(top_builddir) && pwd` \
++ && cd $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) $$here
++
++distclean-tags:
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++
++distdir: $(DISTFILES)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
++ if test -d $$d/$$file; then \
++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ fi; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ else \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
++ || exit 1; \
++ fi; \
++ done
++check-am: all-am
++ $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
++check: check-am
++all-am: Makefile $(HEADERS)
++installdirs:
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++ @echo "This command is intended for maintainers to use"
++ @echo "it deletes files that may require special tools to rebuild."
++#>- clean: clean-am
++#>+ 1
++clean: kde-rpo-clean clean-am
++
++#>- clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
++#>- mostlyclean-am
++#>+ 2
++clean-am: clean-metasources clean-bcheck clean-final clean-checkPROGRAMS clean-generic clean-libtool \
++ mostlyclean-am
++
++distclean: distclean-am
++ -rm -rf ./$(DEPDIR)
++ -rm -f Makefile
++distclean-am: clean-am distclean-compile distclean-generic \
++ distclean-libtool distclean-tags
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++info: info-am
++
++info-am:
++
++install-data-am:
++
++install-exec-am:
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++ -rm -rf ./$(DEPDIR)
++ -rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-info-am
++
++.PHONY: CTAGS GTAGS all all-am check check-am clean \
++ clean-checkPROGRAMS clean-generic clean-libtool ctags \
++ distclean distclean-compile distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am html \
++ html-am info info-am install install-am install-data \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-info-am
++
++
++check:
++ kunittest ./smpppdcstests ClientTest
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
++
++#>+ 3
++clienttest.moc: $(srcdir)/clienttest.h
++ $(MOC) $(srcdir)/clienttest.h -o clienttest.moc
++
++#>+ 2
++mocs: clienttest.moc
++
++#>+ 3
++clean-metasources:
++ -rm -f clienttest.moc
++
++#>+ 2
++KDE_DIST=Makefile.in Makefile.am
++
++#>+ 2
++docs-am:
++
++#>+ 15
++force-reedit:
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kopete/plugins/smpppdcs/unittest/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --foreign kopete/plugins/smpppdcs/unittest/Makefile
++ cd $(top_srcdir) && perl admin/am_edit kopete/plugins/smpppdcs/unittest/Makefile.in
++
++
++#>+ 21
++clean-bcheck:
++ rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
++
++bcheck: bcheck-am
++
++bcheck-am:
++ @for i in ; do \
++ if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
++ echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
++ echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
++ echo "$$i"; \
++ if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
++ rm -f $$i.bchecktest.cc; exit 1; \
++ fi ; \
++ echo "" >> $$i.bchecktest.cc.class; \
++ perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
++ rm -f a.out; \
++ fi ; \
++ done
++
++
++#>+ 11
++smpppdcstests.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/clienttest.cpp clienttest.moc
++ @echo 'creating smpppdcstests.all_cpp.cpp ...'; \
++ rm -f smpppdcstests.all_cpp.files smpppdcstests.all_cpp.final; \
++ echo "#define KDE_USE_FINAL 1" >> smpppdcstests.all_cpp.final; \
++ for file in main.cpp clienttest.cpp ; do \
++ echo "#include \"$$file\"" >> smpppdcstests.all_cpp.files; \
++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> smpppdcstests.all_cpp.final; \
++ done; \
++ cat smpppdcstests.all_cpp.final smpppdcstests.all_cpp.files > smpppdcstests.all_cpp.cpp; \
++ rm -f smpppdcstests.all_cpp.final smpppdcstests.all_cpp.files
++
++#>+ 3
++clean-final:
++ -rm -f smpppdcstests.all_cpp.cpp
++
++#>+ 3
++final:
++ $(MAKE) smpppdcstests_OBJECTS="$(smpppdcstests_final_OBJECTS)" all-am
++
++#>+ 3
++final-install:
++ $(MAKE) smpppdcstests_OBJECTS="$(smpppdcstests_final_OBJECTS)" install-am
++
++#>+ 3
++no-final:
++ $(MAKE) smpppdcstests_OBJECTS="$(smpppdcstests_nofinal_OBJECTS)" all-am
++
++#>+ 3
++no-final-install:
++ $(MAKE) smpppdcstests_OBJECTS="$(smpppdcstests_nofinal_OBJECTS)" install-am
++
++#>+ 3
++kde-rpo-clean:
++ -rm -f *.rpo
++
++#>+ 5
++nmcheck:
++clienttest.o: clienttest.moc
++clienttest.lo: clienttest.moc
++nmcheck-am: nmcheck
--- kopete/plugins/statistics/Makefile.in
+++ kopete/plugins/statistics/Makefile.in
@@ -261,6 +261,9 @@
Modified: tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/rules
===================================================================
--- trunk/packages/kdenetwork/debian/rules 2006-01-25 12:47:56 UTC (rev 2983)
+++ tags/packages/kdenetwork/kdenetwork-3.5.1-1/debian/rules 2006-01-27 19:04:10 UTC (rev 2988)
@@ -11,8 +11,8 @@
PACKAGES_WITH_LIBS := librss1 kopete ksirc kwifimanager
-DEB_DH_MAKESHLIBS_ARGS_librss1 := -V'librss1 (>= 4:3.5.0-1)'
-DEB_DH_MAKESHLIBS_ARGS_kopete := -V'kopete (>= 4:3.5.0-1)'
+DEB_DH_MAKESHLIBS_ARGS_librss1 := -V'librss1 (>= 4:3.5.1-1)'
+DEB_DH_MAKESHLIBS_ARGS_kopete := -V'kopete (>= 4:3.5.1-1)'
#shlibs_ver = 4:3.5.0-1
#$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))
More information about the pkg-kde-commits
mailing list