diff options
author | Gregorio Guidi <greg_g@gentoo.org> | 2005-05-26 09:49:44 +0000 |
---|---|---|
committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-05-26 09:49:44 +0000 |
commit | f814952200f0af47ad3b40740c35a93f6271b9db (patch) | |
tree | d5045faa240aaa59c4b72aabc344983f4ae17d15 /kde-base/kdenetwork | |
parent | stable on amd64, ppc and x86 (diff) | |
download | gentoo-2-f814952200f0af47ad3b40740c35a93f6271b9db.tar.gz gentoo-2-f814952200f0af47ad3b40740c35a93f6271b9db.tar.bz2 gentoo-2-f814952200f0af47ad3b40740c35a93f6271b9db.zip |
Fix patch.
(Portage version: 2.0.51.19)
Diffstat (limited to 'kde-base/kdenetwork')
-rw-r--r-- | kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch | 884 |
1 files changed, 92 insertions, 792 deletions
diff --git a/kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch b/kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch index bc8e7456e805..277b307ab2c7 100644 --- a/kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch +++ b/kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch @@ -1,771 +1,83 @@ -diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.am kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am ---- kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.am 2004-06-25 11:10:14.000000000 +0200 -+++ kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am 2005-05-22 19:35:27.000000000 +0200 +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am kdenetwork-3.3.2-new/kopete/protocols/msn/Makefile.am +--- kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am 2004-06-25 12:10:14.000000000 +0300 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/Makefile.am 2005-05-21 14:06:36.000000000 +0300 @@ -1,3 +1,4 @@ -+KDE_OPTIONS = nofinal ++KDE_OPTIONS = nofinal METASOURCES = AUTO SUBDIRS = ui . icons config AM_CPPFLAGS = -I$(srcdir)/ui \ -@@ -11,8 +12,8 @@ - CLEANFILES = dummy.cpp +@@ -12,7 +13,8 @@ libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp msnaddcontactpage.cpp msncontact.cpp \ -- msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \ + msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \ - msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp -+ msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp sslloginhandler.cpp \ -+ msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp ++ msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp \ ++ sslloginhandler.cpp libkopete_msn_shared_la_LIBADD = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(LIB_KIO) libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) -diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in ---- kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in 2004-11-29 16:24:54.000000000 +0100 -+++ kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in 2005-05-22 19:57:41.000000000 +0200 -@@ -1,9 +1,9 @@ --# Makefile.in generated by automake 1.9.1 from Makefile.am. -+# Makefile.in generated by automake 1.7.9 from Makefile.am. - # KDE tags expanded automatically by am_edit - $Revision: 1.1 $ - # @configure_input@ - --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004 Free Software Foundation, Inc. -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -15,9 +15,6 @@ - - @SET_MAKE@ - -- --SOURCES = $(kopete_msn_la_SOURCES) $(libkopete_msn_shared_la_SOURCES) -- - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ -@@ -25,6 +22,7 @@ - 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 -@@ -41,97 +39,6 @@ - build_triplet = @build@ - host_triplet = @host@ - target_triplet = @target@ --subdir = kopete/protocols/msn --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO --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__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \ -- "$(DESTDIR)$(mydatadir)" "$(DESTDIR)$(servicedir)" --kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) --libLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) --kopete_msn_la_DEPENDENCIES = libkopete_msn_shared.la --am_kopete_msn_la_OBJECTS = dummy.lo --#>- kopete_msn_la_OBJECTS = $(am_kopete_msn_la_OBJECTS) --#>+ 1 --kopete_msn_la_OBJECTS = dummy.lo --am__DEPENDENCIES_1 = --libkopete_msn_shared_la_DEPENDENCIES = ./ui/libkopetemsnui.la \ -- ../../libkopete/libkopete.la $(am__DEPENDENCIES_1) --am_libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \ -- msnaddcontactpage.lo msncontact.lo msnsocket.lo \ -- msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \ -- msnswitchboardsocket.lo msnfiletransfersocket.lo \ +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in kdenetwork-3.3.2-new/kopete/protocols/msn/Makefile.in +--- kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in 2004-11-29 17:24:54.000000000 +0200 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/Makefile.in 2005-05-21 14:21:28.000000000 +0300 +@@ -74,18 +74,15 @@ + msnaddcontactpage.lo msncontact.lo msnsocket.lo \ + msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \ + msnswitchboardsocket.lo msnfiletransfersocket.lo \ - msninvitation.lo msnp2p.lo sha1.lo --#>- libkopete_msn_shared_la_OBJECTS = \ --#>- $(am_libkopete_msn_shared_la_OBJECTS) ++ msninvitation.lo msnp2p.lo sha1.lo sslloginhandler.lo + #>- libkopete_msn_shared_la_OBJECTS = \ + #>- $(am_libkopete_msn_shared_la_OBJECTS) -#>+ 8 -libkopete_msn_shared_la_final_OBJECTS = libkopete_msn_shared_la.all_cpp.lo -libkopete_msn_shared_la_nofinal_OBJECTS = msnprotocol.lo msnaccount.lo \ -- msnaddcontactpage.lo msncontact.lo msnsocket.lo \ -- msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \ -- msnswitchboardsocket.lo msnfiletransfersocket.lo \ ++#>+ 5 ++libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \ + msnaddcontactpage.lo msncontact.lo msnsocket.lo \ + msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \ + msnswitchboardsocket.lo msnfiletransfersocket.lo \ - msninvitation.lo msnp2p.lo sha1.lo -@KDE_USE_FINAL_FALSE@libkopete_msn_shared_la_OBJECTS = $(libkopete_msn_shared_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libkopete_msn_shared_la_OBJECTS = $(libkopete_msn_shared_la_final_OBJECTS) --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) --mode=compile --tag=CXX $(CXX) $(DEFS) \ --#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ --#>- $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 3 --LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --CXXLD = $(CXX) --#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ --#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --#>+ 2 --CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(kopete_msn_la_SOURCES) $(libkopete_msn_shared_la_SOURCES) --DIST_SOURCES = $(kopete_msn_la_SOURCES) \ -- $(libkopete_msn_shared_la_SOURCES) --#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ --#>- html-recursive info-recursive install-data-recursive \ --#>- install-exec-recursive install-info-recursive \ --#>- install-recursive installcheck-recursive installdirs-recursive \ --#>- pdf-recursive ps-recursive uninstall-info-recursive \ --#>- uninstall-recursive --#>+ 6 --RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ -- html-recursive info-recursive install-data-recursive \ -- install-exec-recursive install-info-recursive \ -- install-recursive installcheck-recursive installdirs-recursive \ -- pdf-recursive ps-recursive uninstall-info-recursive \ -- uninstall-recursive nmcheck-recursive bcheck-recursive --mydataDATA_INSTALL = $(INSTALL_DATA) --serviceDATA_INSTALL = $(INSTALL_DATA) --DATA = $(mydata_DATA) $(service_DATA) --ETAGS = etags --CTAGS = ctags --DIST_SUBDIRS = $(SUBDIRS) --#>- 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@ -@@ -320,8 +227,6 @@ - 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@ -@@ -407,7 +312,6 @@ - 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@ -@@ -428,6 +332,7 @@ ++ msninvitation.lo msnp2p.lo sha1.lo sslloginhandler.lo + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + am__depfiles_maybe = depfiles +@@ -428,6 +425,7 @@ xdg_appsdir = @xdg_appsdir@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ -+KDE_OPTIONS = nofinal ++KDE_OPTIONS = nofinal #>- METASOURCES = AUTO SUBDIRS = ui . icons config AM_CPPFLAGS = -I$(srcdir)/ui \ -@@ -435,125 +340,197 @@ - $(KOPETE_INCLUDES) \ - $(all_includes) - -+ - kde_module_LTLIBRARIES = kopete_msn.la - lib_LTLIBRARIES = libkopete_msn_shared.la -+ +@@ -440,7 +438,8 @@ CLEANFILES = dummy.cpp -+ libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp msnaddcontactpage.cpp msncontact.cpp \ -- msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \ + msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \ - msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp -+ msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp sslloginhandler.cpp \ -+ msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp -+ ++ msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp \ ++ sslloginhandler.cpp libkopete_msn_shared_la_LIBADD = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(LIB_KIO) #>- libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) - #>+ 1 - libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries) -+ - kopete_msn_la_SOURCES = dummy.cpp - kopete_msn_la_LIBADD = libkopete_msn_shared.la -+ - #>- kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) - #>+ 1 - kopete_msn_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(KDE_PLUGIN) $(all_libraries) -+ - service_DATA = kopete_msn.desktop - servicedir = $(kde_servicesdir) -+ - mydatadir = $(kde_datadir)/kopete_msn - mydata_DATA = msnchatui.rc -+subdir = kopete/protocols/msn -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) -+ -+kopete_msn_la_DEPENDENCIES = libkopete_msn_shared.la -+am_kopete_msn_la_OBJECTS = dummy.lo -+#>- kopete_msn_la_OBJECTS = $(am_kopete_msn_la_OBJECTS) -+#>+ 1 -+kopete_msn_la_OBJECTS = dummy.lo -+libkopete_msn_shared_la_DEPENDENCIES = ./ui/libkopetemsnui.la \ -+ ../../libkopete/libkopete.la -+am_libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \ -+ msnaddcontactpage.lo msncontact.lo msnsocket.lo \ -+ msnmessagemanager.lo msndebugrawcmddlg.lo sslloginhandler.lo \ -+ msnnotifysocket.lo msnswitchboardsocket.lo \ -+ msnfiletransfersocket.lo msninvitation.lo msnp2p.lo sha1.lo -+#>- libkopete_msn_shared_la_OBJECTS = $(am_libkopete_msn_shared_la_OBJECTS) -+#>+ 5 -+libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \ -+ msnaddcontactpage.lo msncontact.lo msnsocket.lo \ -+ msnmessagemanager.lo msndebugrawcmddlg.lo sslloginhandler.lo \ -+ msnnotifysocket.lo msnswitchboardsocket.lo \ -+ msnfiletransfersocket.lo msninvitation.lo msnp2p.lo sha1.lo -+ -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -+am__depfiles_maybe = depfiles -+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/msnaccount.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnaddcontactpage.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msncontact.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msndebugrawcmddlg.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnfiletransfersocket.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msninvitation.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnmessagemanager.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnnotifysocket.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnp2p.Plo ./$(DEPDIR)/msnprotocol.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnsocket.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/msnswitchboardsocket.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/sha1.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/sslloginhandler.Plo -+#>+ 13 -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/msnaccount.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnaddcontactpage.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msncontact.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msndebugrawcmddlg.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnfiletransfersocket.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msninvitation.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnmessagemanager.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnnotifysocket.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnp2p.Plo ./$(DEPDIR)/msnprotocol.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnsocket.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/msnswitchboardsocket.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sha1.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sslloginhandler.Plo -+#>- 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) --mode=compile $(CXX) $(DEFS) \ -+#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+#>- $(AM_CXXFLAGS) $(CXXFLAGS) -+#>+ 3 -+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \ -+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -+CXXLD = $(CXX) -+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -+#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+#>+ 2 -+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+DIST_SOURCES = $(kopete_msn_la_SOURCES) \ -+ $(libkopete_msn_shared_la_SOURCES) -+DATA = $(mydata_DATA) $(service_DATA) -+ -+ -+#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+#>- ps-recursive install-info-recursive uninstall-info-recursive \ -+#>- all-recursive install-data-recursive install-exec-recursive \ -+#>- installdirs-recursive install-recursive uninstall-recursive \ -+#>- check-recursive installcheck-recursive -+#>+ 5 -+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -+ ps-recursive install-info-recursive uninstall-info-recursive \ -+ all-recursive install-data-recursive install-exec-recursive \ -+ installdirs-recursive install-recursive uninstall-recursive \ -+ check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO -+DIST_SUBDIRS = $(SUBDIRS) -+SOURCES = $(kopete_msn_la_SOURCES) $(libkopete_msn_shared_la_SOURCES) -+ - #>- all: all-recursive - #>+ 1 - all: docs-am all-recursive - - .SUFFIXES: - .SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) --#>- @for dep in $?; do \ --#>- case '$(am__configure_deps)' in \ --#>- *$$dep*) \ --#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ --#>- && exit 0; \ --#>- exit 1;; \ --#>- esac; \ --#>- done; \ --#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kopete/protocols/msn/Makefile'; \ -+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - #>- cd $(top_srcdir) && \ --#>- $(AUTOMAKE) --foreign kopete/protocols/msn/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/protocols/msn/Makefile'; \ -+#>- $(AUTOMAKE) --gnu kopete/protocols/msn/Makefile -+#>+ 3 - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kopete/protocols/msn/Makefile -+ $(AUTOMAKE) --gnu kopete/protocols/msn/Makefile - cd $(top_srcdir) && perl admin/am_edit kopete/protocols/msn/Makefile.in --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) - install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" -+ $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) - @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \ - else :; fi; \ - done - - uninstall-kde_moduleLTLIBRARIES: - @$(NORMAL_UNINSTALL) -- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ -+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \ - done - - clean-kde_moduleLTLIBRARIES: - -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) - @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -+libLTLIBRARIES_INSTALL = $(INSTALL) - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" -+ $(mkinstalldirs) $(DESTDIR)$(libdir) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ -+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ - else :; fi; \ - done - - uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) -- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ -+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ p="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ - done - - clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -+ test "$$dir" = "$$p" && dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -@@ -569,7 +546,7 @@ - $(CXXLINK) -rpath $(libdir) $(libkopete_msn_shared_la_LDFLAGS) $(libkopete_msn_shared_la_OBJECTS) $(libkopete_msn_shared_la_LIBADD) $(LIBS) - - mostlyclean-compile: -- -rm -f *.$(OBJEXT) -+ -rm -f *.$(OBJEXT) core *.core - - distclean-compile: - -rm -f *.tab.c -@@ -588,27 +565,40 @@ +@@ -588,6 +587,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msnsocket.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msnswitchboardsocket.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sslloginhandler.Plo@am__quote@ .cpp.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - .cpp.obj: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` - - .cpp.lo: --@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -+@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -+@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ -+@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -+@am__fastdepCXX_TRUE@ fi - @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< - - mostlyclean-libtool: - -rm -f *.lo -@@ -619,39 +609,41 @@ - distclean-libtool: - -rm -f libtool - uninstall-info-am: -+mydataDATA_INSTALL = $(INSTALL_DATA) - install-mydataDATA: $(mydata_DATA) - @$(NORMAL_INSTALL) -- test -z "$(mydatadir)" || $(mkdir_p) "$(DESTDIR)$(mydatadir)" -+ $(mkinstalldirs) $(DESTDIR)$(mydatadir) - @list='$(mydata_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(mydataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mydatadir)/$$f'"; \ -- $(mydataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mydatadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(mydataDATA_INSTALL) $$d$$p $(DESTDIR)$(mydatadir)/$$f"; \ -+ $(mydataDATA_INSTALL) $$d$$p $(DESTDIR)$(mydatadir)/$$f; \ - done - - uninstall-mydataDATA: - @$(NORMAL_UNINSTALL) - @list='$(mydata_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(mydatadir)/$$f'"; \ -- rm -f "$(DESTDIR)$(mydatadir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(mydatadir)/$$f"; \ -+ rm -f $(DESTDIR)$(mydatadir)/$$f; \ - done -+serviceDATA_INSTALL = $(INSTALL_DATA) - install-serviceDATA: $(service_DATA) - @$(NORMAL_INSTALL) -- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)" -+ $(mkinstalldirs) $(DESTDIR)$(servicedir) - @list='$(service_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \ -- $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " $(serviceDATA_INSTALL) $$d$$p $(DESTDIR)$(servicedir)/$$f"; \ -+ $(serviceDATA_INSTALL) $$d$$p $(DESTDIR)$(servicedir)/$$f; \ - done - - uninstall-serviceDATA: - @$(NORMAL_UNINSTALL) - @list='$(service_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \ -- rm -f "$(DESTDIR)$(servicedir)/$$f"; \ -+ f="`echo $$p | sed -e 's|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(servicedir)/$$f"; \ -+ rm -f $(DESTDIR)$(servicedir)/$$f; \ - done - - # This directory's subdirectories are mostly independent; you can cd -@@ -713,6 +705,14 @@ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -+ETAGS = etags -+ETAGSFLAGS = -+ -+CTAGS = ctags -+CTAGSFLAGS = -+ -+tags: TAGS -+ - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ -@@ -721,22 +721,19 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique --tags: TAGS - - TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ -- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ -+ if (etags --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ -- empty_fix=.; \ - else \ - include_option=--include; \ -- empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test ! -f $$subdir/TAGS || \ -+ test -f $$subdir/TAGS && \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -746,11 +743,10 @@ - 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 -+ test -z "$(ETAGS_ARGS)$$tags$$unique" \ -+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique -+ - ctags: CTAGS - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) -@@ -773,6 +769,12 @@ - - distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+#>+ 1 -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -+ -+top_distdir = ../../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - - distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -@@ -786,7 +788,7 @@ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -+ $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ -@@ -801,17 +803,15 @@ - || exit 1; \ - fi; \ - done -- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ -+ list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -d "$(distdir)/$$subdir" \ -- || $(mkdir_p) "$(distdir)/$$subdir" \ -+ test -d $(distdir)/$$subdir \ -+ || mkdir $(distdir)/$$subdir \ - || exit 1; \ -- distdir=`$(am__cd) $(distdir) && pwd`; \ -- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ -- top_distdir="$$top_distdir" \ -- distdir="$$distdir/$$subdir" \ -+ top_distdir="$(top_distdir)" \ -+ distdir=../$(distdir)/$$subdir \ - distdir) \ - || exit 1; \ - fi; \ -@@ -821,9 +821,8 @@ - all-am: Makefile $(LTLIBRARIES) $(DATA) - installdirs: installdirs-recursive - installdirs-am: -- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(mydatadir)" "$(DESTDIR)$(servicedir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(libdir) $(DESTDIR)$(mydatadir) $(DESTDIR)$(servicedir) -+ - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -844,7 +843,7 @@ - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - - distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -rm -f $(CONFIG_CLEAN_FILES) - - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" -@@ -853,11 +852,11 @@ - #>+ 1 - clean: kde-rpo-clean clean-recursive - --#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \ --#>- clean-libLTLIBRARIES clean-libtool mostlyclean-am -+#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES \ -+#>- clean-libtool mostlyclean-am + @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@@ -856,7 +856,7 @@ + #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \ + #>- clean-libLTLIBRARIES clean-libtool mostlyclean-am #>+ 2 -clean-am: clean-metasources clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES \ -- clean-libLTLIBRARIES clean-libtool mostlyclean-am -+clean-am: clean-metasources clean-closures clean-bcheck clean-generic clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES \ -+ clean-libtool mostlyclean-am ++clean-am: clean-metasources clean-closures clean-bcheck clean-generic clean-kde_moduleLTLIBRARIES \ + clean-libLTLIBRARIES clean-libtool mostlyclean-am distclean: distclean-recursive - -rm -rf ./$(DEPDIR) -@@ -869,8 +868,6 @@ - - dvi-am: - --html: html-recursive -- - info: info-recursive - - info-am: -@@ -915,23 +912,27 @@ - - uninstall-info: uninstall-info-recursive - --.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ -- clean clean-generic clean-kde_moduleLTLIBRARIES \ -- clean-libLTLIBRARIES clean-libtool clean-recursive ctags \ -- ctags-recursive distclean distclean-compile distclean-generic \ -- distclean-libtool distclean-recursive distclean-tags distdir \ -- dvi dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-exec install-exec-am \ -- install-info install-info-am install-kde_moduleLTLIBRARIES \ -- install-libLTLIBRARIES install-man install-mydataDATA \ -+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ -+ clean-generic clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES \ -+ clean-libtool clean-recursive ctags ctags-recursive distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-recursive distclean-tags distdir dvi dvi-am \ -+ dvi-recursive info info-am info-recursive install install-am \ -+ install-data install-data-am install-data-recursive \ -+ install-exec install-exec-am install-exec-recursive \ -+ install-info install-info-am install-info-recursive \ -+ install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \ -+ install-man install-mydataDATA install-recursive \ - 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-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \ -- uninstall-mydataDATA uninstall-serviceDATA -+ installdirs installdirs-am installdirs-recursive \ -+ maintainer-clean maintainer-clean-generic \ -+ maintainer-clean-recursive mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ -+ pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ -+ tags-recursive uninstall uninstall-am uninstall-info-am \ -+ uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \ -+ uninstall-libLTLIBRARIES uninstall-mydataDATA \ -+ uninstall-recursive uninstall-serviceDATA - - - dummy.cpp: $(srcdir)/Makefile.am -@@ -965,18 +966,18 @@ - mocs: msnmessagemanager.moc - - #>+ 3 --msnfiletransfersocket.moc: $(srcdir)/msnfiletransfersocket.h -- $(MOC) $(srcdir)/msnfiletransfersocket.h -o msnfiletransfersocket.moc -+msncontact.moc: $(srcdir)/msncontact.h -+ $(MOC) $(srcdir)/msncontact.h -o msncontact.moc - - #>+ 2 --mocs: msnfiletransfersocket.moc -+mocs: msncontact.moc - - #>+ 3 --msncontact.moc: $(srcdir)/msncontact.h -- $(MOC) $(srcdir)/msncontact.h -o msncontact.moc -+msnfiletransfersocket.moc: $(srcdir)/msnfiletransfersocket.h -+ $(MOC) $(srcdir)/msnfiletransfersocket.h -o msnfiletransfersocket.moc - - #>+ 2 --mocs: msncontact.moc -+mocs: msnfiletransfersocket.moc - - #>+ 3 - msnprotocol.moc: $(srcdir)/msnprotocol.h -@@ -986,6 +987,13 @@ +@@ -986,6 +986,13 @@ mocs: msnprotocol.moc #>+ 3 @@ -779,7 +91,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3. msnaccount.moc: $(srcdir)/msnaccount.h $(MOC) $(srcdir)/msnaccount.h -o msnaccount.moc -@@ -1000,18 +1008,18 @@ +@@ -1000,18 +1007,18 @@ mocs: msnsocket.moc #>+ 3 @@ -804,43 +116,20 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3. #>+ 3 msnp2p.moc: $(srcdir)/msnp2p.h -@@ -1038,10 +1046,10 @@ +@@ -1038,10 +1045,10 @@ #>+ 3 clean-metasources: - -rm -f msndebugrawcmddlg.moc msnmessagemanager.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc msnaccount.moc msnsocket.moc msnnotifysocket.moc msnswitchboardsocket.moc msnp2p.moc msnaddcontactpage.moc -+ -rm -f msndebugrawcmddlg.moc msnmessagemanager.moc msncontact.moc msnfiletransfersocket.moc msnprotocol.moc sslloginhandler.moc msnaccount.moc msnsocket.moc msnswitchboardsocket.moc msnnotifysocket.moc msnp2p.moc msnaddcontactpage.moc ++ -rm -f msndebugrawcmddlg.moc msnmessagemanager.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc sslloginhandler.moc msnaccount.moc msnsocket.moc msnswitchboardsocket.moc msnnotifysocket.moc msnp2p.moc msnaddcontactpage.moc #>+ 2 -KDE_DIST=kopete_msn.desktop msncontact.h msnp2p.h msnmessagemanager.h msnchatui.rc Changelog msnsocket.h ReleaseNotes msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am -+KDE_DIST=kopete_msn.desktop msncontact.h msnp2p.h msnmessagemanager.h msnchatui.rc Changelog msnsocket.h ReleaseNotes msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h sslloginhandler.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h ++KDE_DIST=msndebugrawcmddlg.h kopete_msn.desktop msncontact.h msnaccount.h msnp2p.h msnfiletransfersocket.h sha1.h msnmessagemanager.h msnchatui.rc sslloginhandler.h msninvitation.h Makefile.in Changelog msnswitchboardsocket.h msnsocket.h msnprotocol.h msnnotifysocket.h ReleaseNotes msnaddcontactpage.h Makefile.am #>+ 3 clean-closures: -@@ -1050,19 +1058,10 @@ - #>+ 2 - docs-am: - --#>+ 15 -+#>+ 6 - 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/protocols/msn/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kopete/protocols/msn/Makefile -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --gnu kopete/protocols/msn/Makefile - cd $(top_srcdir) && perl admin/am_edit kopete/protocols/msn/Makefile.in - - -@@ -1088,37 +1087,21 @@ +@@ -1088,37 +1095,21 @@ done @@ -882,7 +171,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3. #>+ 3 cvs-clean: -@@ -1128,7 +1111,7 @@ +@@ -1128,7 +1119,7 @@ kde-rpo-clean: -rm -f *.rpo @@ -891,7 +180,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3. msnnotifysocket.lo: msnnotifysocket.moc msnprotocol.lo: msnprotocol.moc msncontact.o: msncontact.moc -@@ -1139,17 +1122,19 @@ +@@ -1139,17 +1130,19 @@ msnmessagemanager.lo: msnmessagemanager.moc msndebugrawcmddlg.o: msndebugrawcmddlg.moc msnsocket.lo: msnsocket.moc @@ -913,9 +202,9 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3. msnaddcontactpage.lo: msnaddcontactpage.moc msnp2p.o: msnp2p.moc msnfiletransfersocket.lo: msnfiletransfersocket.moc -diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.cpp ---- kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp 2004-08-05 21:26:24.000000000 +0200 -+++ kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.cpp 2005-05-22 19:35:27.000000000 +0200 +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.cpp kdenetwork-3.3.2-new/kopete/protocols/msn/msnnotifysocket.cpp +--- kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.cpp 2004-08-05 22:26:24.000000000 +0300 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/msnnotifysocket.cpp 2005-05-19 23:40:15.000000000 +0300 @@ -23,6 +23,7 @@ #include "msnnotifysocket.h" #include "msncontact.h" @@ -924,23 +213,26 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw #include <qregexp.h> -@@ -47,6 +48,7 @@ +@@ -47,7 +48,8 @@ : MSNSocket( account ) { m_newstatus = MSNProtocol::protocol()->NLN; +- + m_sslLoginHandler=0l; - ++ m_isHotmailAccount=false; m_ping=false; -@@ -67,6 +69,7 @@ + +@@ -66,7 +68,7 @@ + MSNNotifySocket::~MSNNotifySocket() { - delete m_tmpMailFile; +- delete m_tmpMailFile; + delete m_sslLoginHandler; kdDebug(14140) << k_funcinfo << endl; } -@@ -246,7 +249,7 @@ +@@ -246,7 +248,7 @@ if ( cmd == "VER" ) { @@ -949,7 +241,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw /* struct utsname utsBuf; uname ( &utsBuf ); -@@ -264,27 +267,16 @@ +@@ -264,26 +266,15 @@ { if( data.section( ' ', 1, 1 ) == "S" ) { @@ -980,17 +272,14 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw - // This should force kio to download the page even is we are in the konqueror offline mode. [see bug #68483] - job->addMetaData("cache", "reload"); - QObject::connect( job, SIGNAL(result( KIO::Job *)), this, SLOT(slotAuthJobDone( KIO::Job *)) ); -- } + m_sslLoginHandler->login( data.section( ' ' , 2 , 2 ), m_account->accountId() , m_password ); -+ } + } else { - // Successful auth -@@ -569,77 +561,22 @@ - } +@@ -570,76 +561,20 @@ } -- + -void MSNNotifySocket::slotAuthJobDataReceived ( KIO::Job */*job*/,const QByteArray &data) +void MSNNotifySocket::sslLoginFailed() { @@ -998,7 +287,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw -// kdDebug(14140) << "MSNNotifySocket::slotAuthJobDataReceived: " << data << endl; + disconnect(); } - +- -void MSNNotifySocket::slotAuthJobDone ( KIO::Job *job) +void MSNNotifySocket::sslLoginIncorrect() { @@ -1060,13 +349,13 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw - - QRegExp rx(/*URL=http://memberservices.passport.net/memberservice.srf*/"\\?did=[0-9]*&(t=[0-9A-Za-z!$*]*&p=[0-9A-Za-z!$*]*)\""); - rx.search(m_authData); -+ m_badPassword = true; -+ disconnect(); -+} - +- - m_badPassword=true; //if this disconnect, that mean the password was bad - sendCommand("USR" , "TWN S " + rx.cap(1)); - } ++ m_badPassword = true; ++ disconnect(); ++} +void MSNNotifySocket::sslLoginSucceeded(QString a) +{ + sendCommand("USR" , "TWN S " + a); @@ -1075,9 +364,9 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw } -diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.h ---- kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h 2004-06-25 11:10:14.000000000 +0200 -+++ kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.h 2005-05-22 19:35:27.000000000 +0200 +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.h kdenetwork-3.3.2-new/kopete/protocols/msn/msnnotifysocket.h +--- kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.h 2004-06-25 12:10:14.000000000 +0300 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/msnnotifysocket.h 2005-05-19 23:37:35.000000000 +0300 @@ -29,6 +29,7 @@ class MSNDispatchSocket; class MSNAccount; @@ -1086,11 +375,10 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h kdenetwor #include <kio/job.h> -@@ -137,9 +138,9 @@ - void slotResetKeepAlive(); +@@ -138,8 +139,9 @@ + -- - void slotAuthJobDataReceived ( KIO::Job *, const QByteArray &data); - void slotAuthJobDone ( KIO::Job *); + void sslLoginFailed(); @@ -1099,7 +387,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h kdenetwor private: -@@ -171,7 +172,7 @@ +@@ -171,7 +173,7 @@ QString m_kv; QString m_sid; QString m_loginTime; @@ -1108,9 +396,21 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h kdenetwor QTimer *m_keepaliveTimer; -diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.cpp kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.cpp ---- kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.cpp 2005-05-22 19:35:27.000000000 +0200 +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/msnsocket.cpp kdenetwork-3.3.2-new/kopete/protocols/msn/msnsocket.cpp +--- kdenetwork-3.3.2/kopete/protocols/msn/msnsocket.cpp 2004-10-03 10:43:34.000000000 +0300 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/msnsocket.cpp 2005-05-19 23:41:29.000000000 +0300 +@@ -133,7 +133,7 @@ + + void MSNSocket::slotSocketError( int error ) + { +- kdDebug( 14140 ) << k_funcinfo << "Error: " << error << endl; ++ kdWarning( 14140 ) << k_funcinfo << "Error: " << error << " (" << m_socket->errorString() << ")" << endl; + + QString errormsg = i18n( "There was an error while connecting to the MSN server.\nError message:\n" ); + if ( error == KSocketBase::LookupFailure ) +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.cpp kdenetwork-3.3.2-new/kopete/protocols/msn/sslloginhandler.cpp +--- kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.cpp 1970-01-01 03:00:00.000000000 +0300 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/sslloginhandler.cpp 2005-05-19 18:10:06.000000000 +0300 @@ -0,0 +1,453 @@ +//Imported from KMess (2005-05-19) + @@ -1565,9 +865,9 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.cpp kdenetw + } +} + -diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.h kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.h ---- kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.h 1970-01-01 01:00:00.000000000 +0100 -+++ kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.h 2005-05-22 19:35:27.000000000 +0200 +diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.h kdenetwork-3.3.2-new/kopete/protocols/msn/sslloginhandler.h +--- kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.h 1970-01-01 03:00:00.000000000 +0300 ++++ kdenetwork-3.3.2-new/kopete/protocols/msn/sslloginhandler.h 2005-05-19 18:10:06.000000000 +0300 @@ -0,0 +1,96 @@ +//Imported from KMess - 2005-05-19 + |