[pkg-kde-commits] rev 2902 -
trunk/packages/kdenetwork/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Mon Jan 16 17:38:19 UTC 2006
Author: chrsmrtn
Date: 2006-01-16 17:38:15 +0000 (Mon, 16 Jan 2006)
New Revision: 2902
Modified:
trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
Updated buildprep to go with the new meanwhile patch.
Modified: trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/98_buildprep.diff 2006-01-16 16:29:42 UTC (rev 2901)
+++ trunk/packages/kdenetwork/debian/patches/98_buildprep.diff 2006-01-16 17:38:15 UTC (rev 2902)
@@ -2935,7 +2935,7 @@
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIB_SLP GLINC GLLIB include_smpppdcs_TRUE include_smpppdcs_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH KOPETE_INCLUDES KOPETE_COMPAT_INCLUDES LIB_KOPETECOMPAT LIB_XSS include_motionautoaway_TRUE include_motionautoaway_FALSE XMMS_LIBS XMMS_LDFLAGS XMMS_INCLUDES LIBGG_INCLUDES LIBGG_LIBS COMPILE_GADU include_gadu_TRUE include_gadu_FALSE include_libggcopy_TRUE include_libggcopy_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL include_jabber_TRUE include_jabber_FALSE IDN_LDFLAGS IDN_CPPFLAGS IDN_LIBS PKG_CONFIG MEANWHILE_CFLAGS MEANWHILE_LIBS GLIB_CFLAGS GLIB_LIBS include_meanwhile_TRUE include_meanwhile_FALSE include_testbed_TRUE include_testbed_FALSE include_msn_webcam_TRUE include_msn_webcam_FALSE YAHOO2_VERSION SAMPLE_CLIENT_TRUE SAMPLE_CLIENT_FALSE YAHOOPKGREQ LIBXF86VIDMODE COMPILE_GETIFADDRS KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LIBBSD TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE filesharing_SUBDIR_included_TRUE filesharing_SUBDIR_included_FALSE kdict_SUBDIR_included_TRUE kdict_SUBDIR_included_FALSE kdnssd_SUBDIR_included_TRUE kdnssd_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kget_SUBDIR_included_TRUE kget_SUBDIR_included_FALSE kopete_SUBDIR_included_TRUE kopete_SUBDIR_included_FALSE kpf_SUBDIR_included_TRUE kpf_SUBDIR_included_FALSE kppp_SUBDIR_included_TRUE kppp_SUBDIR_included_FALSE krdc_SUBDIR_included_TRUE krdc_SUBDIR_included_FALSE krfb_SUBDIR_included_TRUE krfb_SUBDIR_included_FALSE ksirc_SUBDIR_included_TRUE ksirc_SUBDIR_included_FALSE ktalkd_SUBDIR_included_TRUE ktalkd_SUBDIR_included_FALSE lanbrowsing_SUBDIR_included_TRUE lanbrowsing_SUBDIR_included_FALSE librss_SUBDIR_included_TRUE librss_SUBDIR_included_FALSE wifi_SUBDIR_included_TRUE wifi_SUBDIR_included_FALSE knewsticker_SUBDIR_included_TRUE knewsticker_SUBDIR_included_FALSE dcoprss_SUBDIR_included_TRUE dcoprss_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIB_SLP GLINC GLLIB include_smpppdcs_TRUE include_smpppdcs_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH KOPETE_INCLUDES KOPETE_COMPAT_INCLUDES LIB_KOPETECOMPAT LIB_XSS include_motionautoaway_TRUE include_motionautoaway_FALSE XMMS_LIBS XMMS_LDFLAGS XMMS_INCLUDES LIBGG_INCLUDES LIBGG_LIBS COMPILE_GADU include_gadu_TRUE include_gadu_FALSE include_libggcopy_TRUE include_libggcopy_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL include_jabber_TRUE include_jabber_FALSE IDN_LDFLAGS IDN_CPPFLAGS IDN_LIBS PKG_CONFIG MEANWHILE_CFLAGS MEANWHILE_LIBS GLIB_CFLAGS GLIB_LIBS include_meanwhile_TRUE include_meanwhile_FALSE include_testbed_TRUE include_testbed_FALSE include_msn_webcam_TRUE include_msn_webcam_FALSE YAHOO2_VERSION SAMPLE_CLIENT_TRUE SAMPLE_CLIENT_FALSE YAHOOPKGREQ LIBXF86VIDMODE COMPILE_GETIFADDRS KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LIBBSD TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE filesharing_SUBDIR_included_TRUE filesharing_SUBDIR_included_FALSE kdict_SUBDIR_included_TRUE kdict_SUBDIR_included_FALSE kdnssd_SUBDIR_included_TRUE kdnssd_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kget_SUBDIR_included_TRUE kget_SUBDIR_included_FALSE kopete_SUBDIR_included_TRUE kopete_SUBDIR_included_FALSE kpf_SUBDIR_included_TRUE kpf_SUBDIR_included_FALSE kppp_SUBDIR_included_TRUE kppp_SUBDIR_included_FALSE krdc_SUBDIR_included_TRUE krdc_SUBDIR_included_FALSE krfb_SUBDIR_included_TRUE krfb_SUBDIR_included_FALSE ksirc_SUBDIR_included_TRUE ksirc_SUBDIR_included_FALSE ktalkd_SUBDIR_included_TRUE ktalkd_SUBDIR_included_FALSE lanbrowsing_SUBDIR_included_TRUE lanbrowsing_SUBDIR_included_FALSE librss_SUBDIR_included_TRUE librss_SUBDIR_included_FALSE wifi_SUBDIR_included_TRUE wifi_SUBDIR_included_FALSE knewsticker_SUBDIR_included_TRUE knewsticker_SUBDIR_included_FALSE dcoprss_SUBDIR_included_TRUE dcoprss_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN LIB_SLP GLINC GLLIB include_smpppdcs_TRUE include_smpppdcs_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH KOPETE_INCLUDES KOPETE_COMPAT_INCLUDES LIB_KOPETECOMPAT LIB_XSS include_motionautoaway_TRUE include_motionautoaway_FALSE XMMS_LIBS XMMS_LDFLAGS XMMS_INCLUDES LIBGG_INCLUDES LIBGG_LIBS COMPILE_GADU include_gadu_TRUE include_gadu_FALSE include_libggcopy_TRUE include_libggcopy_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL include_jabber_TRUE include_jabber_FALSE IDN_LDFLAGS IDN_CPPFLAGS IDN_LIBS PKG_CONFIG MEANWHILE_CFLAGS MEANWHILE_LIBS include_meanwhile_TRUE include_meanwhile_FALSE include_testbed_TRUE include_testbed_FALSE include_msn_webcam_TRUE include_msn_webcam_FALSE YAHOO2_VERSION SAMPLE_CLIENT_TRUE SAMPLE_CLIENT_FALSE YAHOOPKGREQ LIBXF86VIDMODE COMPILE_GETIFADDRS KDE_INSTALLED_TRUE KDE_INSTALLED_FALSE LIBBSD TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE filesharing_SUBDIR_included_TRUE filesharing_SUBDIR_included_FALSE kdict_SUBDIR_included_TRUE kdict_SUBDIR_included_FALSE kdnssd_SUBDIR_included_TRUE kdnssd_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kget_SUBDIR_included_TRUE kget_SUBDIR_included_FALSE kopete_SUBDIR_included_TRUE kopete_SUBDIR_included_FALSE kpf_SUBDIR_included_TRUE kpf_SUBDIR_included_FALSE kppp_SUBDIR_included_TRUE kppp_SUBDIR_included_FALSE krdc_SUBDIR_included_TRUE krdc_SUBDIR_included_FALSE krfb_SUBDIR_included_TRUE krfb_SUBDIR_included_FALSE ksirc_SUBDIR_included_TRUE ksirc_SUBDIR_included_FALSE ktalkd_SUBDIR_included_TRUE ktalkd_SUBDIR_included_FALSE lanbrowsing_SUBDIR_included_TRUE lanbrowsing_SUBDIR_included_FALSE librss_SUBDIR_included_TRUE librss_SUBDIR_included_FALSE wifi_SUBDIR_included_TRUE wifi_SUBDIR_included_FALSE knewsticker_SUBDIR_included_TRUE knewsticker_SUBDIR_included_FALSE dcoprss_SUBDIR_included_TRUE dcoprss_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -2948,16 +2948,20 @@
--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,7 +1064,8 @@
+@@ -1062,9 +1064,10 @@
toolchain hidden visibility default=no
--disable-largefile omit support for large files
--disable-slp don't require libslp (Browsing in krfb and krdc not possible)
- --enable-smpppd enable support for smpppd
+- --enable-sametime-plugin
+- build the Kopete Sametime plugin [default=no]
+ --enable-smpppd enable support for the SuSE Meta PPP Daemon (smpppd)
+ (default is NO)
- --enable-sametime-plugin
- build the Kopete Sametime plugin [default=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 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
@@ -11546,7 +11550,248 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41149,8 +41757,7 @@
+@@ -40798,26 +41406,21 @@
+
+
+
+-
+-#
+ # Sametime support
+-#
+
+ # lower and upper-bound versions of Meanwhile library
+
+
+
+ # Let the user disable the plugin
+-# Check whether --enable-sametime-plugin or --disable-sametime-plugin was given.
+-if test "${enable_sametime_plugin+set}" = set; then
+- enableval="$enable_sametime_plugin"
+- compile_meanwhile=$enableval
+-else
+- compile_meanwhile=no
++# Check whether --enable-meanwhile or --disable-meanwhile was given.
++if test "${enable_meanwhile+set}" = set; then
++ enableval="$enable_meanwhile"
+
+ fi;
+
+-# Check and setup for Meanwhile library
++if test "x$enable_meanwhile" != "xno"; then
++ # Check and setup for libmeanwhile
+
+
+ PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
+@@ -40879,23 +41482,23 @@
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- echo "$as_me:$LINENO: checking for meanwhile >= 0.4.2 meanwhile < 0.5.0" >&5
+-echo $ECHO_N "checking for meanwhile >= 0.4.2 meanwhile < 0.5.0... $ECHO_C" >&6
++ echo "$as_me:$LINENO: checking for meanwhile >= 1.0.1 meanwhile < 1.1.0" >&5
++echo $ECHO_N "checking for meanwhile >= 1.0.1 meanwhile < 1.1.0... $ECHO_C" >&6
+
+- if $PKG_CONFIG --exists "meanwhile >= 0.4.2 meanwhile < 0.5.0" ; then
++ if $PKG_CONFIG --exists "meanwhile >= 1.0.1 meanwhile < 1.1.0" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ succeeded=yes
+
+ echo "$as_me:$LINENO: checking MEANWHILE_CFLAGS" >&5
+ echo $ECHO_N "checking MEANWHILE_CFLAGS... $ECHO_C" >&6
+- MEANWHILE_CFLAGS=`$PKG_CONFIG --cflags "meanwhile >= 0.4.2 meanwhile < 0.5.0"`
++ MEANWHILE_CFLAGS=`$PKG_CONFIG --cflags "meanwhile >= 1.0.1 meanwhile < 1.1.0"`
+ echo "$as_me:$LINENO: result: $MEANWHILE_CFLAGS" >&5
+ echo "${ECHO_T}$MEANWHILE_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking MEANWHILE_LIBS" >&5
+ echo $ECHO_N "checking MEANWHILE_LIBS... $ECHO_C" >&6
+- MEANWHILE_LIBS=`$PKG_CONFIG --libs "meanwhile >= 0.4.2 meanwhile < 0.5.0"`
++ MEANWHILE_LIBS=`$PKG_CONFIG --libs "meanwhile >= 1.0.1 meanwhile < 1.1.0"`
+ echo "$as_me:$LINENO: result: $MEANWHILE_LIBS" >&5
+ echo "${ECHO_T}$MEANWHILE_LIBS" >&6
+ else
+@@ -40903,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.
+- MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "meanwhile >= 0.4.2 meanwhile < 0.5.0"`
++ MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "meanwhile >= 1.0.1 meanwhile < 1.1.0"`
+
+ fi
+
+@@ -40916,140 +41519,40 @@
+ fi
+
+ if test $succeeded = yes; then
+- have_meanwhile=yes
++ have_libmeanwhile=yes
+ else
+- have_meanwhile=no
+-
++ have_libmeanwhile=no
+ fi
+
+
+
+-
+-
+-# Check and setup for GLib library
+-
+-
+- PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
+- if test "$prefix" != "$kde_libs_prefix"; then
+- PKG_CONFIG_PATH="$kde_libs_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
+- fi
+- export PKG_CONFIG_PATH
+-
+- succeeded=no
+-
+- if test -z "$PKG_CONFIG"; then
+- # Extract the first word of "pkg-config", so it can be a program name with args.
+-set dummy pkg-config; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $PKG_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+- ;;
+-esac
++ if test "x$have_libmeanwhile" = "xno"; then
++ enable_meanwhile=no
++ echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6
++ else
++ echo "$as_me:$LINENO: result: found" >&5
++echo "${ECHO_T}found" >&6
++ fi
+ fi
+-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+-if test -n "$PKG_CONFIG"; then
+- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+-echo "${ECHO_T}$PKG_CONFIG" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+
+- fi
+
+- if test "$PKG_CONFIG" = "no" ; then
+- echo "*** The pkg-config script could not be found. Make sure it is"
+- echo "*** in your path, or set the PKG_CONFIG environment variable"
+- echo "*** to the full path to pkg-config."
+- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+- else
+- PKG_CONFIG_MIN_VERSION=0.9.0
+- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+- echo "$as_me:$LINENO: checking for glib-2.0 >= 2.0.0" >&5
+-echo $ECHO_N "checking for glib-2.0 >= 2.0.0... $ECHO_C" >&6
+
+- if $PKG_CONFIG --exists "glib-2.0 >= 2.0.0" ; then
+- echo "$as_me:$LINENO: result: yes" >&5
++echo "$as_me:$LINENO: checking if Meanwhile plugin should be compiled" >&5
++echo $ECHO_N "checking if Meanwhile plugin should be compiled... $ECHO_C" >&6
++if test "x$enable_meanwhile" != "xno"; then
++ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+- succeeded=yes
+-
+- echo "$as_me:$LINENO: checking GLIB_CFLAGS" >&5
+-echo $ECHO_N "checking GLIB_CFLAGS... $ECHO_C" >&6
+- GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.0.0"`
+- echo "$as_me:$LINENO: result: $GLIB_CFLAGS" >&5
+-echo "${ECHO_T}$GLIB_CFLAGS" >&6
+-
+- echo "$as_me:$LINENO: checking GLIB_LIBS" >&5
+-echo $ECHO_N "checking GLIB_LIBS... $ECHO_C" >&6
+- GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.0.0"`
+- echo "$as_me:$LINENO: result: $GLIB_LIBS" >&5
+-echo "${ECHO_T}$GLIB_LIBS" >&6
+- else
+- GLIB_CFLAGS=""
+- GLIB_LIBS=""
+- ## If we have a custom action on failure, don't print errors, but
+- ## do set a variable so people can do so.
+- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.0.0"`
+-
+- fi
+-
+-
+-
+- else
+- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+- echo "*** See http://www.freedesktop.org/software/pkgconfig"
+- fi
+- fi
+-
+- if test $succeeded = yes; then
+- have_glib=yes
+- else
+- have_glib=no
+-
+- fi
+-
+-
+-
+-
+-
+-# Do we everything we need to compile the plugin
+-if test "x$have_meanwhile" != "xyes" || test "x$have_glib" != "xyes"; then
+- compile_meanwhile=no
++else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+
+-# Let the user know
+-echo "$as_me:$LINENO: checking if Sametime Plugin should be compiled" >&5
+-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
+
+
+-if test "x$compile_meanwhile" = "xyes"; then
++if test "x$enable_meanwhile" != "xno"; then
+ include_meanwhile_TRUE=
+ include_meanwhile_FALSE='#'
+ else
+@@ -41058,10 +41561,6 @@
+ fi
+
+
+-#
+-# End of Sametime support
+-#
+-
+ # testbed protocol
+ # Check whether --enable-testbed or --disable-testbed was given.
+ if test "${enable_testbed+set}" = set; then
+@@ -41149,8 +41648,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11556,7 +11801,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41192,8 +41799,7 @@
+@@ -41192,8 +41690,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11566,7 +11811,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41250,8 +41856,7 @@
+@@ -41250,8 +41747,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11576,7 +11821,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41419,8 +42024,7 @@
+@@ -41419,8 +41915,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11586,7 +11831,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41480,8 +42084,7 @@
+@@ -41480,8 +41975,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11596,7 +11841,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41554,8 +42157,7 @@
+@@ -41554,8 +42048,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11606,7 +11851,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41619,8 +42221,7 @@
+@@ -41619,8 +42112,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11616,7 +11861,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41684,8 +42285,7 @@
+@@ -41684,8 +42176,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11626,7 +11871,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41750,8 +42350,7 @@
+@@ -41750,8 +42241,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11636,7 +11881,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41816,8 +42415,7 @@
+@@ -41816,8 +42306,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11646,7 +11891,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41920,8 +42518,7 @@
+@@ -41920,8 +42409,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11656,7 +11901,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42059,8 +42656,7 @@
+@@ -42059,8 +42547,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11666,7 +11911,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42126,8 +42722,7 @@
+@@ -42126,8 +42613,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11676,7 +11921,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42283,8 +42878,7 @@
+@@ -42283,8 +42769,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11686,16 +11931,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42371,7 +42965,7 @@
+@@ -42371,7 +42856,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 42374: $i/$j" >&5
-+ echo "configure: 42968: $i/$j" >&5
++ echo "configure: 42859: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -42426,8 +43020,7 @@
+@@ -42426,8 +42911,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11705,7 +11950,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42659,8 +43252,7 @@
+@@ -42659,8 +43143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11715,7 +11960,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42817,8 +43409,7 @@
+@@ -42817,8 +43300,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11725,7 +11970,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42997,8 +43588,7 @@
+@@ -42997,8 +43479,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11735,7 +11980,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43064,8 +43654,7 @@
+@@ -43064,8 +43545,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11745,7 +11990,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43214,8 +43803,7 @@
+@@ -43214,8 +43694,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11755,7 +12000,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43297,8 +43885,7 @@
+@@ -43297,8 +43776,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11765,7 +12010,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43403,8 +43990,7 @@
+@@ -43403,8 +43881,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11775,7 +12020,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43470,8 +44056,7 @@
+@@ -43470,8 +43947,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11785,7 +12030,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43517,8 +44102,7 @@
+@@ -43517,8 +43993,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11795,7 +12040,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43606,8 +44190,7 @@
+@@ -43606,8 +44081,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11805,7 +12050,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43669,8 +44252,7 @@
+@@ -43669,8 +44143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11815,7 +12060,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43730,8 +44312,7 @@
+@@ -43730,8 +44203,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11825,7 +12070,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44744,6 +45325,13 @@
+@@ -44744,6 +45216,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -11839,7 +12084,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -45869,6 +46457,9 @@
+@@ -45869,6 +46348,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -11849,7 +12094,16 @@
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 @@
+@@ -46085,8 +46567,6 @@
+ s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+ s, at MEANWHILE_CFLAGS@,$MEANWHILE_CFLAGS,;t t
+ s, at MEANWHILE_LIBS@,$MEANWHILE_LIBS,;t t
+-s, at GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
+-s, at GLIB_LIBS@,$GLIB_LIBS,;t t
+ s, at include_meanwhile_TRUE@,$include_meanwhile_TRUE,;t t
+ s, at include_meanwhile_FALSE@,$include_meanwhile_FALSE,;t t
+ s, at include_testbed_TRUE@,$include_testbed_TRUE,;t t
+@@ -46307,11 +46787,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -11861,7 +12115,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 @@
+@@ -46350,6 +46825,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -11918,9 +12172,100 @@
if ( maj != 1 ) {
return 1;
}
+@@ -646,55 +661,44 @@
+ AC_SUBST(IDN_CPPFLAGS)
+ AC_SUBST(IDN_LIBS)
+
+-
+-#
+ # Sametime support
+-#
+
+ # lower and upper-bound versions of Meanwhile library
+-m4_define(meanwhile_version_min, 0.4.2)
+-m4_define(meanwhile_version_max, 0.5.0)
++m4_define(libmeanwhile_version_min, 1.0.1)
++m4_define(libmeanwhile_version_max, 1.1.0)
+
+ # Let the user disable the plugin
+-AC_ARG_ENABLE(sametime-plugin,
+- AC_HELP_STRING([--enable-sametime-plugin], [build the Kopete Sametime plugin @<:@default=no@:>@]),
+- [compile_meanwhile=$enableval],
+- [compile_meanwhile=no]
++AC_ARG_ENABLE(meanwhile,
++ AC_HELP_STRING([--disable-meanwhile],
++ [disable the Kopete Meanwhile plugin (Lotus Sametime support) @<:@default=enabled@:>@]),
+ )
+
+-# Check and setup for Meanwhile library
+-KDE_PKG_CHECK_MODULES(MEANWHILE,
+- [meanwhile >= meanwhile_version_min meanwhile < meanwhile_version_max],
+- [have_meanwhile=yes],
+- [have_meanwhile=no]
+- )
++if test "x$enable_meanwhile" != "xno"; then
++ # Check and setup for libmeanwhile
++ KDE_PKG_CHECK_MODULES(MEANWHILE,
++ [meanwhile >= libmeanwhile_version_min meanwhile < libmeanwhile_version_max],
++ [have_libmeanwhile=yes], [have_libmeanwhile=no])
++
++ if test "x$have_libmeanwhile" = "xno"; then
++ enable_meanwhile=no
++ AC_MSG_RESULT([not found])
++ else
++ AC_MSG_RESULT([found])
++ fi
++fi
++
+ AC_SUBST(MEANWHILE_CFLAGS)
+ AC_SUBST(MEANWHILE_LIBS)
+
+-# Check and setup for GLib library
+-KDE_PKG_CHECK_MODULES(GLIB,
+- [glib-2.0 >= 2.0.0],
+- [have_glib=yes],
+- [have_glib=no]
+- )
+-AC_SUBST(GLIB_CFLAGS)
+-AC_SUBST(GLIB_LIBS)
+-
+-# Do we everything we need to compile the plugin
+-if test "x$have_meanwhile" != "xyes" || test "x$have_glib" != "xyes"; then
+- compile_meanwhile=no
++AC_MSG_CHECKING([if Meanwhile plugin should be compiled])
++if test "x$enable_meanwhile" != "xno"; then
++ AC_MSG_RESULT([yes])
++else
++ AC_MSG_RESULT([no])
+ fi
+
+-# Let the user know
+-AC_MSG_CHECKING([if Sametime Plugin should be compiled])
+-AC_MSG_RESULT($compile_meanwhile)
+-
+-# Here we go
+-AM_CONDITIONAL(include_meanwhile, [test "x$compile_meanwhile" = "xyes"])
+-
+-#
+-# End of Sametime support
+-#
++# Set the flag to compile meanwhile
++AM_CONDITIONAL(include_meanwhile, [test "x$enable_meanwhile" != "xno"])
+
+ # testbed protocol
+ dnl define the configure option that disables testbed protocol
--- dcoprss/Makefile.in
+++ dcoprss/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -164,8 +164,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -265,6 +263,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11930,7 +12275,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -482,7 +483,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11939,7 +12284,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -520,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11951,7 +12296,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -821,18 +824,18 @@
+@@ -821,18 +822,18 @@
mocs: feedbrowser.moc
#>+ 3
@@ -11976,7 +12321,7 @@
#>+ 3
service.moc: $(srcdir)/service.h
-@@ -853,7 +856,7 @@
+@@ -853,7 +854,7 @@
#>+ 3
clean-metasources:
@@ -11985,7 +12330,7 @@
#>+ 2
KDE_DIST=Makefile.in rssnewsfeed.h rssservice.desktop feedbrowser.h Makefile.am test.sh
-@@ -919,7 +922,7 @@
+@@ -919,7 +920,7 @@
rm -f feedbrowser.all_cpp.final feedbrowser.all_cpp.files
#>+ 11
@@ -11996,7 +12341,16 @@
echo "#define KDE_USE_FINAL 1" >> rssservice.all_cpp.final; \
--- doc/kcontrol/kcmktalkd/Makefile.in
+++ doc/kcontrol/kcmktalkd/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12006,7 +12360,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12015,7 +12369,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12029,7 +12383,16 @@
mostlyclean-libtool:
--- doc/kcontrol/lanbrowser/Makefile.in
+++ doc/kcontrol/lanbrowser/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12039,7 +12402,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12048,7 +12411,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12062,7 +12425,16 @@
mostlyclean-libtool:
--- doc/kcontrol/Makefile.in
+++ doc/kcontrol/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12072,7 +12444,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
xdg_menudir = @xdg_menudir@
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -12081,7 +12453,7 @@
KDE_LANG = en
KDE_DOCS = AUTO
#>- all: all-recursive
-@@ -413,7 +416,7 @@
+@@ -413,7 +414,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -12090,7 +12462,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -451,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12104,7 +12476,16 @@
mostlyclean-libtool:
--- doc/kdict/Makefile.in
+++ doc/kdict/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12114,7 +12495,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12123,7 +12504,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12135,7 +12516,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
KDE_DIST=Makefile.in applet.png seteditor.png index.docbook mainwin.png Makefile.am conf.png index.cache.bz2
#>+ 24
@@ -12144,7 +12525,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -609,20 +612,20 @@
+@@ -609,20 +610,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict
@@ -12170,7 +12551,16 @@
--- doc/kget/Makefile.in
+++ doc/kget/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12180,7 +12570,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12189,7 +12579,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12201,7 +12591,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -579,10 +582,10 @@
+@@ -579,10 +580,10 @@
.NOEXPORT:
#>+ 2
@@ -12214,7 +12604,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -609,20 +612,20 @@
+@@ -609,20 +610,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget
@@ -12240,7 +12630,16 @@
--- doc/knewsticker/Makefile.in
+++ doc/knewsticker/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12250,7 +12649,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12259,7 +12658,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12271,7 +12670,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -579,10 +582,10 @@
+@@ -579,10 +580,10 @@
.NOEXPORT:
#>+ 2
@@ -12284,7 +12683,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -609,20 +612,20 @@
+@@ -609,20 +610,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker
@@ -12310,7 +12709,16 @@
--- doc/kopete/Makefile.in
+++ doc/kopete/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12320,7 +12728,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12329,7 +12737,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12341,7 +12749,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
KDE_DIST=Makefile.in index.docbook menus.docbook Makefile.am index.cache.bz2
#>+ 24
@@ -12350,7 +12758,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -609,20 +612,20 @@
+@@ -609,20 +610,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete
@@ -12376,7 +12784,16 @@
--- doc/kpf/Makefile.in
+++ doc/kpf/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12386,7 +12803,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12395,7 +12812,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12409,7 +12826,16 @@
mostlyclean-libtool:
--- doc/kppp/Makefile.in
+++ doc/kppp/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12419,7 +12845,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12428,7 +12854,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12440,7 +12866,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
KDE_DIST=kppp-account-ip-tab.png callback.docbook kppp-faq.docbook kppp-account-login-script-tab.png getting-online.docbook kppp-account-dns-tab.png kppp-misc-tab.png kppp-wizard.png index.docbook kppp-graph-tab.png kppp-modem-tab.png dialog-setup.docbook global-settings.docbook accounting.docbook costsgraphs.png chap.docbook wizard.docbook kppp-account-dial-tab.png ttyS-cua.txt Makefile.in kppp-config.png kppp.faq.question kppp-account-gateway-tab.png tricks.docbook hayes.docbook kppp-dialler-tab.png kppp-device-tab.png security.docbook kppp-account-accounting-tab.png Makefile.am costsgraphs.fig kppp-account-execute-tab.png index.cache.bz2
#>+ 24
@@ -12449,7 +12875,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -609,20 +612,20 @@
+@@ -609,20 +610,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp
@@ -12475,7 +12901,16 @@
--- doc/krdc/Makefile.in
+++ doc/krdc/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12485,7 +12920,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12494,7 +12929,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12506,7 +12941,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -579,10 +582,10 @@
+@@ -579,10 +580,10 @@
.NOEXPORT:
#>+ 2
@@ -12519,7 +12954,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -609,20 +612,20 @@
+@@ -609,20 +610,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc
@@ -12545,7 +12980,16 @@
--- doc/krfb/Makefile.in
+++ doc/krfb/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12555,7 +12999,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12564,7 +13008,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12576,7 +13020,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -579,10 +582,10 @@
+@@ -579,10 +580,10 @@
.NOEXPORT:
#>+ 2
@@ -12589,7 +13033,7 @@
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
-@@ -609,20 +612,20 @@
+@@ -609,20 +610,20 @@
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb
@@ -12615,7 +13059,16 @@
--- doc/ksirc/Makefile.in
+++ doc/ksirc/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12625,7 +13078,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12634,7 +13087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12648,7 +13101,16 @@
mostlyclean-libtool:
--- doc/ktalkd/Makefile.in
+++ doc/ktalkd/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12658,7 +13120,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12667,7 +13129,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12681,7 +13143,16 @@
mostlyclean-libtool:
--- doc/kwifimanager/Makefile.in
+++ doc/kwifimanager/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12691,7 +13162,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12700,7 +13171,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12714,7 +13185,16 @@
mostlyclean-libtool:
--- doc/lisa/Makefile.in
+++ doc/lisa/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12724,7 +13204,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -12733,7 +13213,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12747,7 +13227,16 @@
mostlyclean-libtool:
--- doc/Makefile.in
+++ doc/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12757,7 +13246,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -407,13 +410,13 @@
+@@ -407,13 +408,13 @@
KDE_DOCS = AUTO
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -12773,7 +13262,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -451,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12787,7 +13276,16 @@
mostlyclean-libtool:
--- filesharing/advanced/kcm_sambaconf/Makefile.in
+++ filesharing/advanced/kcm_sambaconf/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -159,8 +159,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -260,6 +258,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12797,7 +13295,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -527,7 +528,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12806,7 +13304,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -565,9 +566,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12818,7 +13316,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -879,18 +882,18 @@
+@@ -879,18 +880,18 @@
mocs: kcmsambaconf.moc
#>+ 3
@@ -12843,7 +13341,7 @@
#>+ 3
hiddenfileview.moc: $(srcdir)/hiddenfileview.h
-@@ -959,10 +962,10 @@
+@@ -959,10 +960,10 @@
#>+ 3
clean-metasources:
@@ -12858,7 +13356,16 @@
clean-ui:
--- filesharing/advanced/Makefile.in
+++ filesharing/advanced/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12868,7 +13375,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -12877,7 +13384,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12891,7 +13398,16 @@
mostlyclean-libtool:
--- filesharing/advanced/nfs/Makefile.in
+++ filesharing/advanced/nfs/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -130,8 +130,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -231,6 +229,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12901,7 +13417,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -447,7 +448,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12910,7 +13426,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -485,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12924,7 +13440,16 @@
clean-noinstLTLIBRARIES:
--- filesharing/advanced/propsdlgplugin/Makefile.in
+++ filesharing/advanced/propsdlgplugin/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -152,8 +152,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -253,6 +251,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12934,7 +13459,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -471,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12943,7 +13468,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -509,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12957,7 +13482,16 @@
@$(NORMAL_INSTALL)
--- filesharing/Makefile.in
+++ filesharing/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12967,7 +13501,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -12976,7 +13510,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12990,7 +13524,16 @@
mostlyclean-libtool:
--- filesharing/simple/Makefile.in
+++ filesharing/simple/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -147,8 +147,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -248,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13000,7 +13543,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -469,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13009,7 +13552,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -507,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13023,7 +13566,16 @@
@$(NORMAL_INSTALL)
--- kdict/applet/Makefile.in
+++ kdict/applet/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -141,8 +141,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -242,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13033,7 +13585,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -449,7 +450,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13042,7 +13594,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -487,9 +488,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13056,7 +13608,16 @@
@$(NORMAL_INSTALL)
--- kdict/Makefile.in
+++ kdict/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -175,8 +175,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -276,6 +274,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13066,7 +13627,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -503,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13075,7 +13636,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13087,7 +13648,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1051,13 +1054,6 @@
+@@ -1051,13 +1052,6 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub dcopinterface.kidl
#>+ 3
@@ -13101,7 +13662,7 @@
actions.moc: $(srcdir)/actions.h
$(MOC) $(srcdir)/actions.h -o actions.moc
-@@ -1065,25 +1061,18 @@
+@@ -1065,25 +1059,18 @@
mocs: actions.moc
#>+ 3
@@ -13133,7 +13694,7 @@
#>+ 3
application.moc: $(srcdir)/application.h
-@@ -1106,6 +1095,20 @@
+@@ -1106,6 +1093,20 @@
#>+ 2
mocs: dict.moc
@@ -13154,7 +13715,7 @@
#>+ 8
kdict.la.closure: $(kdict_la_OBJECTS) $(kdict_la_DEPENDENCIES)
@echo "int main() {return 0;}" > kdict_la_closure.cpp
-@@ -1117,10 +1120,10 @@
+@@ -1117,10 +1118,10 @@
#>+ 3
clean-metasources:
@@ -13167,7 +13728,7 @@
#>+ 4
clean-idl:
-@@ -1136,8 +1139,6 @@
+@@ -1136,8 +1137,6 @@
#>+ 22
install-kde-icons:
@@ -13176,7 +13737,7 @@
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
$(INSTALL_DATA) $(srcdir)/hi32-app-kdict.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdict.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-@@ -1146,15 +1147,17 @@
+@@ -1146,15 +1145,17 @@
$(INSTALL_DATA) $(srcdir)/hisc-app-kdict.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdict.svgz
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
$(INSTALL_DATA) $(srcdir)/hi64-app-kdict.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdict.png
@@ -13195,7 +13756,7 @@
-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdict.png
#>+ 15
-@@ -1196,7 +1199,7 @@
+@@ -1196,7 +1197,7 @@
#>+ 11
@@ -13206,7 +13767,16 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdict_la.all_cpp.final; \
--- kdict/pics/Makefile.in
+++ kdict/pics/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13216,7 +13786,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13225,7 +13795,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13237,7 +13807,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -584,19 +587,19 @@
+@@ -584,19 +585,19 @@
#>+ 15
install-kde-icons:
@@ -13262,7 +13832,16 @@
force-reedit:
--- kdnssd/ioslave/Makefile.in
+++ kdnssd/ioslave/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -142,8 +142,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -243,6 +241,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13272,7 +13851,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -452,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13281,7 +13860,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -490,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13293,7 +13872,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -830,7 +833,7 @@
+@@ -830,7 +831,7 @@
-rm -f dnssd.moc
#>+ 2
@@ -13304,7 +13883,16 @@
clean-closures:
--- kdnssd/kdedmodule/Makefile.in
+++ kdnssd/kdedmodule/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -141,8 +141,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -242,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13314,7 +13902,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -449,7 +450,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13323,7 +13911,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -487,9 +488,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13337,7 +13925,16 @@
@$(NORMAL_INSTALL)
--- kdnssd/Makefile.in
+++ kdnssd/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13347,7 +13944,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13356,7 +13953,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13370,7 +13967,16 @@
mostlyclean-libtool:
--- kfile-plugins/Makefile.in
+++ kfile-plugins/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13380,7 +13986,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13389,7 +13995,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13403,7 +14009,16 @@
mostlyclean-libtool:
--- kfile-plugins/torrent/Makefile.in
+++ kfile-plugins/torrent/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -146,8 +146,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -247,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13413,7 +14028,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -459,7 +460,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13422,7 +14037,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -497,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13436,7 +14051,16 @@
@$(NORMAL_INSTALL)
--- kget/icons/Makefile.in
+++ kget/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13446,7 +14070,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13455,7 +14079,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13467,7 +14091,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,7 +580,7 @@
+@@ -577,7 +578,7 @@
.NOEXPORT:
#>+ 2
@@ -13476,7 +14100,7 @@
#>+ 2
docs-am:
-@@ -586,59 +589,59 @@
+@@ -586,59 +587,59 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions
$(INSTALL_DATA) $(srcdir)/cr22-action-tool_offline_mode_on.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_on.png
@@ -13568,7 +14192,16 @@
force-reedit:
--- kget/kget_plug_in/Makefile.in
+++ kget/kget_plug_in/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -140,8 +140,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -241,6 +239,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13578,7 +14211,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -447,7 +448,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13587,7 +14220,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -485,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13601,7 +14234,16 @@
@$(NORMAL_INSTALL)
--- kget/Makefile.in
+++ kget/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -182,8 +182,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -283,6 +281,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13611,7 +14253,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -524,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13620,7 +14262,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -562,9 +563,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13632,7 +14274,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1071,18 +1074,18 @@
+@@ -1071,18 +1072,18 @@
mocs: dlgAdvanced.moc
#>+ 3
@@ -13657,7 +14299,7 @@
#>+ 3
slave.moc: $(srcdir)/slave.h
-@@ -1113,18 +1116,18 @@
+@@ -1113,18 +1114,18 @@
mocs: dlgSystem.moc
#>+ 3
@@ -13682,7 +14324,7 @@
#>+ 3
droptarget.moc: $(srcdir)/droptarget.h
-@@ -1163,7 +1166,7 @@
+@@ -1163,7 +1164,7 @@
#>+ 3
clean-metasources:
@@ -13691,7 +14333,7 @@
#>+ 2
KDE_DIST=cr32-mime-kget_list.png dlglimitsbase.ui eventsrc dlgadvancedbase.ui dlgsystembase.ui safedelete.h dlgautomationbase.ui dlgdirectoriesbase.ui dlgconnectionbase.ui cr16-mime-kget_list.png cr48-app-kget.png cr16-app-kget.png kgetui.rc cr22-app-kget.png cr22-mime-kget_list.png kget_download.desktop Makefile.in x-kgetlist.desktop cr32-app-kget.png cr48-mime-kget_list.png Makefile.am kget_iface.h
-@@ -1188,31 +1191,31 @@
+@@ -1188,31 +1189,31 @@
#>+ 28
install-kde-icons:
@@ -13735,7 +14377,7 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kget_list.png
#>+ 15
-@@ -1254,7 +1257,7 @@
+@@ -1254,7 +1255,7 @@
#>+ 11
@@ -13746,7 +14388,16 @@
echo "#define KDE_USE_FINAL 1" >> kget.all_cpp.final; \
--- kget/pics/Makefile.in
+++ kget/pics/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13756,7 +14407,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -411,7 +414,7 @@
+@@ -411,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13765,7 +14416,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -449,9 +452,9 @@
+@@ -449,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13779,7 +14430,16 @@
mostlyclean-libtool:
--- kget/sounds/Makefile.in
+++ kget/sounds/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13789,7 +14449,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -406,7 +409,7 @@
+@@ -406,7 +407,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13798,7 +14458,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -444,9 +447,9 @@
+@@ -444,9 +445,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13812,7 +14472,16 @@
mostlyclean-libtool:
--- knewsticker/common/Makefile.in
+++ knewsticker/common/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -136,8 +136,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -237,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13822,7 +14491,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -450,7 +451,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13831,7 +14500,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -488,9 +489,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13845,7 +14514,16 @@
clean-noinstLTLIBRARIES:
--- knewsticker/knewstickerstub/Makefile.in
+++ knewsticker/knewstickerstub/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -139,8 +139,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -240,6 +238,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13855,7 +14533,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -444,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13864,7 +14542,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -482,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13878,7 +14556,16 @@
@$(NORMAL_INSTALL)
--- knewsticker/kntsrcfilepropsdlg/Makefile.in
+++ knewsticker/kntsrcfilepropsdlg/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -143,8 +143,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -244,6 +242,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13888,7 +14575,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -454,7 +457,7 @@
+@@ -454,7 +455,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13897,7 +14584,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -492,9 +495,9 @@
+@@ -492,9 +493,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13911,7 +14598,16 @@
@$(NORMAL_INSTALL)
--- knewsticker/Makefile.in
+++ knewsticker/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -171,8 +171,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -272,6 +270,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13921,7 +14617,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -497,7 +498,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13930,7 +14626,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -535,9 +536,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13942,7 +14638,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1032,18 +1035,18 @@
+@@ -1032,18 +1033,18 @@
mocs: newsscroller.moc
#>+ 3
@@ -13967,7 +14663,7 @@
#>+ 3
newssourcedlgimpl.moc: $(srcdir)/newssourcedlgimpl.h
-@@ -1054,10 +1057,10 @@
+@@ -1054,10 +1055,10 @@
#>+ 3
clean-metasources:
@@ -13980,7 +14676,7 @@
#>+ 4
clean-idl:
-@@ -1079,17 +1082,17 @@
+@@ -1079,17 +1080,17 @@
#>+ 13
install-kde-icons:
@@ -14001,7 +14697,7 @@
#>+ 15
force-reedit:
-@@ -1130,7 +1133,7 @@
+@@ -1130,7 +1131,7 @@
#>+ 11
@@ -14012,7 +14708,16 @@
echo "#define KDE_USE_FINAL 1" >> knewsticker_panelapplet_la.all_cpp.final; \
--- kopete/icons/Makefile.in
+++ kopete/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14022,7 +14727,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14031,7 +14736,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14043,7 +14748,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,116 +580,116 @@
+@@ -577,116 +578,116 @@
.NOEXPORT:
#>+ 2
@@ -14235,7 +14940,16 @@
force-reedit:
--- kopete/kopete/addaccountwizard/Makefile.in
+++ kopete/kopete/addaccountwizard/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -134,8 +134,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -235,6 +233,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14245,7 +14959,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -443,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14254,7 +14968,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -481,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14268,7 +14982,16 @@
clean-noinstLTLIBRARIES:
--- kopete/kopete/addcontactwizard/Makefile.in
+++ kopete/kopete/addcontactwizard/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -135,8 +135,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -236,6 +234,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14278,7 +15001,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -444,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14287,7 +15010,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -482,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14301,7 +15024,16 @@
clean-noinstLTLIBRARIES:
--- kopete/kopete/chatwindow/Makefile.in
+++ kopete/kopete/chatwindow/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -175,8 +175,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -276,6 +274,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14311,7 +15043,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -499,7 +500,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14320,7 +15052,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -537,9 +538,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14332,7 +15064,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -922,11 +925,11 @@
+@@ -922,11 +923,11 @@
mocs: kopeteemailwindow.moc
#>+ 3
@@ -14347,7 +15079,7 @@
#>+ 3
kopetechatwindow.moc: $(srcdir)/kopetechatwindow.h
-@@ -936,11 +939,11 @@
+@@ -936,11 +937,11 @@
mocs: kopetechatwindow.moc
#>+ 3
@@ -14362,7 +15094,7 @@
#>+ 8
kopete_emailwindow.la.closure: $(kopete_emailwindow_la_OBJECTS) $(kopete_emailwindow_la_DEPENDENCIES)
-@@ -962,7 +965,7 @@
+@@ -962,7 +963,7 @@
#>+ 3
clean-metasources:
@@ -14371,7 +15103,7 @@
#>+ 2
KDE_DIST=kopeteemailwindow.rc kopetechatwindow.h emoticonselector.h krichtexteditpart.h chatmessagepart.h emailwindow.desktop chatwindow.desktop chattexteditpart.h chatmemberslistwidget.h kopetechatwindow.rc chatview.h Makefile.in kopeteemoticonaction.h kopeterichtexteditpartfull.rc kopeteemailwindow.h Makefile.am
-@@ -1013,7 +1016,7 @@
+@@ -1013,7 +1014,7 @@
#>+ 11
@@ -14382,7 +15114,16 @@
echo "#define KDE_USE_FINAL 1" >> kopete_chatwindow_la.all_cpp.final; \
--- kopete/kopete/config/accounts/Makefile.in
+++ kopete/kopete/config/accounts/Makefile.in
-@@ -246,6 +246,9 @@
+@@ -145,8 +145,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -246,6 +244,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14392,7 +15133,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -457,7 +460,7 @@
+@@ -457,7 +458,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14401,7 +15142,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -495,9 +498,9 @@
+@@ -495,9 +496,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14415,7 +15156,16 @@
@$(NORMAL_INSTALL)
--- kopete/kopete/config/appearance/Makefile.in
+++ kopete/kopete/config/appearance/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -146,8 +146,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -247,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14425,7 +15175,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -468,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14434,7 +15184,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -506,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14448,7 +15198,16 @@
@$(NORMAL_INSTALL)
--- kopete/kopete/config/avdevice/Makefile.in
+++ kopete/kopete/config/avdevice/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -149,8 +149,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -250,6 +248,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14458,7 +15217,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -473,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14467,7 +15226,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -511,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14479,7 +15238,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -829,20 +832,20 @@
+@@ -829,20 +830,20 @@
#>+ 16
install-kde-icons:
@@ -14508,7 +15267,16 @@
force-reedit:
--- kopete/kopete/config/behavior/Makefile.in
+++ kopete/kopete/config/behavior/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -144,8 +144,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -245,6 +243,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14518,7 +15286,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -461,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14527,7 +15295,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -499,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14539,7 +15307,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -800,7 +803,7 @@
+@@ -800,7 +801,7 @@
-rm -f behaviorconfig.moc
#>+ 2
@@ -14550,7 +15318,16 @@
clean-ui:
--- kopete/kopete/config/identity/Makefile.in
+++ kopete/kopete/config/identity/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -147,8 +147,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -248,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14560,7 +15337,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -463,7 +464,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14569,7 +15346,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -501,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14581,7 +15358,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -809,22 +812,22 @@
+@@ -809,22 +810,22 @@
#>+ 3
@@ -14611,7 +15388,7 @@
#>+ 2
KDE_DIST=globalidentitiesmanager.h kopeteidentityconfigbase.ui kopeteidentityconfigpreferences.kcfgc kopeteidentityconfig.h kopeteidentityconfigpreferences.kcfg Makefile.in kopete_identityconfig.desktop Makefile.am
-@@ -885,7 +888,7 @@
+@@ -885,7 +886,7 @@
#>+ 11
@@ -14622,7 +15399,16 @@
echo "#define KDE_USE_FINAL 1" >> kcm_kopete_identityconfig_la.all_cpp.final; \
--- kopete/kopete/config/Makefile.in
+++ kopete/kopete/config/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14632,7 +15418,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14641,7 +15427,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14655,7 +15441,16 @@
mostlyclean-libtool:
--- kopete/kopete/config/plugins/Makefile.in
+++ kopete/kopete/config/plugins/Makefile.in
-@@ -228,6 +228,9 @@
+@@ -127,8 +127,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -228,6 +226,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14665,7 +15460,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -431,7 +434,7 @@
+@@ -431,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14674,7 +15469,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +472,9 @@
+@@ -469,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14688,7 +15483,16 @@
clean-noinstLTLIBRARIES:
--- kopete/kopete/contactlist/Makefile.in
+++ kopete/kopete/contactlist/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -140,8 +140,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -241,6 +239,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14698,7 +15502,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -467,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14707,7 +15511,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -505,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14719,7 +15523,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -746,18 +749,18 @@
+@@ -746,18 +747,18 @@
.NOEXPORT:
#>+ 3
@@ -14744,7 +15548,7 @@
#>+ 3
kopetelviprops.moc: $(srcdir)/kopetelviprops.h
-@@ -774,18 +777,18 @@
+@@ -774,18 +775,18 @@
mocs: kopetecontactlistview.moc
#>+ 3
@@ -14769,7 +15573,7 @@
#>+ 3
kabcexport.moc: $(srcdir)/kabcexport.h
-@@ -796,10 +799,10 @@
+@@ -796,10 +797,10 @@
#>+ 3
clean-metasources:
@@ -14784,7 +15588,16 @@
clean-ui:
--- kopete/kopete/kconf_update/Makefile.in
+++ kopete/kopete/kconf_update/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -166,8 +166,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -267,6 +265,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14794,7 +15607,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -484,7 +487,7 @@
+@@ -484,7 +485,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14803,7 +15616,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -522,9 +525,9 @@
+@@ -522,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14817,7 +15630,16 @@
@$(NORMAL_INSTALL)
--- kopete/kopete/Makefile.in
+++ kopete/kopete/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -172,8 +172,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -273,6 +271,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14827,7 +15649,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -519,7 +520,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14836,7 +15658,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -557,9 +558,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14848,7 +15670,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1007,18 +1010,18 @@
+@@ -1007,18 +1008,18 @@
mocs: kopetewindow.moc
#>+ 3
@@ -14873,7 +15695,7 @@
#>+ 3
kopeteeditglobalidentitywidget.moc: $(srcdir)/kopeteeditglobalidentitywidget.h
-@@ -1043,10 +1046,10 @@
+@@ -1043,10 +1044,10 @@
#>+ 3
clean-metasources:
@@ -14886,7 +15708,7 @@
#>+ 5
clean-idl:
-@@ -1060,43 +1063,43 @@
+@@ -1060,43 +1061,43 @@
#>+ 40
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
@@ -14951,7 +15773,7 @@
#>+ 15
force-reedit:
-@@ -1137,7 +1140,7 @@
+@@ -1137,7 +1138,7 @@
#>+ 11
@@ -14962,7 +15784,16 @@
echo "#define KDE_USE_FINAL 1" >> kopete.all_cpp.final; \
--- kopete/libkopete/avdevice/Makefile.in
+++ kopete/libkopete/avdevice/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -154,8 +154,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -255,6 +253,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14972,7 +15803,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -472,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14981,7 +15812,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -510,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14995,7 +15826,16 @@
@$(NORMAL_INSTALL)
--- kopete/libkopete/Makefile.in
+++ kopete/libkopete/Makefile.in
-@@ -312,6 +312,9 @@
+@@ -211,8 +211,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -312,6 +310,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15005,7 +15845,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15014,7 +15854,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15026,7 +15866,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1226,18 +1229,18 @@
+@@ -1226,18 +1227,18 @@
mocs: kopeteaccount.moc
#>+ 3
@@ -15051,7 +15891,7 @@
#>+ 3
kopeteaccountmanager.moc: $(srcdir)/kopeteaccountmanager.h
-@@ -1254,18 +1257,18 @@
+@@ -1254,18 +1255,18 @@
mocs: kopetecommandhandler.moc
#>+ 3
@@ -15076,7 +15916,7 @@
#>+ 3
kautoconfig.moc: $(srcdir)/kautoconfig.h
-@@ -1373,18 +1376,18 @@
+@@ -1373,18 +1374,18 @@
mocs: kopeteplugin.moc
#>+ 3
@@ -15101,7 +15941,7 @@
#>+ 3
kopetecontactlist.moc: $(srcdir)/kopetecontactlist.h
-@@ -1451,7 +1454,7 @@
+@@ -1451,7 +1452,7 @@
#>+ 3
clean-metasources:
@@ -15110,7 +15950,7 @@
#>+ 2
KDE_DIST=connectionmanager.h PORTING kopetemessagemanagerfactory.h kopetenotifyevent.h API-TODO kopeteconfig.kcfgc kautoconfig.h kopetewalletmanager.h clientiface.h kopetemessagemanager.h kopeteutils.h kopeteui.desktop kopetepluginmanager.h kopete.kcfg kopetemimesourcefactory.h kopeteplugin.desktop kopetecommandui.rc kcautoconfigmodule.h knotification.h configure.in.in Makefile.in kopeteproperties.h kopeteprotocol.desktop Makefile.am networkstatuscommon.cpp
-@@ -1513,7 +1516,7 @@
+@@ -1513,7 +1514,7 @@
#>+ 11
@@ -15121,7 +15961,16 @@
echo "#define KDE_USE_FINAL 1" >> libkopete_la.all_cpp.final; \
--- kopete/libkopete/private/Makefile.in
+++ kopete/libkopete/private/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -131,8 +131,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -232,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15131,7 +15980,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -439,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15140,7 +15989,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15152,7 +16001,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -752,7 +755,7 @@
+@@ -752,7 +753,7 @@
-rm -f kopeteviewmanager.moc kopeteemoticons.moc kopeteprefs.moc kopetecommand.moc kopeteutils_private.moc
#>+ 2
@@ -15163,7 +16012,16 @@
docs-am:
--- kopete/libkopete/tests/Makefile.in
+++ kopete/libkopete/tests/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -203,8 +203,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -304,6 +302,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15173,7 +16031,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -530,7 +531,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15182,7 +16040,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -568,9 +569,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15196,7 +16054,16 @@
clean-checkLTLIBRARIES:
--- kopete/libkopete/tests/mock/Makefile.in
+++ kopete/libkopete/tests/mock/Makefile.in
-@@ -239,6 +239,9 @@
+@@ -138,8 +138,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -239,6 +237,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15206,7 +16073,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -445,7 +446,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15215,7 +16082,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -483,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15229,7 +16096,16 @@
clean-noinstLTLIBRARIES:
--- kopete/libkopete/ui/Makefile.in
+++ kopete/libkopete/ui/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -156,8 +156,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -257,6 +255,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15239,7 +16115,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -487,7 +490,7 @@
+@@ -487,7 +488,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15248,7 +16124,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +528,9 @@
+@@ -525,9 +526,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15260,7 +16136,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -859,18 +862,18 @@
+@@ -859,18 +860,18 @@
mocs: kopetelistviewitem.moc
#>+ 3
@@ -15285,7 +16161,7 @@
#>+ 3
addressbookselectorwidget.moc: $(srcdir)/addressbookselectorwidget.h
-@@ -895,7 +898,7 @@
+@@ -895,7 +896,7 @@
#>+ 3
clean-metasources:
@@ -15296,7 +16172,16 @@
KDE_DIST=contactaddednotifywidget.ui kopetewidgets.cpp fileconfirmbase.ui kopete.widgets addressbookselectorwidget_base.ui metacontactselectorwidget.h contactaddednotifydialog.h widgets.cw kopetepasswordwidgetbase.ui kopeteawaydialogbase.ui metacontactselectorwidget_base.ui Makefile.in kopetepassworddialog.ui Makefile.am
--- kopete/Makefile.in
+++ kopete/Makefile.in
-@@ -214,6 +214,9 @@
+@@ -113,8 +113,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -214,6 +212,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15306,7 +16191,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -412,7 +415,7 @@
+@@ -412,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -15315,7 +16200,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -450,9 +453,9 @@
+@@ -450,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15329,7 +16214,16 @@
mostlyclean-libtool:
--- kopete/plugins/addbookmarks/Makefile.in
+++ kopete/plugins/addbookmarks/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -161,8 +161,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -262,6 +260,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15339,7 +16233,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -484,7 +487,7 @@
+@@ -484,7 +485,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15348,7 +16242,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -522,9 +525,9 @@
+@@ -522,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15362,7 +16256,16 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/alias/Makefile.in
+++ kopete/plugins/alias/Makefile.in
-@@ -252,6 +252,9 @@
+@@ -151,8 +151,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -252,6 +250,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15372,7 +16275,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -468,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15381,7 +16284,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -506,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15393,7 +16296,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -820,18 +823,18 @@
+@@ -820,18 +821,18 @@
#>+ 3
@@ -15418,7 +16321,7 @@
#>+ 3
editaliasdialog.moc: $(srcdir)/editaliasdialog.h
-@@ -851,10 +854,10 @@
+@@ -851,10 +852,10 @@
#>+ 3
clean-metasources:
@@ -15431,7 +16334,7 @@
#>+ 5
clean-ui:
-@@ -945,8 +948,8 @@
+@@ -945,8 +946,8 @@
#>+ 11
nmcheck:
@@ -15443,7 +16346,16 @@
aliasplugin.lo: aliasplugin.moc
--- kopete/plugins/autoreplace/icons/Makefile.in
+++ kopete/plugins/autoreplace/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15453,7 +16365,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15462,7 +16374,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15476,7 +16388,16 @@
mostlyclean-libtool:
--- kopete/plugins/autoreplace/Makefile.in
+++ kopete/plugins/autoreplace/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -172,8 +172,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -273,6 +271,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15486,7 +16407,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -490,7 +491,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15495,7 +16416,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15509,7 +16430,16 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/connectionstatus/Makefile.in
+++ kopete/plugins/connectionstatus/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -139,8 +139,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -240,6 +238,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15519,7 +16449,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -445,7 +446,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15528,7 +16458,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -483,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15542,7 +16472,16 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/contactnotes/Makefile.in
+++ kopete/plugins/contactnotes/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -143,8 +143,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -244,6 +242,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15552,7 +16491,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -453,7 +456,7 @@
+@@ -453,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15561,7 +16500,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +494,9 @@
+@@ -491,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15575,7 +16514,16 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/cryptography/icons/Makefile.in
+++ kopete/plugins/cryptography/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15585,7 +16533,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15594,7 +16542,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15608,7 +16556,16 @@
mostlyclean-libtool:
--- kopete/plugins/cryptography/Makefile.in
+++ kopete/plugins/cryptography/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -175,8 +175,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -276,6 +274,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15618,7 +16575,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -497,7 +498,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15627,7 +16584,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -535,9 +536,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15639,7 +16596,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -977,6 +980,13 @@
+@@ -977,6 +978,13 @@
#>+ 3
@@ -15653,7 +16610,7 @@
kgpginterface.moc: $(srcdir)/kgpginterface.h
$(MOC) $(srcdir)/kgpginterface.h -o kgpginterface.moc
-@@ -984,11 +994,11 @@
+@@ -984,11 +992,11 @@
mocs: kgpginterface.moc
#>+ 3
@@ -15668,7 +16625,7 @@
#>+ 3
kgpgselkey.moc: $(srcdir)/kgpgselkey.h
-@@ -1005,13 +1015,6 @@
+@@ -1005,13 +1013,6 @@
mocs: popuppublic.moc
#>+ 3
@@ -15682,7 +16639,7 @@
cryptographypreferences.moc: $(srcdir)/cryptographypreferences.h
$(MOC) $(srcdir)/cryptographypreferences.h -o cryptographypreferences.moc
-@@ -1036,7 +1039,7 @@
+@@ -1036,7 +1037,7 @@
#>+ 3
clean-metasources:
@@ -15691,7 +16648,7 @@
#>+ 2
KDE_DIST=cryptographychatui.rc kopete_cryptography.desktop cryptographyguiclient.h kgpginterface.h cryptographyuserkey_ui.ui kgpgselkey.h kopete_cryptography_config.desktop cryptographyselectuserkey.h Makefile.in cryptographypreferences.h cryptographyplugin.h cryptographyui.rc cryptographyprefsbase.ui Makefile.am popuppublic.h
-@@ -1105,7 +1108,7 @@
+@@ -1105,7 +1106,7 @@
rm -f kcm_kopete_cryptography_la.all_cpp.final kcm_kopete_cryptography_la.all_cpp.files
#>+ 11
@@ -15702,7 +16659,16 @@
echo "#define KDE_USE_FINAL 1" >> kopete_cryptography_la.all_cpp.final; \
--- kopete/plugins/highlight/icons/Makefile.in
+++ kopete/plugins/highlight/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15712,7 +16678,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15721,7 +16687,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15735,7 +16701,16 @@
mostlyclean-libtool:
--- kopete/plugins/highlight/Makefile.in
+++ kopete/plugins/highlight/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -172,8 +172,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -273,6 +271,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15745,7 +16720,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -490,7 +491,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15754,7 +16729,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15766,7 +16741,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -975,7 +978,7 @@
+@@ -975,7 +976,7 @@
-rm -f highlightpreferences.moc highlightplugin.moc
#>+ 2
@@ -15777,7 +16752,16 @@
clean-ui:
--- kopete/plugins/history/Makefile.in
+++ kopete/plugins/history/Makefile.in
-@@ -259,6 +259,9 @@
+@@ -158,8 +158,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -259,6 +257,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15787,7 +16771,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -483,7 +486,7 @@
+@@ -483,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15796,7 +16780,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +524,9 @@
+@@ -521,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15808,7 +16792,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -877,18 +880,18 @@
+@@ -877,18 +878,18 @@
#>+ 3
@@ -15833,7 +16817,7 @@
#>+ 3
historylogger.moc: $(srcdir)/historylogger.h
-@@ -922,7 +925,7 @@
+@@ -922,7 +923,7 @@
#>+ 3
clean-metasources:
@@ -15842,7 +16826,7 @@
#>+ 2
KDE_DIST=historyprefsui.ui historyviewer.ui historypreferences.h historyconfig.kcfgc kopete_history_config.desktop historyui.rc historyguiclient.h kopete_history.desktop historyplugin.h historylogger.h historyconfig.kcfg Makefile.in historychatui.rc Makefile.am historydialog.h
-@@ -997,7 +1000,7 @@
+@@ -997,7 +998,7 @@
rm -f kcm_kopete_history_la.all_cpp.final kcm_kopete_history_la.all_cpp.files
#>+ 11
@@ -15853,7 +16837,16 @@
echo "#define KDE_USE_FINAL 1" >> kopete_history_la.all_cpp.final; \
--- kopete/plugins/latex/icons/Makefile.in
+++ kopete/plugins/latex/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15863,7 +16856,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15872,7 +16865,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15886,7 +16879,16 @@
mostlyclean-libtool:
--- kopete/plugins/latex/Makefile.in
+++ kopete/plugins/latex/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -172,8 +172,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -273,6 +271,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15896,7 +16898,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -496,7 +497,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15905,7 +16907,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -534,9 +535,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15919,7 +16921,16 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/Makefile.in
+++ kopete/plugins/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -114,8 +114,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -215,6 +213,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15929,7 +16940,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -418,7 +421,7 @@
+@@ -418,7 +419,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -15938,7 +16949,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -456,9 +459,9 @@
+@@ -456,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15952,7 +16963,16 @@
mostlyclean-libtool:
--- kopete/plugins/motionautoaway/Makefile.in
+++ kopete/plugins/motionautoaway/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -155,8 +155,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -256,6 +254,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15962,7 +16982,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -473,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15971,7 +16991,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -511,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15983,7 +17003,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -843,18 +846,18 @@
+@@ -843,18 +844,18 @@
#>+ 3
@@ -16008,7 +17028,7 @@
#>+ 8
kopete_motionaway.la.closure: $(kopete_motionaway_la_OBJECTS) $(kopete_motionaway_la_DEPENDENCIES)
-@@ -867,7 +870,7 @@
+@@ -867,7 +868,7 @@
#>+ 3
clean-metasources:
@@ -16019,7 +17039,16 @@
KDE_DIST=kopete_motionaway.desktop COPYING.motion motionawayplugin.h motionawayprefs.ui kopete_motionaway_config.desktop motionawayconfig.kcfg configure.in.in Makefile.in motionawaypreferences.h motionawayconfig.kcfgc Makefile.am
--- kopete/plugins/netmeeting/Makefile.in
+++ kopete/plugins/netmeeting/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -159,8 +159,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -260,6 +258,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16029,7 +17058,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -478,7 +479,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16038,7 +17067,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -516,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16050,7 +17079,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -891,7 +894,7 @@
+@@ -891,7 +892,7 @@
-rm -f netmeetingplugin.moc netmeetingpreferences.moc netmeetinginvitation.moc netmeetingguiclient.moc
#>+ 2
@@ -16071,7 +17100,16 @@
am_kopete_nowlistening_la_OBJECTS = nowlisteningplugin.lo nlkscd.lo \
nlnoatun.lo nlxmms.lo nowlisteningguiclient.lo nljuk.lo \
nlamarok.lo nlkaffeine.lo
-@@ -266,6 +265,9 @@
+@@ -165,8 +164,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -266,6 +263,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16081,7 +17119,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,8 +465,8 @@
+@@ -463,8 +463,8 @@
#>- kopete_nowlistening_la_SOURCES = nowlisteningconfig.kcfgc nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
#>+ 1
kopete_nowlistening_la_SOURCES= nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp nowlisteningconfig.cpp
@@ -16092,7 +17130,7 @@
#>- kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc
#>+ 1
kcm_kopete_nowlistening_la_SOURCES= nowlisteningpreferences.cpp nowlisteningprefs.cpp nowlisteningconfig.cpp
-@@ -486,7 +488,7 @@
+@@ -486,7 +486,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16101,7 +17139,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -524,9 +526,9 @@
+@@ -524,9 +524,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16113,7 +17151,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -890,18 +892,18 @@
+@@ -890,18 +890,18 @@
mocs: nowlisteningpreferences.moc
#>+ 3
@@ -16138,7 +17176,7 @@
#>+ 8
kopete_nowlistening.la.closure: $(kopete_nowlistening_la_OBJECTS) $(kopete_nowlistening_la_DEPENDENCIES)
-@@ -914,7 +916,7 @@
+@@ -914,7 +914,7 @@
#>+ 3
clean-metasources:
@@ -16147,7 +17185,7 @@
#>+ 2
KDE_DIST=nlkscd.h nowlisteningguiclient.h nowlisteningpreferences.h nlnoatun.h nowlisteningconfig.kcfg kopete_nowlistening_config.desktop nowlisteningprefs.ui nlmediaplayer.h DESIGN nowlisteningconfig.kcfgc nowlisteningchatui.rc configure.in.in Makefile.in nljuk.h kopete_nowlistening.desktop nlamarok.h nowlisteningplugin.h nowlisteningui.rc Makefile.am nlxmms.h
-@@ -988,7 +990,7 @@
+@@ -988,7 +988,7 @@
rm -f kcm_kopete_nowlistening_la.all_cpp.final kcm_kopete_nowlistening_la.all_cpp.files
#>+ 11
@@ -16173,7 +17211,16 @@
@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)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -247,6 +247,9 @@
+@@ -146,8 +146,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -247,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16183,7 +17230,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,10 +445,10 @@
+@@ -442,10 +443,10 @@
AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = kcm_kopete_smpppdcs.la
#>- kcm_kopete_smpppdcs_la_SOURCES = smpppdcsprefs.ui smpppdcspreferences.cpp \
@@ -16196,7 +17243,7 @@
#>- kcm_kopete_smpppdcs_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
#>+ 1
-@@ -453,14 +456,14 @@
+@@ -453,14 +454,14 @@
kcm_kopete_smpppdcs_la_LIBADD = ../../../libkopete/libkopete.la $(LIB_KUTILS)
kcm_DATA = kopete_smpppdcs_config.desktop
kcmdir = $(kde_servicesdir)/kconfiguredialog
@@ -16213,7 +17260,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -498,9 +499,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16225,7 +17272,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -543,6 +546,7 @@
+@@ -543,6 +544,7 @@
@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@
@@ -16233,7 +17280,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/smpppdsearcher.Plo at am__quote@
.cpp.o:
-@@ -801,6 +805,13 @@
+@@ -801,6 +803,13 @@
mocs: smpppdcspreferences.moc
#>+ 3
@@ -16247,7 +17294,7 @@
smpppdsearcher.moc: $(srcdir)/smpppdsearcher.h
$(MOC) $(srcdir)/smpppdsearcher.h -o smpppdsearcher.moc
-@@ -809,15 +820,16 @@
+@@ -809,15 +818,16 @@
#>+ 3
clean-metasources:
@@ -16268,7 +17315,7 @@
#>+ 3
clean-closures:
-@@ -865,11 +877,11 @@
+@@ -865,11 +875,11 @@
#>+ 11
@@ -16282,7 +17329,7 @@
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; \
-@@ -900,20 +912,38 @@
+@@ -900,20 +910,38 @@
kde-rpo-clean:
-rm -f *.rpo
@@ -16331,7 +17378,16 @@
echo '#include <kdialog.h>' > smpppdcsprefs.cpp
--- kopete/plugins/smpppdcs/icons/Makefile.in
+++ kopete/plugins/smpppdcs/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16341,7 +17397,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16350,7 +17406,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16364,7 +17420,16 @@
mostlyclean-libtool:
--- kopete/plugins/smpppdcs/Makefile.in
+++ kopete/plugins/smpppdcs/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -159,8 +159,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -260,6 +258,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16374,7 +17439,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -471,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16383,7 +17448,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -509,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16397,7 +17462,16 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/statistics/Makefile.in
+++ kopete/plugins/statistics/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -160,8 +160,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -261,6 +259,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16407,7 +17481,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -475,7 +478,7 @@
+@@ -475,7 +476,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16416,7 +17490,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -513,9 +516,9 @@
+@@ -513,9 +514,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16430,7 +17504,16 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/statistics/sqlite/Makefile.in
+++ kopete/plugins/statistics/sqlite/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -152,8 +152,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -253,6 +251,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16440,7 +17523,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -501,7 +502,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -16449,7 +17532,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -539,9 +540,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16463,7 +17546,16 @@
clean-noinstLTLIBRARIES:
--- kopete/plugins/texteffect/icons/Makefile.in
+++ kopete/plugins/texteffect/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16473,7 +17565,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16482,7 +17574,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16496,7 +17588,16 @@
mostlyclean-libtool:
--- kopete/plugins/texteffect/Makefile.in
+++ kopete/plugins/texteffect/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -172,8 +172,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -273,6 +271,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16506,7 +17607,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -490,7 +491,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16515,7 +17616,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16529,7 +17630,16 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/translator/Makefile.in
+++ kopete/plugins/translator/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -162,8 +162,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -263,6 +261,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16539,7 +17649,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -483,7 +486,7 @@
+@@ -483,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16548,7 +17658,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +524,9 @@
+@@ -521,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16560,7 +17670,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -890,7 +893,7 @@
+@@ -890,7 +891,7 @@
-rm -f translatorplugin.moc translatorguiclient.moc translatordialog.moc
#>+ 2
@@ -16571,7 +17681,16 @@
clean-ui:
--- kopete/plugins/webpresence/Makefile.in
+++ kopete/plugins/webpresence/Makefile.in
-@@ -254,6 +254,9 @@
+@@ -153,8 +153,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -254,6 +252,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16581,7 +17700,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -477,7 +480,7 @@
+@@ -477,7 +478,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16590,7 +17709,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -515,9 +518,9 @@
+@@ -515,9 +516,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16604,7 +17723,16 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/gadu/icons/Makefile.in
+++ kopete/protocols/gadu/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16614,7 +17742,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16623,7 +17751,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16635,7 +17763,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,7 +580,7 @@
+@@ -577,7 +578,7 @@
.NOEXPORT:
#>+ 2
@@ -16644,7 +17772,7 @@
#>+ 2
docs-am:
-@@ -585,40 +588,40 @@
+@@ -585,40 +586,40 @@
#>+ 37
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -16708,7 +17836,16 @@
force-reedit:
--- kopete/protocols/gadu/libgadu/Makefile.in
+++ kopete/protocols/gadu/libgadu/Makefile.in
-@@ -223,6 +223,9 @@
+@@ -122,8 +122,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -223,6 +221,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16718,7 +17855,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -433,7 +434,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -16727,7 +17864,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -471,9 +474,9 @@
+@@ -471,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16741,7 +17878,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/gadu/Makefile.in
+++ kopete/protocols/gadu/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -170,8 +170,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -271,6 +269,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16751,7 +17897,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -503,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16760,7 +17906,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16772,7 +17918,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -997,11 +1000,11 @@
+@@ -997,11 +998,11 @@
mocs: gaducommands.moc
#>+ 3
@@ -16787,7 +17933,7 @@
#>+ 3
gaduregisteraccount.moc: $(srcdir)/gaduregisteraccount.h
-@@ -1011,11 +1014,11 @@
+@@ -1011,11 +1012,11 @@
mocs: gaduregisteraccount.moc
#>+ 3
@@ -16802,7 +17948,7 @@
#>+ 3
gaduaway.moc: $(srcdir)/gaduaway.h
-@@ -1032,25 +1035,25 @@
+@@ -1032,25 +1033,25 @@
mocs: gaduprotocol.moc
#>+ 3
@@ -16836,7 +17982,7 @@
#>+ 3
clean-closures:
-@@ -1098,7 +1101,7 @@
+@@ -1098,7 +1099,7 @@
#>+ 11
@@ -16845,7 +17991,7 @@
@echo 'creating kopete_gadu_la.all_cpp.cpp ...'; \
rm -f kopete_gadu_la.all_cpp.files kopete_gadu_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_gadu_la.all_cpp.final; \
-@@ -1149,11 +1152,11 @@
+@@ -1149,11 +1150,11 @@
gadupubdir.o: gadupubdir.moc
gadueditaccount.lo: gadueditaccount.moc
gadudccserver.lo: gadudccserver.moc
@@ -16861,7 +18007,16 @@
gaduaddcontactpage.o: gaduaddcontactpage.moc
--- kopete/protocols/gadu/ui/Makefile.in
+++ kopete/protocols/gadu/ui/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -128,8 +128,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -229,6 +227,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16871,7 +18026,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +444,7 @@
+@@ -441,7 +442,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16880,7 +18035,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +482,9 @@
+@@ -479,9 +480,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16894,7 +18049,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/groupwise/icons/Makefile.in
+++ kopete/protocols/groupwise/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16904,7 +18068,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16913,7 +18077,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16925,7 +18089,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,7 +580,7 @@
+@@ -577,7 +578,7 @@
.NOEXPORT:
#>+ 2
@@ -16934,7 +18098,7 @@
#>+ 2
docs-am:
-@@ -585,47 +588,47 @@
+@@ -585,47 +586,47 @@
#>+ 44
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -17010,7 +18174,16 @@
force-reedit:
--- kopete/protocols/groupwise/libgroupwise/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -169,8 +169,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -270,6 +268,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17020,7 +18193,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -508,7 +509,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -17029,7 +18202,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -546,9 +547,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17041,7 +18214,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -945,18 +948,18 @@
+@@ -945,18 +946,18 @@
#>+ 3
@@ -17066,7 +18239,7 @@
#>+ 3
stream.moc: $(srcdir)/stream.h
-@@ -966,18 +969,18 @@
+@@ -966,18 +967,18 @@
mocs: stream.moc
#>+ 3
@@ -17091,7 +18264,7 @@
#>+ 3
qcatlshandler.moc: $(srcdir)/qcatlshandler.h
-@@ -1067,7 +1070,7 @@
+@@ -1067,7 +1068,7 @@
#>+ 3
clean-metasources:
@@ -17102,7 +18275,16 @@
KDE_DIST=transferbase.h rtf.ll Makefile.in Makefile.am
--- kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -112,8 +112,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -213,6 +211,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17112,7 +18294,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -410,7 +411,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -17121,7 +18303,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +449,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17135,7 +18317,16 @@
mostlyclean-libtool:
--- kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -125,8 +125,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -226,6 +224,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17145,7 +18336,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -430,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17154,7 +18345,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -468,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17168,7 +18359,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -152,8 +152,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -253,6 +251,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17178,7 +18378,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -477,7 +480,7 @@
+@@ -477,7 +478,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17187,7 +18387,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -515,9 +518,9 @@
+@@ -515,9 +516,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17199,7 +18399,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -850,13 +853,6 @@
+@@ -850,13 +851,6 @@
mocs: connectiontask.moc
#>+ 3
@@ -17213,7 +18413,7 @@
logintask.moc: $(srcdir)/logintask.h
$(MOC) $(srcdir)/logintask.h -o logintask.moc
-@@ -871,6 +867,13 @@
+@@ -871,6 +865,13 @@
mocs: createcontactinstancetask.moc
#>+ 3
@@ -17227,7 +18427,7 @@
rejectinvitetask.moc: $(srcdir)/rejectinvitetask.h
$(MOC) $(srcdir)/rejectinvitetask.h -o rejectinvitetask.moc
-@@ -892,18 +895,18 @@
+@@ -892,18 +893,18 @@
mocs: getdetailstask.moc
#>+ 3
@@ -17252,7 +18452,7 @@
#>+ 3
joinconferencetask.moc: $(srcdir)/joinconferencetask.h
-@@ -984,10 +987,10 @@
+@@ -984,10 +985,10 @@
#>+ 3
clean-metasources:
@@ -17265,7 +18465,7 @@
#>+ 3
clean-closures:
-@@ -1035,7 +1038,7 @@
+@@ -1035,7 +1036,7 @@
#>+ 11
@@ -17274,7 +18474,7 @@
@echo 'creating libgroupwise_tasks_la.all_cpp.cpp ...'; \
rm -f libgroupwise_tasks_la.all_cpp.files libgroupwise_tasks_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libgroupwise_tasks_la.all_cpp.final; \
-@@ -1108,8 +1111,8 @@
+@@ -1108,8 +1109,8 @@
conferencetask.lo: conferencetask.moc
createcontacttask.o: createcontacttask.moc
logintask.lo: logintask.moc
@@ -17284,7 +18484,7 @@
updatecontacttask.lo: updatecontacttask.moc
setstatustask.lo: setstatustask.moc
logintask.o: logintask.moc
-@@ -1122,8 +1125,8 @@
+@@ -1122,8 +1123,8 @@
typingtask.lo: typingtask.moc
requesttask.o: requesttask.moc
updateitemtask.lo: updateitemtask.moc
@@ -17296,7 +18496,16 @@
typingtask.o: typingtask.moc
--- kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
-@@ -227,6 +227,9 @@
+@@ -126,8 +126,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -227,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17306,7 +18515,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -428,7 +429,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17315,7 +18524,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -466,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17329,7 +18538,16 @@
clean-noinstPROGRAMS:
--- kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -146,8 +146,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -247,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17339,7 +18557,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -468,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17348,7 +18566,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -506,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17362,7 +18580,16 @@
clean-noinstPROGRAMS:
--- kopete/protocols/groupwise/Makefile.in
+++ kopete/protocols/groupwise/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -165,8 +165,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -266,6 +264,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17372,7 +18599,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -490,7 +491,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17381,7 +18608,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17393,7 +18620,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -946,18 +949,18 @@
+@@ -946,18 +947,18 @@
#>+ 3
@@ -17418,7 +18645,7 @@
#>+ 3
gwbytestream.moc: $(srcdir)/gwbytestream.h
-@@ -974,18 +977,18 @@
+@@ -974,18 +975,18 @@
mocs: gwconnector.moc
#>+ 3
@@ -17443,7 +18670,7 @@
#>+ 3
gwcontactlist.moc: $(srcdir)/gwcontactlist.h
-@@ -996,7 +999,7 @@
+@@ -996,7 +997,7 @@
#>+ 3
clean-metasources:
@@ -17452,7 +18679,7 @@
#>+ 2
KDE_DIST=DESIGN gwchatui.rc kopete_groupwise.desktop gwaddui.ui Makefile.in Makefile.am
-@@ -1047,7 +1050,7 @@
+@@ -1047,7 +1048,7 @@
#>+ 11
@@ -17461,7 +18688,7 @@
@echo 'creating kopete_groupwise_la.all_cpp.cpp ...'; \
rm -f kopete_groupwise_la.all_cpp.files kopete_groupwise_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_groupwise_la.all_cpp.final; \
-@@ -1088,8 +1091,8 @@
+@@ -1088,8 +1089,8 @@
gwbytestream.o: gwbytestream.moc
gwconnector.o: gwconnector.moc
gwaccount.lo: gwaccount.moc
@@ -17473,7 +18700,16 @@
gwcontact.o: gwcontact.moc
--- kopete/protocols/groupwise/ui/Makefile.in
+++ kopete/protocols/groupwise/ui/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -136,8 +136,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -237,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17483,7 +18719,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -460,7 +461,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17492,7 +18728,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -498,9 +499,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17506,7 +18742,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/irc/icons/Makefile.in
+++ kopete/protocols/irc/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17516,7 +18761,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17525,7 +18770,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17537,7 +18782,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -584,31 +587,31 @@
+@@ -584,31 +585,31 @@
#>+ 27
install-kde-icons:
@@ -17584,7 +18829,16 @@
force-reedit:
--- kopete/protocols/irc/libkirc/Makefile.in
+++ kopete/protocols/irc/libkirc/Makefile.in
-@@ -233,6 +233,9 @@
+@@ -132,8 +132,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -233,6 +231,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17594,7 +18848,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -451,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17603,7 +18857,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -489,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17615,7 +18869,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -770,36 +773,36 @@
+@@ -770,36 +771,36 @@
mocs: kirctransferserver.moc
#>+ 3
@@ -17667,7 +18921,16 @@
KDE_DIST=kirctransferhandler.h kirctransfer.h kircentity.h kircengine.h kircmessageredirector.h ksslsocket.h kirctransferserver.h Makefile.in kircmessage.h Makefile.am
--- kopete/protocols/irc/Makefile.in
+++ kopete/protocols/irc/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -168,8 +168,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -269,6 +267,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17677,7 +18940,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -502,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17686,7 +18949,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -540,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17698,7 +18961,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -990,18 +993,18 @@
+@@ -990,18 +991,18 @@
mocs: ircchannelcontact.moc
#>+ 3
@@ -17723,7 +18986,7 @@
#>+ 3
ircguiclient.moc: $(srcdir)/ircguiclient.h
-@@ -1018,18 +1021,18 @@
+@@ -1018,18 +1019,18 @@
mocs: irccontact.moc
#>+ 3
@@ -17748,7 +19011,7 @@
#>+ 3
ircusercontact.moc: $(srcdir)/ircusercontact.h
-@@ -1068,7 +1071,7 @@
+@@ -1068,7 +1069,7 @@
#>+ 3
clean-metasources:
@@ -17757,7 +19020,7 @@
#>+ 2
KDE_DIST=irc.protocol irctransferhandler.h ircguiclient.h ircsignalhandler.h kopete_irc.desktop ircusercontact.h ircchatui.rc ksparser.h ircchannelcontact.h ircprotocol.h ircnetworks.xml irccontactmanager.h ircaddcontactpage.h Makefile.in kcodecaction.h ircservercontact.h irccontact.h Makefile.am ircaccount.h
-@@ -1119,7 +1122,7 @@
+@@ -1119,7 +1120,7 @@
#>+ 11
@@ -17768,7 +19031,16 @@
echo "#define KDE_USE_FINAL 1" >> kopete_irc_la.all_cpp.final; \
--- kopete/protocols/irc/ui/Makefile.in
+++ kopete/protocols/irc/ui/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -130,8 +130,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -231,6 +229,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17778,7 +19050,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -442,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17787,7 +19059,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -480,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17801,7 +19073,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/icons/Makefile.in
+++ kopete/protocols/jabber/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17811,7 +19092,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17820,7 +19101,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17832,7 +19113,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,87 +580,87 @@
+@@ -577,87 +578,87 @@
.NOEXPORT:
#>+ 2
@@ -17978,7 +19259,16 @@
force-reedit:
--- kopete/protocols/jabber/kioslave/Makefile.in
+++ kopete/protocols/jabber/kioslave/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -149,8 +149,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -250,6 +248,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17988,7 +19278,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -467,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17997,7 +19287,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -505,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18011,7 +19301,16 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/jabber/libiris/cutestuff/Makefile.in
+++ kopete/protocols/jabber/libiris/cutestuff/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18021,7 +19320,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18030,7 +19329,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18044,7 +19343,16 @@
mostlyclean-libtool:
--- kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
+++ kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -128,8 +128,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -229,6 +227,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18054,7 +19362,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -439,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18063,7 +19371,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18075,7 +19383,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -728,18 +731,18 @@
+@@ -728,18 +729,18 @@
mocs: ndns.moc
#>+ 3
@@ -18100,7 +19408,7 @@
#>+ 3
httppoll.moc: $(srcdir)/httppoll.h
-@@ -764,10 +767,10 @@
+@@ -764,10 +765,10 @@
#>+ 3
clean-metasources:
@@ -18115,7 +19423,16 @@
docs-am:
--- kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
+++ kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -130,8 +130,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -231,6 +229,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18125,7 +19442,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -439,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18134,7 +19451,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18148,7 +19465,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/iris/include/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/include/Makefile.in
-@@ -230,6 +230,9 @@
+@@ -129,8 +129,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -230,6 +228,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18158,7 +19484,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -433,7 +434,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18167,7 +19493,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -471,9 +474,9 @@
+@@ -471,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18181,7 +19507,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
-@@ -231,6 +231,9 @@
+@@ -130,8 +130,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -231,6 +229,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18191,7 +19526,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -437,7 +440,7 @@
+@@ -437,7 +438,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18200,7 +19535,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +478,9 @@
+@@ -475,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18214,7 +19549,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/iris/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18224,7 +19568,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18233,7 +19577,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18247,7 +19591,16 @@
mostlyclean-libtool:
--- kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -141,8 +141,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -242,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18257,7 +19610,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -463,7 +464,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18266,7 +19619,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -501,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18280,7 +19633,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -128,8 +128,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -229,6 +227,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18290,7 +19652,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -438,7 +441,7 @@
+@@ -438,7 +439,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18299,7 +19661,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -476,9 +479,9 @@
+@@ -476,9 +477,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18313,7 +19675,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/Makefile.in
+++ kopete/protocols/jabber/libiris/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18323,7 +19694,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18332,7 +19703,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18346,7 +19717,16 @@
mostlyclean-libtool:
--- kopete/protocols/jabber/libiris/qca/Makefile.in
+++ kopete/protocols/jabber/libiris/qca/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -112,8 +112,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -213,6 +211,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18356,7 +19736,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -410,7 +411,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18365,7 +19745,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +449,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18379,7 +19759,16 @@
mostlyclean-libtool:
--- kopete/protocols/jabber/libiris/qca/src/Makefile.in
+++ kopete/protocols/jabber/libiris/qca/src/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -125,8 +125,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -226,6 +224,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18389,7 +19778,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -429,7 +432,7 @@
+@@ -429,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18398,7 +19787,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +470,9 @@
+@@ -467,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18412,7 +19801,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/Makefile.in
+++ kopete/protocols/jabber/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -188,8 +188,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -289,6 +287,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18422,7 +19820,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -541,7 +542,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18431,7 +19829,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +580,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18443,7 +19841,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1054,18 +1057,18 @@
+@@ -1054,18 +1055,18 @@
mocs: jabbergroupchatmanager.moc
#>+ 3
@@ -18468,7 +19866,7 @@
#>+ 3
jabberprotocol.moc: $(srcdir)/jabberprotocol.h
-@@ -1118,7 +1121,7 @@
+@@ -1118,7 +1119,7 @@
#>+ 3
clean-metasources:
@@ -18477,7 +19875,7 @@
#>+ 2
KDE_DIST=jabberformtranslator.h kopete_jabber.desktop jabberbasecontact.h jabberprotocol.h jabberchatsession.h jabberaccount.h jabberfiletransfer.h jabberresource.h Makefile.in jabberconnector.h jabbercontactpool.h jabbergroupchatmanager.h Makefile.am jabberbytestream.h jabberformlineedit.h jabbergroupmembercontact.h
-@@ -1169,7 +1172,7 @@
+@@ -1169,7 +1170,7 @@
#>+ 11
@@ -18488,7 +19886,16 @@
echo "#define KDE_USE_FINAL 1" >> kopete_jabber_la.all_cpp.final; \
--- kopete/protocols/jabber/ui/Makefile.in
+++ kopete/protocols/jabber/ui/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -136,8 +136,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -237,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18498,7 +19905,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -482,7 +483,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18507,7 +19914,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -520,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18519,7 +19926,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -783,13 +786,6 @@
+@@ -783,13 +784,6 @@
mocs: dlgjabbervcard.moc
#>+ 3
@@ -18533,7 +19940,7 @@
dlgjabberregister.moc: $(srcdir)/dlgjabberregister.h
$(MOC) $(srcdir)/dlgjabberregister.h -o dlgjabberregister.moc
-@@ -804,6 +800,13 @@
+@@ -804,6 +798,13 @@
mocs: dlgjabberchangepassword.moc
#>+ 3
@@ -18547,7 +19954,7 @@
dlgjabberchatjoin.moc: $(srcdir)/dlgjabberchatjoin.h
$(MOC) $(srcdir)/dlgjabberchatjoin.h -o dlgjabberchatjoin.moc
-@@ -825,22 +828,22 @@
+@@ -825,22 +826,22 @@
mocs: dlgjabberservices.moc
#>+ 3
@@ -18577,7 +19984,7 @@
#>+ 2
KDE_DIST=dlgjabberregister.h dlgjabberchatjoin.h dlgjabberchooseserver.ui dlgchatjoin.ui dlgchangepassword.ui dlgjabberbrowse.h jabberchooseserver.h jabberaddcontactpage.h dlgjabbervcard.h dlgjabbersendraw.h dlgjabberservices.h Makefile.in jabbereditaccountwidget.h dlgjabberchangepassword.h dlgjabberregisteraccount.ui Makefile.am jabberregisteraccount.h
-@@ -902,7 +905,7 @@
+@@ -902,7 +903,7 @@
#>+ 11
@@ -18588,7 +19995,16 @@
echo "#define KDE_USE_FINAL 1" >> libkopetejabberui_la.all_cpp.final; \
--- kopete/protocols/Makefile.in
+++ kopete/protocols/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -112,8 +112,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -213,6 +211,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18598,7 +20014,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -414,7 +417,7 @@
+@@ -414,7 +415,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -18607,7 +20023,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +455,9 @@
+@@ -452,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18621,7 +20037,16 @@
mostlyclean-libtool:
--- kopete/protocols/meanwhile/icons/Makefile.in
+++ kopete/protocols/meanwhile/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18631,7 +20056,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18640,7 +20065,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18652,7 +20077,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -586,36 +589,36 @@
+@@ -586,36 +587,36 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_unknown.png
@@ -18704,7 +20129,38 @@
force-reedit:
--- kopete/protocols/meanwhile/Makefile.in
+++ kopete/protocols/meanwhile/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -64,18 +64,17 @@
+ am__DEPENDENCIES_1 =
+ kopete_meanwhile_la_DEPENDENCIES = \
+ $(top_builddir)/kopete/libkopete/libkopete.la \
+- ui/libkopetemeanwhileui.la $(am__DEPENDENCIES_1) \
+- $(am__DEPENDENCIES_1)
++ ui/libkopetemeanwhileui.la $(am__DEPENDENCIES_1)
+ am_kopete_meanwhile_la_OBJECTS = meanwhileprotocol.lo \
+ meanwhileaddcontactpage.lo meanwhileeditaccountwidget.lo \
+- meanwhileaccount.lo meanwhilecontact.lo meanwhilelibrary.lo \
++ meanwhileaccount.lo meanwhilecontact.lo meanwhilesession.lo \
+ meanwhileplugin.lo
+ #>- kopete_meanwhile_la_OBJECTS = $(am_kopete_meanwhile_la_OBJECTS)
+ #>+ 7
+ kopete_meanwhile_la_final_OBJECTS = kopete_meanwhile_la.all_cpp.lo
+ kopete_meanwhile_la_nofinal_OBJECTS = meanwhileprotocol.lo \
+ meanwhileaddcontactpage.lo meanwhileeditaccountwidget.lo \
+- meanwhileaccount.lo meanwhilecontact.lo meanwhilelibrary.lo \
++ meanwhileaccount.lo meanwhilecontact.lo meanwhilesession.lo \
+ meanwhileplugin.lo
+ @KDE_USE_FINAL_FALSE at kopete_meanwhile_la_OBJECTS = $(kopete_meanwhile_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE at kopete_meanwhile_la_OBJECTS = $(kopete_meanwhile_la_final_OBJECTS)
+@@ -167,8 +166,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -268,6 +265,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18714,8 +20170,43 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -465,7 +465,6 @@
+ -I$(srcdir)/ui \
+ -I./ui \
+ $(all_includes) \
+- $(GLIB_CFLAGS) \
+ $(MEANWHILE_CFLAGS)
+ noinst_HEADERS = \
+@@ -474,7 +473,7 @@
+ meanwhileeditaccountwidget.h \
+ meanwhileaccount.h \
+ meanwhilecontact.h \
+- meanwhilelibrary.h \
++ meanwhilesession.h \
+ meanwhileplugin.h
+
+ kde_module_LTLIBRARIES = kopete_meanwhile.la
+@@ -484,7 +483,7 @@
+ meanwhileeditaccountwidget.cpp \
+ meanwhileaccount.cpp \
+ meanwhilecontact.cpp \
+- meanwhilelibrary.cpp \
++ meanwhilesession.cpp \
+ meanwhileplugin.cpp
+
+ #>- kopete_meanwhile_la_LDFLAGS = -no-undefined -module \
+@@ -494,7 +493,7 @@
+ $(KDE_PLUGIN) $(all_libraries)
+
+ kopete_meanwhile_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la \
+- ui/libkopetemeanwhileui.la $(GLIB_LIBS) $(MEANWHILE_LIBS)
++ ui/libkopetemeanwhileui.la $(MEANWHILE_LIBS)
+
+ service_DATA = kopete_meanwhile.desktop
+ servicedir = $(kde_servicesdir)
+@@ -504,7 +503,7 @@
+
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -18723,7 +20214,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -542,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18735,9 +20226,92 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -589,9 +588,9 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhileaddcontactpage.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhilecontact.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhileeditaccountwidget.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhilelibrary.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhileplugin.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhileprotocol.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/meanwhilesession.Plo at am__quote@
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@@ -961,6 +960,13 @@
+ mocs: meanwhileeditaccountwidget.moc
+
+ #>+ 3
++meanwhilesession.moc: $(srcdir)/meanwhilesession.h
++ $(MOC) $(srcdir)/meanwhilesession.h -o meanwhilesession.moc
++
++#>+ 2
++mocs: meanwhilesession.moc
++
++#>+ 3
+ meanwhileprotocol.moc: $(srcdir)/meanwhileprotocol.h
+ $(MOC) $(srcdir)/meanwhileprotocol.h -o meanwhileprotocol.moc
+
+@@ -975,15 +981,8 @@
+ mocs: meanwhileaccount.moc
+
+ #>+ 3
+-meanwhilelibrary.moc: $(srcdir)/meanwhilelibrary.h
+- $(MOC) $(srcdir)/meanwhilelibrary.h -o meanwhilelibrary.moc
+-
+-#>+ 2
+-mocs: meanwhilelibrary.moc
+-
+-#>+ 3
+ clean-metasources:
+- -rm -f meanwhilecontact.moc meanwhileaddcontactpage.moc meanwhileeditaccountwidget.moc meanwhileprotocol.moc meanwhileaccount.moc meanwhilelibrary.moc
++ -rm -f meanwhilecontact.moc meanwhileaddcontactpage.moc meanwhileeditaccountwidget.moc meanwhilesession.moc meanwhileprotocol.moc meanwhileaccount.moc
+
+ #>+ 2
+ KDE_DIST=meanwhileserver.h log.h meanwhileserver.cpp kopete_meanwhile.desktop Makefile.in Makefile.am
+@@ -1034,11 +1033,11 @@
+
+
+ #>+ 11
+-kopete_meanwhile_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/meanwhileprotocol.cpp $(srcdir)/meanwhileaddcontactpage.cpp $(srcdir)/meanwhileeditaccountwidget.cpp $(srcdir)/meanwhileaccount.cpp $(srcdir)/meanwhilecontact.cpp $(srcdir)/meanwhilelibrary.cpp $(srcdir)/meanwhileplugin.cpp meanwhileaddcontactpage.moc meanwhilecontact.moc meanwhileeditaccountwidget.moc meanwhileprotocol.moc meanwhilelibrary.moc meanwhileaccount.moc
++kopete_meanwhile_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/meanwhileprotocol.cpp $(srcdir)/meanwhileaddcontactpage.cpp $(srcdir)/meanwhileeditaccountwidget.cpp $(srcdir)/meanwhileaccount.cpp $(srcdir)/meanwhilecontact.cpp $(srcdir)/meanwhilesession.cpp $(srcdir)/meanwhileplugin.cpp meanwhileaddcontactpage.moc meanwhilecontact.moc meanwhileeditaccountwidget.moc meanwhileprotocol.moc meanwhilesession.moc meanwhileaccount.moc
+ @echo 'creating kopete_meanwhile_la.all_cpp.cpp ...'; \
+ rm -f kopete_meanwhile_la.all_cpp.files kopete_meanwhile_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> kopete_meanwhile_la.all_cpp.final; \
+- for file in meanwhileprotocol.cpp meanwhileaddcontactpage.cpp meanwhileeditaccountwidget.cpp meanwhileaccount.cpp meanwhilecontact.cpp meanwhilelibrary.cpp meanwhileplugin.cpp ; do \
++ for file in meanwhileprotocol.cpp meanwhileaddcontactpage.cpp meanwhileeditaccountwidget.cpp meanwhileaccount.cpp meanwhilecontact.cpp meanwhilesession.cpp meanwhileplugin.cpp ; do \
+ echo "#include \"$$file\"" >> kopete_meanwhile_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kopete_meanwhile_la.all_cpp.final; \
+ done; \
+@@ -1072,15 +1071,15 @@
+ #>+ 15
+ meanwhileprotocol.o: meanwhileprotocol.moc
+ meanwhileaddcontactpage.o: meanwhileaddcontactpage.moc
+-meanwhilelibrary.o: meanwhilelibrary.moc
+ meanwhileaccount.lo: meanwhileaccount.moc
+ meanwhileeditaccountwidget.lo: meanwhileeditaccountwidget.moc
+-meanwhilelibrary.lo: meanwhilelibrary.moc
++meanwhilesession.o: meanwhilesession.moc
+ nmcheck:
+ meanwhileeditaccountwidget.o: meanwhileeditaccountwidget.moc
+ meanwhileaccount.o: meanwhileaccount.moc
+ meanwhileaddcontactpage.lo: meanwhileaddcontactpage.moc
+ nmcheck-am: nmcheck
+ meanwhileprotocol.lo: meanwhileprotocol.moc
++meanwhilesession.lo: meanwhilesession.moc
+ meanwhilecontact.lo: meanwhilecontact.moc
+ meanwhilecontact.o: meanwhilecontact.moc
--- kopete/protocols/meanwhile/ui/Makefile.in
+++ kopete/protocols/meanwhile/ui/Makefile.in
-@@ -230,6 +230,9 @@
+@@ -129,8 +129,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -230,6 +228,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18747,7 +20321,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -436,7 +437,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18756,7 +20330,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -474,9 +475,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18770,7 +20344,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/msn/config/Makefile.in
+++ kopete/protocols/msn/config/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -142,8 +142,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -243,6 +241,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18780,7 +20363,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -452,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18789,7 +20372,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -490,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18803,7 +20386,16 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/msn/icons/Makefile.in
+++ kopete/protocols/msn/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18813,7 +20405,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18822,7 +20414,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18834,7 +20426,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -585,47 +588,47 @@
+@@ -585,47 +586,47 @@
#>+ 44
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -18913,7 +20505,16 @@
force-reedit:
--- kopete/protocols/msn/Makefile.in
+++ kopete/protocols/msn/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -183,8 +183,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -284,6 +282,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18923,7 +20524,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -518,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18932,7 +20533,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -556,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18944,7 +20545,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1070,18 +1073,18 @@
+@@ -1070,18 +1071,18 @@
mocs: msndebugrawcmddlg.moc
#>+ 3
@@ -18969,7 +20570,7 @@
#>+ 3
msnprotocol.moc: $(srcdir)/msnprotocol.h
-@@ -1133,11 +1136,11 @@
+@@ -1133,11 +1134,11 @@
mocs: p2p.moc
#>+ 3
@@ -18984,7 +20585,7 @@
#>+ 3
messageformatter.moc: $(srcdir)/messageformatter.h
-@@ -1147,11 +1150,11 @@
+@@ -1147,11 +1148,11 @@
mocs: messageformatter.moc
#>+ 3
@@ -18999,7 +20600,7 @@
#>+ 8
libkopete_msn_shared.la.closure: $(libkopete_msn_shared_la_OBJECTS) $(libkopete_msn_shared_la_DEPENDENCIES)
-@@ -1164,7 +1167,7 @@
+@@ -1164,7 +1165,7 @@
#>+ 3
clean-metasources:
@@ -19008,7 +20609,7 @@
#>+ 2
KDE_DIST=kopete_msn.desktop msncontact.h msnchatui.rc Changelog msnsocket.h msnsecureloginhandler.h ReleaseNotes msnchallengehandler.h msnchatsession.h msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am
-@@ -1256,9 +1259,9 @@
+@@ -1256,9 +1257,9 @@
msnsecureloginhandler.lo: msnsecureloginhandler.moc
msnfiletransfersocket.o: msnfiletransfersocket.moc
outgoingtransfer.lo: outgoingtransfer.moc
@@ -19021,7 +20622,16 @@
msnsocket.lo: msnsocket.moc
--- kopete/protocols/msn/ui/Makefile.in
+++ kopete/protocols/msn/ui/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -128,8 +128,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -229,6 +227,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19031,7 +20641,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -439,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19040,7 +20650,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19054,7 +20664,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/msn/webcam/libmimic/Makefile.in
+++ kopete/protocols/msn/webcam/libmimic/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -123,8 +123,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -224,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19064,7 +20683,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -442,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -19073,7 +20692,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -480,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19087,7 +20706,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/msn/webcam/Makefile.in
+++ kopete/protocols/msn/webcam/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -142,8 +142,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -243,6 +241,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19097,7 +20725,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -453,7 +456,7 @@
+@@ -453,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19106,7 +20734,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +494,9 @@
+@@ -491,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19118,7 +20746,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -850,7 +853,7 @@
+@@ -850,7 +851,7 @@
-rm -f msnwebcamdialog.moc
#>+ 2
@@ -19129,7 +20757,16 @@
clean-closures:
--- kopete/protocols/oscar/aim/Makefile.in
+++ kopete/protocols/oscar/aim/Makefile.in
-@@ -259,6 +259,9 @@
+@@ -158,8 +158,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -259,6 +257,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19139,7 +20776,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -474,7 +477,7 @@
+@@ -474,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19148,7 +20785,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +515,9 @@
+@@ -512,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19160,7 +20797,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -929,22 +932,22 @@
+@@ -929,22 +930,22 @@
mocs: aimaccount.moc
#>+ 3
@@ -19190,7 +20827,7 @@
#>+ 2
KDE_DIST=aimuserinfo.h kopete_aim.desktop aim.protocol aimcontact.h aimaccount.h Makefile.in aimjoinchat.h Makefile.am aimprotocol.h
-@@ -995,7 +998,7 @@
+@@ -995,7 +996,7 @@
#>+ 11
@@ -19199,7 +20836,7 @@
@echo 'creating kopete_aim_la.all_cpp.cpp ...'; \
rm -f kopete_aim_la.all_cpp.files kopete_aim_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_aim_la.all_cpp.final; \
-@@ -1033,9 +1036,9 @@
+@@ -1033,9 +1034,9 @@
#>+ 13
aimcontact.o: aimcontact.moc
aimjoinchat.o: aimjoinchat.moc
@@ -19212,7 +20849,16 @@
aimuserinfo.o: aimuserinfo.moc
--- kopete/protocols/oscar/aim/ui/Makefile.in
+++ kopete/protocols/oscar/aim/ui/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -131,8 +131,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -232,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19222,7 +20868,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +447,7 @@
+@@ -444,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19231,7 +20877,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +485,9 @@
+@@ -482,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19245,7 +20891,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/oscar/icons/Makefile.in
+++ kopete/protocols/oscar/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19255,7 +20910,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19264,7 +20919,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19276,7 +20931,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -577,7 +580,7 @@
+@@ -577,7 +578,7 @@
.NOEXPORT:
#>+ 2
@@ -19285,7 +20940,7 @@
#>+ 2
docs-am:
-@@ -585,96 +588,96 @@
+@@ -585,96 +586,96 @@
#>+ 93
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
@@ -19449,7 +21104,16 @@
force-reedit:
--- kopete/protocols/oscar/icq/Makefile.in
+++ kopete/protocols/oscar/icq/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -159,8 +159,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -260,6 +258,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19459,7 +21123,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -478,7 +481,7 @@
+@@ -478,7 +479,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19468,7 +21132,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -516,9 +519,9 @@
+@@ -516,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19482,7 +21146,16 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/oscar/icq/ui/Makefile.in
+++ kopete/protocols/oscar/icq/ui/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -141,8 +141,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -242,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19492,7 +21165,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +462,7 @@
+@@ -459,7 +460,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19501,7 +21174,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +500,9 @@
+@@ -497,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19513,7 +21186,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -771,7 +774,7 @@
+@@ -771,7 +772,7 @@
-rm -f icqaddcontactpage.moc icqsearchdialog.moc icqeditaccountwidget.moc icquserinfowidget.moc icqauthreplydialog.moc
#>+ 2
@@ -19524,7 +21197,16 @@
clean-ui:
--- kopete/protocols/oscar/liboscar/Makefile.in
+++ kopete/protocols/oscar/liboscar/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -177,8 +177,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -278,6 +276,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19534,7 +21216,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
+@@ -498,7 +499,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -19543,7 +21225,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +539,9 @@
+@@ -536,9 +537,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19555,7 +21237,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -914,18 +917,18 @@
+@@ -914,18 +915,18 @@
mocs: servicesetuptask.moc
#>+ 3
@@ -19580,7 +21262,7 @@
#>+ 3
bytestream.moc: $(srcdir)/bytestream.h
-@@ -984,13 +987,6 @@
+@@ -984,13 +985,6 @@
mocs: rateclass.moc
#>+ 3
@@ -19594,7 +21276,7 @@
snacprotocol.moc: $(srcdir)/snacprotocol.h
$(MOC) $(srcdir)/snacprotocol.h -o snacprotocol.moc
-@@ -1005,6 +1001,13 @@
+@@ -1005,6 +999,13 @@
mocs: rateinfotask.moc
#>+ 3
@@ -19608,7 +21290,7 @@
safedelete.moc: $(srcdir)/safedelete.h
$(MOC) $(srcdir)/safedelete.h -o safedelete.moc
-@@ -1026,18 +1029,18 @@
+@@ -1026,18 +1027,18 @@
mocs: userinfotask.moc
#>+ 3
@@ -19633,7 +21315,7 @@
#>+ 3
warningtask.moc: $(srcdir)/warningtask.h
-@@ -1160,10 +1163,10 @@
+@@ -1160,10 +1161,10 @@
#>+ 3
clean-metasources:
@@ -19646,7 +21328,7 @@
#>+ 3
clean-closures:
-@@ -1211,7 +1214,7 @@
+@@ -1211,7 +1212,7 @@
#>+ 11
@@ -19657,7 +21339,16 @@
echo "#define KDE_USE_FINAL 1" >> liboscar_la.all_cpp.final; \
--- kopete/protocols/oscar/liboscar/tests/Makefile.in
+++ kopete/protocols/oscar/liboscar/tests/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -174,8 +174,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -275,6 +273,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19667,7 +21358,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -489,7 +490,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19676,7 +21367,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +528,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19688,7 +21379,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -787,13 +790,6 @@
+@@ -787,13 +788,6 @@
.NOEXPORT:
#>+ 3
@@ -19702,7 +21393,7 @@
logintest.moc: $(srcdir)/logintest.h
$(MOC) $(srcdir)/logintest.h -o logintest.moc
-@@ -801,11 +797,11 @@
+@@ -801,11 +795,11 @@
mocs: logintest.moc
#>+ 3
@@ -19717,7 +21408,7 @@
#>+ 3
userinfotest.moc: $(srcdir)/userinfotest.h
-@@ -815,6 +811,13 @@
+@@ -815,6 +809,13 @@
mocs: userinfotest.moc
#>+ 3
@@ -19731,7 +21422,7 @@
kunittest.moc: $(srcdir)/kunittest.h
$(MOC) $(srcdir)/kunittest.h -o kunittest.moc
-@@ -830,7 +833,7 @@
+@@ -830,7 +831,7 @@
#>+ 3
clean-metasources:
@@ -19742,7 +21433,16 @@
KDE_DIST=ssitest.h chatnavtests.h clientstream_test.h redirecttest.h logintest.h ssigrouptest.h Makefile.in kunittest.h tester.h ipaddrtest.h ssitest.cpp userinfotest.h Makefile.am
--- kopete/protocols/oscar/Makefile.in
+++ kopete/protocols/oscar/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -157,8 +157,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -258,6 +256,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19752,7 +21452,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -474,7 +477,7 @@
+@@ -474,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19761,7 +21461,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +515,9 @@
+@@ -512,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19775,7 +21475,16 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/sms/icons/Makefile.in
+++ kopete/protocols/sms/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19785,7 +21494,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19794,7 +21503,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19806,7 +21515,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -586,21 +589,21 @@
+@@ -586,21 +587,21 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
$(INSTALL_DATA) $(srcdir)/cr64-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/sms_protocol.png
@@ -19836,7 +21545,16 @@
force-reedit:
--- kopete/protocols/sms/Makefile.in
+++ kopete/protocols/sms/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -161,8 +161,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -262,6 +260,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19846,7 +21564,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -482,7 +483,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19855,7 +21573,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -520,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19867,7 +21585,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -947,11 +950,11 @@
+@@ -947,11 +948,11 @@
mocs: smsaddcontactpage.moc
#>+ 3
@@ -19882,7 +21600,7 @@
#>+ 3
smscontact.moc: $(srcdir)/smscontact.h
-@@ -961,15 +964,15 @@
+@@ -961,15 +962,15 @@
mocs: smscontact.moc
#>+ 3
@@ -19902,7 +21620,7 @@
#>+ 2
KDE_DIST=smscontact.h smsaddcontactpage.h serviceloader.h Makefile.in smsuserpreferences.h smsprotocol.h smsservice.h smsaccount.h smseditaccountwidget.h kopete_sms.desktop Makefile.am
-@@ -1020,7 +1023,7 @@
+@@ -1020,7 +1021,7 @@
#>+ 11
@@ -19913,7 +21631,16 @@
echo "#define KDE_USE_FINAL 1" >> kopete_sms_la.all_cpp.final; \
--- kopete/protocols/sms/services/Makefile.in
+++ kopete/protocols/sms/services/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -131,8 +131,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -232,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19923,7 +21650,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -442,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19932,7 +21659,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -480,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19946,7 +21673,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/sms/ui/Makefile.in
+++ kopete/protocols/sms/ui/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -128,8 +128,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -229,6 +227,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19956,7 +21692,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -435,7 +438,7 @@
+@@ -435,7 +436,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19965,7 +21701,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -473,9 +476,9 @@
+@@ -473,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19979,7 +21715,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/testbed/icons/Makefile.in
+++ kopete/protocols/testbed/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19989,7 +21734,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19998,7 +21743,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20010,7 +21755,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -584,23 +587,23 @@
+@@ -584,23 +585,23 @@
#>+ 19
install-kde-icons:
@@ -20045,7 +21790,16 @@
force-reedit:
--- kopete/protocols/testbed/Makefile.in
+++ kopete/protocols/testbed/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -165,8 +165,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -266,6 +264,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20055,7 +21809,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -477,7 +480,7 @@
+@@ -477,7 +478,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20064,7 +21818,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -515,9 +518,9 @@
+@@ -515,9 +516,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20076,7 +21830,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -927,18 +930,18 @@
+@@ -927,18 +928,18 @@
mocs: testbedprotocol.moc
#>+ 3
@@ -20101,7 +21855,7 @@
#>+ 3
testbedaccount.moc: $(srcdir)/testbedaccount.h
-@@ -963,7 +966,7 @@
+@@ -963,7 +964,7 @@
#>+ 3
clean-metasources:
@@ -20110,7 +21864,7 @@
#>+ 2
KDE_DIST=testbedaddui.ui Makefile.in kopete_testbed.desktop testbedaccountpreferences.ui Makefile.am
-@@ -1059,8 +1062,8 @@
+@@ -1059,8 +1060,8 @@
testbedcontact.lo: testbedcontact.moc
$(srcdir)/testbedincomingmessage.cpp: testbedaddui.h testbedaccountpreferences.h
testbedcontact.o: testbedcontact.moc
@@ -20122,7 +21876,16 @@
testbedaccount.lo: testbedaccount.moc
--- kopete/protocols/winpopup/config/Makefile.in
+++ kopete/protocols/winpopup/config/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -142,8 +142,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -243,6 +241,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20132,7 +21895,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -452,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20141,7 +21904,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -490,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20155,7 +21918,16 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/winpopup/icons/Makefile.in
+++ kopete/protocols/winpopup/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20165,7 +21937,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20174,7 +21946,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20186,7 +21958,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -584,26 +587,26 @@
+@@ -584,26 +585,26 @@
#>+ 22
install-kde-icons:
@@ -20221,7 +21993,16 @@
force-reedit:
--- kopete/protocols/winpopup/libwinpopup/Makefile.in
+++ kopete/protocols/winpopup/libwinpopup/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -125,8 +125,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -226,6 +224,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20231,7 +22012,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -430,7 +431,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20240,7 +22021,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -468,9 +469,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20254,7 +22035,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/winpopup/Makefile.in
+++ kopete/protocols/winpopup/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -165,8 +165,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -266,6 +264,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20264,7 +22054,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -483,7 +486,7 @@
+@@ -483,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20273,7 +22063,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +524,9 @@
+@@ -521,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20285,7 +22075,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -952,13 +955,6 @@
+@@ -952,13 +953,6 @@
mocs: wpaccount.moc
#>+ 3
@@ -20299,7 +22089,7 @@
wpuserinfo.moc: $(srcdir)/wpuserinfo.h
$(MOC) $(srcdir)/wpuserinfo.h -o wpuserinfo.moc
-@@ -966,11 +962,11 @@
+@@ -966,11 +960,11 @@
mocs: wpuserinfo.moc
#>+ 3
@@ -20314,7 +22104,7 @@
#>+ 3
wpprotocol.moc: $(srcdir)/wpprotocol.h
-@@ -980,8 +976,15 @@
+@@ -980,8 +974,15 @@
mocs: wpprotocol.moc
#>+ 3
@@ -20331,7 +22121,7 @@
#>+ 2
KDE_DIST=kopete_wp.desktop Makefile.in winpopup-send.sh winpopup-install.sh Makefile.am
-@@ -1032,7 +1035,7 @@
+@@ -1032,7 +1033,7 @@
#>+ 11
@@ -20342,7 +22132,16 @@
echo "#define KDE_USE_FINAL 1" >> kopete_wp_la.all_cpp.final; \
--- kopete/protocols/winpopup/ui/Makefile.in
+++ kopete/protocols/winpopup/ui/Makefile.in
-@@ -229,6 +229,9 @@
+@@ -128,8 +128,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -229,6 +227,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20352,7 +22151,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -436,7 +437,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20361,7 +22160,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -474,9 +475,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20375,7 +22174,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/yahoo/icons/Makefile.in
+++ kopete/protocols/yahoo/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20385,7 +22193,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
+@@ -394,7 +395,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20394,7 +22202,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -432,9 +433,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20406,7 +22214,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -585,37 +588,37 @@
+@@ -585,37 +586,37 @@
#>+ 34
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
@@ -20460,7 +22268,16 @@
force-reedit:
--- kopete/protocols/yahoo/libyahoo2/Makefile.in
+++ kopete/protocols/yahoo/libyahoo2/Makefile.in
-@@ -227,6 +227,9 @@
+@@ -126,8 +126,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -227,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20470,7 +22287,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -433,7 +434,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -20479,7 +22296,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -471,9 +474,9 @@
+@@ -471,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20493,7 +22310,16 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/yahoo/Makefile.in
+++ kopete/protocols/yahoo/Makefile.in
-@@ -275,6 +275,9 @@
+@@ -174,8 +174,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -275,6 +273,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20503,7 +22329,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -491,7 +494,7 @@
+@@ -491,7 +492,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20512,7 +22338,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -529,9 +532,9 @@
+@@ -529,9 +530,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20524,7 +22350,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -964,13 +967,6 @@
+@@ -964,13 +965,6 @@
mocs: yahoouserinfo.moc
#>+ 3
@@ -20538,7 +22364,7 @@
yahoocontact.moc: $(srcdir)/yahoocontact.h
$(MOC) $(srcdir)/yahoocontact.h -o yahoocontact.moc
-@@ -985,6 +981,13 @@
+@@ -985,6 +979,13 @@
mocs: kyahoo.moc
#>+ 3
@@ -20552,7 +22378,7 @@
yahooeditaccount.moc: $(srcdir)/yahooeditaccount.h
$(MOC) $(srcdir)/yahooeditaccount.h -o yahooeditaccount.moc
-@@ -1021,7 +1024,7 @@
+@@ -1021,7 +1022,7 @@
#>+ 3
clean-metasources:
@@ -20561,7 +22387,7 @@
#>+ 2
KDE_DIST=yahoochatui.rc yahooprotocol.h yahoocontact.h yahooeditaccount.h Makefile.in kyahoo.h yahooconferencemessagemanager.h yahooaccount.h yahooaddcontact.h kopete_yahoo.desktop Makefile.am
-@@ -1072,7 +1075,7 @@
+@@ -1072,7 +1073,7 @@
#>+ 11
@@ -20572,7 +22398,16 @@
echo "#define KDE_USE_FINAL 1" >> kopete_yahoo_la.all_cpp.final; \
--- kopete/protocols/yahoo/ui/Makefile.in
+++ kopete/protocols/yahoo/ui/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -131,8 +131,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -232,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20582,7 +22417,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +446,7 @@
+@@ -443,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20591,7 +22426,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +484,9 @@
+@@ -481,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20605,7 +22440,16 @@
clean-noinstLTLIBRARIES:
--- kopete/sounds/Makefile.in
+++ kopete/sounds/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20615,7 +22459,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -404,7 +407,7 @@
+@@ -404,7 +405,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20624,7 +22468,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -442,9 +445,9 @@
+@@ -442,9 +443,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20638,7 +22482,16 @@
mostlyclean-libtool:
--- kopete/styles/data/Adium/Makefile.in
+++ kopete/styles/data/Adium/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20648,7 +22501,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20657,7 +22510,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20671,7 +22524,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/blue/From/Makefile.in
+++ kopete/styles/data/iChat/blue/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20681,7 +22543,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20690,7 +22552,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20704,7 +22566,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/blue/Makefile.in
+++ kopete/styles/data/iChat/blue/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20714,7 +22585,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20723,7 +22594,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20737,7 +22608,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/blue/To/Makefile.in
+++ kopete/styles/data/iChat/blue/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20747,7 +22627,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20756,7 +22636,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20770,7 +22650,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/clear/From/Makefile.in
+++ kopete/styles/data/iChat/clear/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20780,7 +22669,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20789,7 +22678,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20803,7 +22692,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/clear/Makefile.in
+++ kopete/styles/data/iChat/clear/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20813,7 +22711,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20822,7 +22720,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20836,7 +22734,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/clear/To/Makefile.in
+++ kopete/styles/data/iChat/clear/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20846,7 +22753,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20855,7 +22762,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20869,7 +22776,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/graphite/From/Makefile.in
+++ kopete/styles/data/iChat/graphite/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20879,7 +22795,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20888,7 +22804,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20902,7 +22818,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/graphite/Makefile.in
+++ kopete/styles/data/iChat/graphite/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20912,7 +22837,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20921,7 +22846,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20935,7 +22860,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/graphite/To/Makefile.in
+++ kopete/styles/data/iChat/graphite/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20945,7 +22879,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20954,7 +22888,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20968,7 +22902,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/green/From/Makefile.in
+++ kopete/styles/data/iChat/green/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20978,7 +22921,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -20987,7 +22930,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21001,7 +22944,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/green/Makefile.in
+++ kopete/styles/data/iChat/green/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21011,7 +22963,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21020,7 +22972,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21034,7 +22986,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/green/To/Makefile.in
+++ kopete/styles/data/iChat/green/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21044,7 +23005,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21053,7 +23014,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21067,7 +23028,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/Makefile.in
+++ kopete/styles/data/iChat/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21077,7 +23047,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21086,7 +23056,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21100,7 +23070,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/orange/From/Makefile.in
+++ kopete/styles/data/iChat/orange/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21110,7 +23089,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21119,7 +23098,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21133,7 +23112,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/orange/Makefile.in
+++ kopete/styles/data/iChat/orange/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21143,7 +23131,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21152,7 +23140,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21166,7 +23154,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/orange/To/Makefile.in
+++ kopete/styles/data/iChat/orange/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21176,7 +23173,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21185,7 +23182,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21199,7 +23196,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/pink/From/Makefile.in
+++ kopete/styles/data/iChat/pink/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21209,7 +23215,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21218,7 +23224,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21232,7 +23238,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/pink/Makefile.in
+++ kopete/styles/data/iChat/pink/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21242,7 +23257,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21251,7 +23266,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21265,7 +23280,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/pink/To/Makefile.in
+++ kopete/styles/data/iChat/pink/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21275,7 +23299,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21284,7 +23308,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21298,7 +23322,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/purple/From/Makefile.in
+++ kopete/styles/data/iChat/purple/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21308,7 +23341,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21317,7 +23350,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21331,7 +23364,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/purple/Makefile.in
+++ kopete/styles/data/iChat/purple/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21341,7 +23383,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21350,7 +23392,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21364,7 +23406,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/purple/To/Makefile.in
+++ kopete/styles/data/iChat/purple/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21374,7 +23425,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21383,7 +23434,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21397,7 +23448,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/yellow/From/Makefile.in
+++ kopete/styles/data/iChat/yellow/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21407,7 +23467,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21416,7 +23476,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21430,7 +23490,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/yellow/Makefile.in
+++ kopete/styles/data/iChat/yellow/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21440,7 +23509,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21449,7 +23518,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21463,7 +23532,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/yellow/To/Makefile.in
+++ kopete/styles/data/iChat/yellow/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21473,7 +23551,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21482,7 +23560,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21496,7 +23574,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/blue/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/blue/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21506,7 +23593,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21515,7 +23602,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21529,7 +23616,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/blue/Makefile.in
+++ kopete/styles/data/iChat-Trans/blue/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21539,7 +23635,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21548,7 +23644,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21562,7 +23658,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/blue/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/blue/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21572,7 +23677,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21581,7 +23686,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21595,7 +23700,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/clear/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/clear/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21605,7 +23719,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21614,7 +23728,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21628,7 +23742,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/clear/Makefile.in
+++ kopete/styles/data/iChat-Trans/clear/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21638,7 +23761,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21647,7 +23770,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21661,7 +23784,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/clear/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/clear/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21671,7 +23803,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21680,7 +23812,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21694,7 +23826,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21704,7 +23845,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21713,7 +23854,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21727,7 +23868,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/graphite/Makefile.in
+++ kopete/styles/data/iChat-Trans/graphite/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21737,7 +23887,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21746,7 +23896,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21760,7 +23910,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21770,7 +23929,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21779,7 +23938,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21793,7 +23952,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/green/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/green/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21803,7 +23971,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21812,7 +23980,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21826,7 +23994,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/green/Makefile.in
+++ kopete/styles/data/iChat-Trans/green/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21836,7 +24013,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21845,7 +24022,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21859,7 +24036,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/green/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/green/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21869,7 +24055,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21878,7 +24064,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21892,7 +24078,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/Makefile.in
+++ kopete/styles/data/iChat-Trans/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21902,7 +24097,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21911,7 +24106,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21925,7 +24120,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/orange/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/orange/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21935,7 +24139,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21944,7 +24148,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21958,7 +24162,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/orange/Makefile.in
+++ kopete/styles/data/iChat-Trans/orange/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21968,7 +24181,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21977,7 +24190,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21991,7 +24204,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/orange/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/orange/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22001,7 +24223,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22010,7 +24232,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22024,7 +24246,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/pink/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/pink/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22034,7 +24265,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22043,7 +24274,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22057,7 +24288,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/pink/Makefile.in
+++ kopete/styles/data/iChat-Trans/pink/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22067,7 +24307,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22076,7 +24316,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22090,7 +24330,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/pink/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/pink/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22100,7 +24349,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22109,7 +24358,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22123,7 +24372,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/purple/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/purple/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22133,7 +24391,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22142,7 +24400,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22156,7 +24414,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/purple/Makefile.in
+++ kopete/styles/data/iChat-Trans/purple/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22166,7 +24433,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22175,7 +24442,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22189,7 +24456,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/purple/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/purple/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22199,7 +24475,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22208,7 +24484,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22222,7 +24498,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22232,7 +24517,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22241,7 +24526,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22255,7 +24540,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/yellow/Makefile.in
+++ kopete/styles/data/iChat-Trans/yellow/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22265,7 +24559,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -422,7 +423,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22274,7 +24568,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -460,9 +461,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22288,7 +24582,16 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22298,7 +24601,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22307,7 +24610,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22321,7 +24624,16 @@
mostlyclean-libtool:
--- kopete/styles/data/Kopete/Makefile.in
+++ kopete/styles/data/Kopete/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22331,7 +24643,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22340,7 +24652,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22354,7 +24666,16 @@
mostlyclean-libtool:
--- kopete/styles/data/Makefile.in
+++ kopete/styles/data/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22364,7 +24685,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22373,7 +24694,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22387,7 +24708,16 @@
mostlyclean-libtool:
--- kopete/styles/Makefile.in
+++ kopete/styles/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22397,7 +24727,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -434,7 +435,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22406,7 +24736,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -472,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22420,7 +24750,16 @@
mostlyclean-libtool:
--- kpf/Makefile.in
+++ kpf/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -123,8 +123,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -224,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22430,7 +24769,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -427,7 +430,7 @@
+@@ -427,7 +428,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22439,7 +24778,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -465,9 +468,9 @@
+@@ -465,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22451,7 +24790,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -805,17 +808,17 @@
+@@ -805,17 +806,17 @@
#>+ 13
install-kde-icons:
@@ -22477,7 +24816,16 @@
force-reedit:
--- kpf/src/Makefile.in
+++ kpf/src/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -168,8 +168,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -269,6 +267,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22487,7 +24835,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22496,7 +24844,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22508,7 +24856,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -942,13 +945,6 @@
+@@ -942,13 +943,6 @@
#>+ 3
@@ -22522,7 +24870,7 @@
Server.moc: $(srcdir)/Server.h
$(MOC) $(srcdir)/Server.h -o Server.moc
-@@ -977,81 +973,88 @@
+@@ -977,81 +971,88 @@
mocs: Applet.moc
#>+ 3
@@ -22644,7 +24992,7 @@
#>+ 3
WebServerManager_stub.h: WebServerManager.kidl
-@@ -1068,7 +1071,7 @@
+@@ -1068,7 +1069,7 @@
#>+ 3
clean-metasources:
@@ -22653,7 +25001,7 @@
#>+ 2
KDE_DIST=KPFInterface.h System.h Makefile.in Defines.h KPFInterface.cpp Makefile.am
-@@ -1128,7 +1131,7 @@
+@@ -1128,7 +1129,7 @@
#>+ 11
@@ -22662,7 +25010,7 @@
@echo 'creating kpf_panelapplet_la.all_cpp.cpp ...'; \
rm -f kpf_panelapplet_la.all_cpp.files kpf_panelapplet_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kpf_panelapplet_la.all_cpp.final; \
-@@ -1140,7 +1143,7 @@
+@@ -1140,7 +1141,7 @@
rm -f kpf_panelapplet_la.all_cpp.final kpf_panelapplet_la.all_cpp.files
#>+ 11
@@ -22671,7 +25019,7 @@
@echo 'creating kpfpropertiesdialog_la.all_cpp.cpp ...'; \
rm -f kpfpropertiesdialog_la.all_cpp.files kpfpropertiesdialog_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kpfpropertiesdialog_la.all_cpp.final; \
-@@ -1184,8 +1187,8 @@
+@@ -1184,8 +1185,8 @@
$(srcdir)/ActiveMonitorItem.cpp: WebServer_stub.h
ActiveMonitor.o: ActiveMonitor.moc
SingleServerConfigDialog.lo: SingleServerConfigDialog.moc
@@ -22683,7 +25031,16 @@
$(srcdir)/PortValidator.cpp: WebServer_stub.h
--- kppp/DB/Makefile.in
+++ kppp/DB/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22693,7 +25050,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -410,7 +411,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22702,7 +25059,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +449,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22716,7 +25073,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Austria/Makefile.in
+++ kppp/DB/Provider/Austria/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22726,7 +25092,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22735,7 +25101,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22749,7 +25115,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Belarus/Makefile.in
+++ kppp/DB/Provider/Belarus/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22759,7 +25134,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22768,7 +25143,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22782,7 +25157,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Czech_Republic/Makefile.in
+++ kppp/DB/Provider/Czech_Republic/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22792,7 +25176,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -419,7 +422,7 @@
+@@ -419,7 +420,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22801,7 +25185,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +460,9 @@
+@@ -457,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22813,7 +25197,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -618,7 +621,7 @@
+@@ -618,7 +619,7 @@
.NOEXPORT:
#>+ 2
@@ -22824,7 +25208,16 @@
docs-am:
--- kppp/DB/Provider/Denmark/Makefile.in
+++ kppp/DB/Provider/Denmark/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22834,7 +25227,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22843,7 +25236,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22857,7 +25250,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/France/Makefile.in
+++ kppp/DB/Provider/France/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22867,7 +25269,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22876,7 +25278,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22890,7 +25292,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Germany/Makefile.in
+++ kppp/DB/Provider/Germany/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22900,7 +25311,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -407,7 +408,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22909,7 +25320,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +446,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22923,7 +25334,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Ireland/Makefile.in
+++ kppp/DB/Provider/Ireland/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22933,7 +25353,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22942,7 +25362,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22956,7 +25376,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Makefile.in
+++ kppp/DB/Provider/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22966,7 +25395,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -412,7 +415,7 @@
+@@ -412,7 +413,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -22975,7 +25404,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -450,9 +453,9 @@
+@@ -450,9 +451,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22989,7 +25418,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Netherlands/Makefile.in
+++ kppp/DB/Provider/Netherlands/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22999,7 +25437,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -467,7 +468,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23008,7 +25446,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -505,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23020,7 +25458,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -666,7 +669,7 @@
+@@ -666,7 +667,7 @@
.NOEXPORT:
#>+ 2
@@ -23031,7 +25469,16 @@
docs-am:
--- kppp/DB/Provider/New_Zealand/Makefile.in
+++ kppp/DB/Provider/New_Zealand/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23041,7 +25488,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23050,7 +25497,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23062,7 +25509,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -604,7 +607,7 @@
+@@ -604,7 +605,7 @@
.NOEXPORT:
#>+ 2
@@ -23073,7 +25520,16 @@
docs-am:
--- kppp/DB/Provider/Norway/Makefile.in
+++ kppp/DB/Provider/Norway/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23083,7 +25539,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23092,7 +25548,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23106,7 +25562,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Portugal/Makefile.in
+++ kppp/DB/Provider/Portugal/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23116,7 +25581,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23125,7 +25590,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23139,7 +25604,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Slovenia/Makefile.in
+++ kppp/DB/Provider/Slovenia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23149,7 +25623,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23158,7 +25632,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23172,7 +25646,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Sweden/Makefile.in
+++ kppp/DB/Provider/Sweden/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23182,7 +25665,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23191,7 +25674,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23205,7 +25688,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Switzerland/Makefile.in
+++ kppp/DB/Provider/Switzerland/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23215,7 +25707,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23224,7 +25716,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23238,7 +25730,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Taiwan/Makefile.in
+++ kppp/DB/Provider/Taiwan/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23248,7 +25749,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23257,7 +25758,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23271,7 +25772,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Ukraine/Makefile.in
+++ kppp/DB/Provider/Ukraine/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23281,7 +25791,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23290,7 +25800,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23304,7 +25814,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/United_Kingdom/Makefile.in
+++ kppp/DB/Provider/United_Kingdom/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23314,7 +25833,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23323,7 +25842,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23337,7 +25856,16 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Yugoslavia/Makefile.in
+++ kppp/DB/Provider/Yugoslavia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23347,7 +25875,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -414,7 +417,7 @@
+@@ -414,7 +415,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23356,7 +25884,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +455,9 @@
+@@ -452,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23368,7 +25896,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -613,7 +616,7 @@
+@@ -613,7 +614,7 @@
.NOEXPORT:
#>+ 2
@@ -23379,7 +25907,16 @@
docs-am:
--- kppp/icons/Makefile.in
+++ kppp/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23389,7 +25926,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -393,7 +396,7 @@
+@@ -393,7 +394,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23398,7 +25935,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -431,9 +434,9 @@
+@@ -431,9 +432,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23410,7 +25947,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -583,26 +586,26 @@
+@@ -583,26 +584,26 @@
#>+ 22
install-kde-icons:
@@ -23448,7 +25985,16 @@
force-reedit:
--- kppp/logview/Makefile.in
+++ kppp/logview/Makefile.in
-@@ -260,6 +260,9 @@
+@@ -159,8 +159,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -260,6 +258,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23458,7 +26004,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -479,7 +480,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23467,7 +26013,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -517,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23481,7 +26027,16 @@
@$(NORMAL_INSTALL)
--- kppp/Makefile.in
+++ kppp/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -182,8 +182,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -283,6 +281,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23491,7 +26046,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -631,7 +634,7 @@
+@@ -631,7 +632,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23500,7 +26055,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -669,9 +672,9 @@
+@@ -669,9 +670,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23514,7 +26069,16 @@
@$(NORMAL_INSTALL)
--- kppp/pixmaps/Makefile.in
+++ kppp/pixmaps/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23524,7 +26088,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -411,7 +414,7 @@
+@@ -411,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23533,7 +26097,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -449,9 +452,9 @@
+@@ -449,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23547,7 +26111,16 @@
mostlyclean-libtool:
--- kppp/Rules/Argentina/Makefile.in
+++ kppp/Rules/Argentina/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23557,7 +26130,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23566,7 +26139,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23580,7 +26153,16 @@
mostlyclean-libtool:
--- kppp/Rules/Australia/Makefile.in
+++ kppp/Rules/Australia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23590,7 +26172,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -411,7 +414,7 @@
+@@ -411,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23599,7 +26181,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -449,9 +452,9 @@
+@@ -449,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23613,7 +26195,16 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Business_1/Makefile.in
+++ kppp/Rules/Austria/Business_1/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23623,7 +26214,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -408,7 +409,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23632,7 +26223,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23646,7 +26237,16 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Business_2/Makefile.in
+++ kppp/Rules/Austria/Business_2/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23656,7 +26256,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -408,7 +409,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23665,7 +26265,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23679,7 +26279,16 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Makefile.in
+++ kppp/Rules/Austria/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23689,7 +26298,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -413,7 +414,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -23698,7 +26307,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -451,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23712,7 +26321,16 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Minimum/Makefile.in
+++ kppp/Rules/Austria/Minimum/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23722,7 +26340,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -408,7 +409,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23731,7 +26349,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23745,7 +26363,16 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Standard/Makefile.in
+++ kppp/Rules/Austria/Standard/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23755,7 +26382,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23764,7 +26391,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23778,7 +26405,16 @@
mostlyclean-libtool:
--- kppp/Rules/Bangladesh/Makefile.in
+++ kppp/Rules/Bangladesh/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23788,7 +26424,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -407,7 +408,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23797,7 +26433,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +446,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23811,7 +26447,16 @@
mostlyclean-libtool:
--- kppp/Rules/Belgium/Makefile.in
+++ kppp/Rules/Belgium/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23821,7 +26466,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -407,7 +408,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23830,7 +26475,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +446,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23844,7 +26489,16 @@
mostlyclean-libtool:
--- kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
+++ kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23854,7 +26508,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23863,7 +26517,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23877,7 +26531,16 @@
mostlyclean-libtool:
--- kppp/Rules/Brasil/Makefile.in
+++ kppp/Rules/Brasil/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23887,7 +26550,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23896,7 +26559,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23910,7 +26573,16 @@
mostlyclean-libtool:
--- kppp/Rules/Croatia/Makefile.in
+++ kppp/Rules/Croatia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23920,7 +26592,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23929,7 +26601,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23943,7 +26615,16 @@
mostlyclean-libtool:
--- kppp/Rules/Czechia/Makefile.in
+++ kppp/Rules/Czechia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23953,7 +26634,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -410,7 +411,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23962,7 +26643,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +449,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23976,7 +26657,16 @@
mostlyclean-libtool:
--- kppp/Rules/Denmark/Makefile.in
+++ kppp/Rules/Denmark/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23986,7 +26676,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -411,7 +414,7 @@
+@@ -411,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23995,7 +26685,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -449,9 +452,9 @@
+@@ -449,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24009,7 +26699,16 @@
mostlyclean-libtool:
--- kppp/Rules/Estonia/Makefile.in
+++ kppp/Rules/Estonia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24019,7 +26718,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24028,7 +26727,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24042,7 +26741,16 @@
mostlyclean-libtool:
--- kppp/Rules/Finland/Makefile.in
+++ kppp/Rules/Finland/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24052,7 +26760,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24061,7 +26769,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24075,7 +26783,16 @@
mostlyclean-libtool:
--- kppp/Rules/France/Makefile.in
+++ kppp/Rules/France/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24085,7 +26802,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -408,7 +409,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24094,7 +26811,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24108,7 +26825,16 @@
mostlyclean-libtool:
--- kppp/Rules/Germany/Makefile.in
+++ kppp/Rules/Germany/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24118,7 +26844,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -434,7 +435,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24127,7 +26853,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -472,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24141,7 +26867,16 @@
mostlyclean-libtool:
--- kppp/Rules/Greece/Makefile.in
+++ kppp/Rules/Greece/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24151,7 +26886,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -410,7 +411,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24160,7 +26895,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +449,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24174,7 +26909,16 @@
mostlyclean-libtool:
--- kppp/Rules/HongKong/Makefile.in
+++ kppp/Rules/HongKong/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24184,7 +26928,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24193,7 +26937,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24207,7 +26951,16 @@
mostlyclean-libtool:
--- kppp/Rules/Hungary/Makefile.in
+++ kppp/Rules/Hungary/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24217,7 +26970,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24226,7 +26979,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24240,7 +26993,16 @@
mostlyclean-libtool:
--- kppp/Rules/Iceland/Makefile.in
+++ kppp/Rules/Iceland/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24250,7 +27012,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24259,7 +27021,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24271,7 +27033,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -604,7 +607,7 @@
+@@ -604,7 +605,7 @@
.NOEXPORT:
#>+ 2
@@ -24282,7 +27044,16 @@
docs-am:
--- kppp/Rules/India/Makefile.in
+++ kppp/Rules/India/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24292,7 +27063,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -408,7 +409,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24301,7 +27072,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24315,7 +27086,16 @@
mostlyclean-libtool:
--- kppp/Rules/Indonesia/Makefile.in
+++ kppp/Rules/Indonesia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24325,7 +27105,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -408,7 +409,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24334,7 +27114,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24348,7 +27128,16 @@
mostlyclean-libtool:
--- kppp/Rules/Ireland/Makefile.in
+++ kppp/Rules/Ireland/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24358,7 +27147,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24367,7 +27156,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24381,7 +27170,16 @@
mostlyclean-libtool:
--- kppp/Rules/Israel/Makefile.in
+++ kppp/Rules/Israel/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24391,7 +27189,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -407,7 +408,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24400,7 +27198,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +446,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24414,7 +27212,16 @@
mostlyclean-libtool:
--- kppp/Rules/Italy/Makefile.in
+++ kppp/Rules/Italy/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24424,7 +27231,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -434,7 +435,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24433,7 +27240,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -472,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24445,7 +27252,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -633,7 +636,7 @@
+@@ -633,7 +634,7 @@
.NOEXPORT:
#>+ 2
@@ -24456,7 +27263,16 @@
docs-am:
--- kppp/Rules/Jamaica/Makefile.in
+++ kppp/Rules/Jamaica/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24466,7 +27282,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -407,7 +408,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24475,7 +27291,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +446,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24489,7 +27305,16 @@
mostlyclean-libtool:
--- kppp/Rules/Japan/Makefile.in
+++ kppp/Rules/Japan/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24499,7 +27324,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24508,7 +27333,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24522,7 +27347,16 @@
mostlyclean-libtool:
--- kppp/Rules/Kazakhstan/Makefile.in
+++ kppp/Rules/Kazakhstan/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24532,7 +27366,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24541,7 +27375,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24555,7 +27389,16 @@
mostlyclean-libtool:
--- kppp/Rules/Luxembourg/Makefile.in
+++ kppp/Rules/Luxembourg/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24565,7 +27408,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24574,7 +27417,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24588,7 +27431,16 @@
mostlyclean-libtool:
--- kppp/Rules/Macedonia/Makefile.in
+++ kppp/Rules/Macedonia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24598,7 +27450,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -408,7 +409,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24607,7 +27459,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24621,7 +27473,16 @@
mostlyclean-libtool:
--- kppp/Rules/Makefile.in
+++ kppp/Rules/Makefile.in
-@@ -225,6 +225,9 @@
+@@ -124,8 +124,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -225,6 +223,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24631,7 +27492,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -418,7 +421,7 @@
+@@ -418,7 +419,7 @@
xdg_menudir = @xdg_menudir@
#>- SUBDIRS = $(AUTODIRS)
#>+ 1
@@ -24640,7 +27501,7 @@
pkg_DATA = TEMPLATE
pkg_SCRIPTS = checkrules
pkgdir = $(kde_datadir)/kppp/Rules
-@@ -428,7 +431,7 @@
+@@ -428,7 +429,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -24649,7 +27510,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -466,9 +467,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24663,7 +27524,16 @@
@$(NORMAL_INSTALL)
--- kppp/Rules/Malaysia/Makefile.in
+++ kppp/Rules/Malaysia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24673,7 +27543,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24682,7 +27552,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24696,7 +27566,16 @@
mostlyclean-libtool:
--- kppp/Rules/Netherlands/Makefile.in
+++ kppp/Rules/Netherlands/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24706,7 +27585,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -434,7 +435,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24715,7 +27594,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -472,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24727,7 +27606,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -633,7 +636,7 @@
+@@ -633,7 +634,7 @@
.NOEXPORT:
#>+ 2
@@ -24738,7 +27617,16 @@
docs-am:
--- kppp/Rules/Norway/Makefile.in
+++ kppp/Rules/Norway/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24748,7 +27636,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -408,7 +409,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24757,7 +27645,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24771,7 +27659,16 @@
mostlyclean-libtool:
--- kppp/Rules/Poland/Makefile.in
+++ kppp/Rules/Poland/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24781,7 +27678,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -413,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24790,7 +27687,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -451,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24804,7 +27701,16 @@
mostlyclean-libtool:
--- kppp/Rules/Portugal/Makefile.in
+++ kppp/Rules/Portugal/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24814,7 +27720,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -407,7 +408,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24823,7 +27729,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +446,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24837,7 +27743,16 @@
mostlyclean-libtool:
--- kppp/Rules/Romania/Makefile.in
+++ kppp/Rules/Romania/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24847,7 +27762,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -410,7 +411,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24856,7 +27771,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +449,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24870,7 +27785,16 @@
mostlyclean-libtool:
--- kppp/Rules/Russia/Makefile.in
+++ kppp/Rules/Russia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24880,7 +27804,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24889,7 +27813,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24903,7 +27827,16 @@
mostlyclean-libtool:
--- kppp/Rules/Singapore/Makefile.in
+++ kppp/Rules/Singapore/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24913,7 +27846,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24922,7 +27855,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24936,7 +27869,16 @@
mostlyclean-libtool:
--- kppp/Rules/Slovakia/Makefile.in
+++ kppp/Rules/Slovakia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24946,7 +27888,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -408,7 +409,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24955,7 +27897,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24969,7 +27911,16 @@
mostlyclean-libtool:
--- kppp/Rules/Slovenia/Makefile.in
+++ kppp/Rules/Slovenia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24979,7 +27930,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -408,7 +411,7 @@
+@@ -408,7 +409,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24988,7 +27939,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -446,9 +449,9 @@
+@@ -446,9 +447,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25002,7 +27953,16 @@
mostlyclean-libtool:
--- kppp/Rules/SouthAfrica/Makefile.in
+++ kppp/Rules/SouthAfrica/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25012,7 +27972,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25021,7 +27981,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25035,7 +27995,16 @@
mostlyclean-libtool:
--- kppp/Rules/SouthAfrika/Makefile.in
+++ kppp/Rules/SouthAfrika/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25045,7 +28014,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25054,7 +28023,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25068,7 +28037,16 @@
mostlyclean-libtool:
--- kppp/Rules/Spain/Makefile.in
+++ kppp/Rules/Spain/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25078,7 +28056,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -410,7 +413,7 @@
+@@ -410,7 +411,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25087,7 +28065,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -448,9 +451,9 @@
+@@ -448,9 +449,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25101,7 +28079,16 @@
mostlyclean-libtool:
--- kppp/Rules/Sweden/Makefile.in
+++ kppp/Rules/Sweden/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25111,7 +28098,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -413,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25120,7 +28107,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -451,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25132,7 +28119,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -612,7 +615,7 @@
+@@ -612,7 +613,7 @@
.NOEXPORT:
#>+ 2
@@ -25143,7 +28130,16 @@
docs-am:
--- kppp/Rules/Switzerland/Makefile.in
+++ kppp/Rules/Switzerland/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25153,7 +28149,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -411,7 +414,7 @@
+@@ -411,7 +412,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25162,7 +28158,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -449,9 +452,9 @@
+@@ -449,9 +450,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25176,7 +28172,16 @@
mostlyclean-libtool:
--- kppp/Rules/Turkey/Makefile.in
+++ kppp/Rules/Turkey/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25186,7 +28191,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25195,7 +28200,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25209,7 +28214,16 @@
mostlyclean-libtool:
--- kppp/Rules/Ukraine/Makefile.in
+++ kppp/Rules/Ukraine/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25219,7 +28233,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25228,7 +28242,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25242,7 +28256,16 @@
mostlyclean-libtool:
--- kppp/Rules/United_Kingdom/Makefile.in
+++ kppp/Rules/United_Kingdom/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25252,7 +28275,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -413,7 +416,7 @@
+@@ -413,7 +414,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25261,7 +28284,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -451,9 +454,9 @@
+@@ -451,9 +452,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25275,7 +28298,16 @@
mostlyclean-libtool:
--- kppp/Rules/Uruguay/Makefile.in
+++ kppp/Rules/Uruguay/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25285,7 +28317,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -405,7 +406,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25294,7 +28326,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -443,9 +444,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25308,7 +28340,16 @@
mostlyclean-libtool:
--- kppp/Rules/Yugoslavia/Makefile.in
+++ kppp/Rules/Yugoslavia/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25318,7 +28359,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25327,7 +28368,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25339,7 +28380,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -608,7 +611,7 @@
+@@ -608,7 +609,7 @@
.NOEXPORT:
#>+ 2
@@ -25350,7 +28391,16 @@
docs-am:
--- krdc/Makefile.in
+++ krdc/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -178,8 +178,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -279,6 +277,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25360,7 +28410,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -508,7 +509,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25369,7 +28419,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -546,9 +547,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25381,7 +28431,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1057,11 +1060,11 @@
+@@ -1057,11 +1058,11 @@
mocs: kfullscreenpanel.moc
#>+ 3
@@ -25396,7 +28446,7 @@
#>+ 3
keycapturedialog.moc: $(srcdir)/keycapturedialog.h
-@@ -1071,11 +1074,11 @@
+@@ -1071,11 +1072,11 @@
mocs: keycapturedialog.moc
#>+ 3
@@ -25411,7 +28461,7 @@
#>+ 3
maindialog.moc: $(srcdir)/maindialog.h
-@@ -1086,7 +1089,7 @@
+@@ -1086,7 +1087,7 @@
#>+ 3
clean-metasources:
@@ -25420,7 +28470,7 @@
#>+ 2
KDE_DIST=maindialogwidget.h hostprofiles.ui.h Makefile.in smb2rdc.desktop pinup.png maindialogbase.ui keycapturewidget.ui _rfb._tcp pindown.png hostprofiles.ui pointcursor.png rdp.protocol maindialog.h vnc.protocol cr48-app-krdc.png configure.in.in iconify.png pointcursormask.png cr32-app-krdc.png krdc.desktop Makefile.am close.png
-@@ -1103,14 +1106,14 @@
+@@ -1103,14 +1104,14 @@
#>+ 10
install-kde-icons:
@@ -25438,7 +28488,7 @@
#>+ 15
force-reedit:
-@@ -1151,7 +1154,7 @@
+@@ -1151,7 +1152,7 @@
#>+ 11
@@ -25449,7 +28499,16 @@
echo "#define KDE_USE_FINAL 1" >> krdc.all_cpp.final; \
--- krdc/rdp/Makefile.in
+++ krdc/rdp/Makefile.in
-@@ -233,6 +233,9 @@
+@@ -132,8 +132,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -233,6 +231,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25459,7 +28518,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +442,7 @@
+@@ -439,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25468,7 +28527,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +480,9 @@
+@@ -477,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25482,7 +28541,16 @@
clean-noinstLTLIBRARIES:
--- krdc/vnc/Makefile.in
+++ krdc/vnc/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -142,8 +142,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -243,6 +241,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25492,7 +28560,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -455,7 +458,7 @@
+@@ -455,7 +456,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -25501,7 +28569,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -493,9 +496,9 @@
+@@ -493,9 +494,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25515,7 +28583,16 @@
clean-noinstLTLIBRARIES:
--- krfb/kcm_krfb/Makefile.in
+++ krfb/kcm_krfb/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -142,8 +142,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -243,6 +241,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25525,7 +28602,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,7 +461,7 @@
+@@ -458,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25534,7 +28611,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +499,9 @@
+@@ -496,9 +497,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25546,7 +28623,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -798,7 +801,7 @@
+@@ -798,7 +799,7 @@
-rm -f kcm_krfb.moc
#>+ 2
@@ -25557,7 +28634,16 @@
clean-ui:
--- krfb/kinetd/Makefile.in
+++ krfb/kinetd/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -143,8 +143,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -244,6 +242,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25567,7 +28653,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -463,7 +464,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25576,7 +28662,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -501,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25590,7 +28676,16 @@
@$(NORMAL_INSTALL)
--- krfb/krfb/Makefile.in
+++ krfb/krfb/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -166,8 +166,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -267,6 +265,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25600,7 +28695,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -496,7 +499,7 @@
+@@ -496,7 +497,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -25609,7 +28704,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -534,9 +537,9 @@
+@@ -534,9 +535,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25621,7 +28716,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -972,7 +975,7 @@
+@@ -972,7 +973,7 @@
-rm -f invitedialog.moc trayicon.moc krfbifaceimpl.moc configuration.moc rfbcontroller.moc connectiondialog.moc
#>+ 2
@@ -25630,7 +28725,7 @@
#>+ 5
clean-idl:
-@@ -995,21 +998,21 @@
+@@ -995,21 +996,21 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
$(INSTALL_DATA) $(srcdir)/lo32-app-krfb.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/krfb.png
@@ -25660,7 +28755,16 @@
force-reedit:
--- krfb/krfb_httpd/Makefile.in
+++ krfb/krfb_httpd/Makefile.in
-@@ -209,6 +209,9 @@
+@@ -108,8 +108,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -209,6 +207,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25670,7 +28774,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -407,7 +408,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25679,7 +28783,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +446,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25693,7 +28797,16 @@
@$(NORMAL_INSTALL)
--- krfb/libvncserver/Makefile.in
+++ krfb/libvncserver/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -125,8 +125,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -226,6 +224,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25703,7 +28816,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -433,7 +434,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -25712,7 +28825,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -471,9 +474,9 @@
+@@ -471,9 +472,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25726,7 +28839,16 @@
clean-noinstLTLIBRARIES:
--- krfb/Makefile.in
+++ krfb/Makefile.in
-@@ -213,6 +213,9 @@
+@@ -112,8 +112,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -213,6 +211,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25736,7 +28858,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -415,7 +416,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -25745,7 +28867,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -453,9 +456,9 @@
+@@ -453,9 +454,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25759,7 +28881,16 @@
mostlyclean-libtool:
--- krfb/srvloc/Makefile.in
+++ krfb/srvloc/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -135,8 +135,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -236,6 +234,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25769,7 +28900,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -451,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25778,7 +28909,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -489,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25792,7 +28923,16 @@
clean-noinstLTLIBRARIES:
--- ksirc/icons/Makefile.in
+++ ksirc/icons/Makefile.in
-@@ -196,6 +196,9 @@
+@@ -95,8 +95,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -196,6 +194,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25802,7 +28942,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
+@@ -397,7 +398,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25811,7 +28951,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -435,9 +436,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25823,7 +28963,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -587,42 +590,42 @@
+@@ -587,42 +588,42 @@
#>+ 39
install-kde-icons:
@@ -25883,7 +29023,16 @@
#>+ 15
--- ksirc/img/emoticons/Makefile.in
+++ ksirc/img/emoticons/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25893,7 +29042,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -407,7 +408,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -25902,7 +29051,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +446,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25916,7 +29065,16 @@
mostlyclean-libtool:
--- ksirc/img/Makefile.in
+++ ksirc/img/Makefile.in
-@@ -222,6 +222,9 @@
+@@ -121,8 +121,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -222,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25926,7 +29084,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -436,7 +439,7 @@
+@@ -436,7 +437,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -25935,7 +29093,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -474,9 +477,9 @@
+@@ -474,9 +475,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25947,7 +29105,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -784,7 +787,7 @@
+@@ -784,7 +785,7 @@
.NOEXPORT:
#>+ 2
@@ -25958,7 +29116,16 @@
docs-am:
--- ksirc/KSOpenkSirc/Makefile.in
+++ ksirc/KSOpenkSirc/Makefile.in
-@@ -244,6 +244,9 @@
+@@ -143,8 +143,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -244,6 +242,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25968,7 +29135,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -471,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25977,7 +29144,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -509,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25991,7 +29158,16 @@
clean-noinstLTLIBRARIES:
--- ksirc/KSPrefs/Makefile.in
+++ ksirc/KSPrefs/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -137,8 +137,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -238,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26001,7 +29177,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -503,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26010,7 +29186,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26024,7 +29200,16 @@
clean-noinstLTLIBRARIES:
--- ksirc/KSProgress/Makefile.in
+++ ksirc/KSProgress/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -131,8 +131,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -232,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26034,7 +29219,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -435,7 +438,7 @@
+@@ -435,7 +436,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26043,7 +29228,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -473,9 +476,9 @@
+@@ -473,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26057,7 +29242,16 @@
clean-noinstLTLIBRARIES:
--- ksirc/KSTicker/Makefile.in
+++ ksirc/KSTicker/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -141,8 +141,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -242,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26067,7 +29261,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -451,7 +454,7 @@
+@@ -451,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26076,7 +29270,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +492,9 @@
+@@ -489,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26090,7 +29284,16 @@
clean-noinstLTLIBRARIES:
--- ksirc/Makefile.in
+++ ksirc/Makefile.in
-@@ -323,6 +323,9 @@
+@@ -222,8 +222,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -323,6 +321,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26100,7 +29303,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -687,7 +690,7 @@
+@@ -687,7 +688,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -26109,7 +29312,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -725,9 +728,9 @@
+@@ -725,9 +726,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26121,7 +29324,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1356,18 +1359,18 @@
+@@ -1356,18 +1357,18 @@
ksirc_DEPENDENCIES = libkdeinit_ksirc.la
#>+ 3
@@ -26146,7 +29349,7 @@
#>+ 3
ioDCC.moc: $(srcdir)/ioDCC.h
-@@ -1384,13 +1387,6 @@
+@@ -1384,13 +1385,6 @@
mocs: ssfeprompt.moc
#>+ 3
@@ -26160,7 +29363,7 @@
FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h
$(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc
-@@ -1405,6 +1401,13 @@
+@@ -1405,6 +1399,13 @@
mocs: ahistlineedit.moc
#>+ 3
@@ -26174,7 +29377,7 @@
alistbox.moc: $(srcdir)/alistbox.h
$(MOC) $(srcdir)/alistbox.h -o alistbox.moc
-@@ -1433,13 +1436,6 @@
+@@ -1433,13 +1434,6 @@
mocs: ksview.moc
#>+ 3
@@ -26188,7 +29391,7 @@
ioLAG.moc: $(srcdir)/ioLAG.h
$(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
-@@ -1447,18 +1443,18 @@
+@@ -1447,18 +1441,18 @@
mocs: ioLAG.moc
#>+ 3
@@ -26213,7 +29416,7 @@
#>+ 3
colorpicker.moc: $(srcdir)/colorpicker.h
-@@ -1475,6 +1471,13 @@
+@@ -1475,6 +1469,13 @@
mocs: objFinder.moc
#>+ 3
@@ -26227,7 +29430,7 @@
displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h
$(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc
-@@ -1503,18 +1506,18 @@
+@@ -1503,18 +1504,18 @@
mocs: dccToplevel.moc
#>+ 3
@@ -26252,7 +29455,7 @@
#>+ 3
dockservercontroller.moc: $(srcdir)/dockservercontroller.h
-@@ -1539,7 +1542,7 @@
+@@ -1539,7 +1540,7 @@
#>+ 3
clean-metasources:
@@ -26261,7 +29464,7 @@
#>+ 2
KDE_DIST=advfollow.pl sirc.help.gz nickColourMaker.h eventsrc displayMgrMDI.h ksircserver.h Artistic default.pl kstextview.h charSelector.h relnotes filters.pl openksircproc.dlg FilterRuleWidget.ui servercontroller.dlg Makefile.in autodcc.pl dccManagerbase.ui chanButtons.h topic.h ksircrc ksirc.pl stringparserstate.h FilterRuleEditor.dlg ksirc.desktop dccNewbase.ui ksircchannel.h FAQ logfile.h colorpicker.h dsirc mditoplevel.h version.h Makefile.am
-@@ -1593,7 +1596,7 @@
+@@ -1593,7 +1594,7 @@
#>+ 11
@@ -26272,7 +29475,16 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_ksirc_la.all_cpp.final; \
--- ksirc/puke/Makefile.in
+++ ksirc/puke/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -147,8 +147,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -248,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26282,7 +29494,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -482,7 +483,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26291,7 +29503,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -520,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26303,7 +29515,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -896,18 +899,18 @@
+@@ -896,18 +897,18 @@
mocs: ptablevw.moc
#>+ 3
@@ -26328,7 +29540,7 @@
#>+ 3
pkfiledialog.moc: $(srcdir)/pkfiledialog.h
-@@ -918,7 +921,7 @@
+@@ -918,7 +919,7 @@
#>+ 3
clean-metasources:
@@ -26337,7 +29549,7 @@
#>+ 2
KDE_DIST=pobjfinder.h load_all.pm palistbox.pm ppopmenu.pm pkfiledialog-cmd.h ppushbt.pm pobjfinder-cmd.h dcc_status.pm Makefile.in user_monitor.ks pobjfinder.pm pbutton.pm plistbox.pm pmenudta.pm pkfiledialog.pm dcc_progress.pm ptablevw.pm plabel.pm small.pl pprogress.pm pkfiledialog.h ptabdialog.pm Makefile.am
-@@ -965,7 +968,7 @@
+@@ -965,7 +966,7 @@
#>+ 11
@@ -26348,7 +29560,16 @@
echo "#define KDE_USE_FINAL 1" >> libpuke_la.all_cpp.final; \
--- ktalkd/kcmktalkd/Makefile.in
+++ ktalkd/kcmktalkd/Makefile.in
-@@ -245,6 +245,9 @@
+@@ -144,8 +144,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -245,6 +243,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26358,7 +29579,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -452,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26367,7 +29588,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -490,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26379,7 +29600,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -794,18 +797,18 @@
+@@ -794,18 +795,18 @@
mocs: answmachpage.moc
#>+ 3
@@ -26404,7 +29625,7 @@
#>+ 3
forwmachpage.moc: $(srcdir)/forwmachpage.h
-@@ -816,7 +819,7 @@
+@@ -816,7 +817,7 @@
#>+ 3
clean-metasources:
@@ -26413,7 +29634,7 @@
#>+ 2
KDE_DIST=cr48-app-ktalkd.png cr128-app-ktalkd.png main.h cr22-app-ktalkd.png soundpage.h Makefile.in forwmachpage.h cr32-app-ktalkd.png cr16-app-ktalkd.png kcmktalkd.desktop answmachpage.h Makefile.am
-@@ -830,23 +833,23 @@
+@@ -830,23 +831,23 @@
#>+ 19
install-kde-icons:
@@ -26446,7 +29667,7 @@
#>+ 15
force-reedit:
-@@ -887,7 +890,7 @@
+@@ -887,7 +888,7 @@
#>+ 11
@@ -26457,7 +29678,16 @@
echo "#define KDE_USE_FINAL 1" >> kcm_ktalkd_la.all_cpp.final; \
--- ktalkd/ktalkd/machines/Makefile.in
+++ ktalkd/ktalkd/machines/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -140,8 +140,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -241,6 +239,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26467,7 +29697,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -442,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26476,7 +29706,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -480,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26490,7 +29720,16 @@
clean-noinstLIBRARIES:
--- ktalkd/ktalkd/Makefile.in
+++ ktalkd/ktalkd/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -163,8 +163,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -264,6 +262,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26500,7 +29739,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -484,7 +487,7 @@
+@@ -484,7 +485,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -26509,7 +29748,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -522,9 +525,9 @@
+@@ -522,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26521,7 +29760,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -922,7 +925,7 @@
+@@ -922,7 +923,7 @@
.NOEXPORT:
#>+ 2
@@ -26532,7 +29771,16 @@
docs-am:
--- ktalkd/ktalkdlg/Makefile.in
+++ ktalkd/ktalkdlg/Makefile.in
-@@ -232,6 +232,9 @@
+@@ -131,8 +131,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -232,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26542,7 +29790,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -434,7 +435,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26551,7 +29799,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -472,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26565,7 +29813,16 @@
@$(NORMAL_INSTALL)
--- ktalkd/mail.local/Makefile.in
+++ ktalkd/mail.local/Makefile.in
-@@ -226,6 +226,9 @@
+@@ -125,8 +125,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -226,6 +224,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26575,7 +29832,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -426,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -26584,7 +29841,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -464,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26598,7 +29855,16 @@
@$(NORMAL_INSTALL)
--- ktalkd/Makefile.in
+++ ktalkd/Makefile.in
-@@ -215,6 +215,9 @@
+@@ -114,8 +114,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -215,6 +213,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26608,7 +29874,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -414,7 +417,7 @@
+@@ -414,7 +415,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -26617,7 +29883,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -452,9 +455,9 @@
+@@ -452,9 +453,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26631,7 +29897,16 @@
mostlyclean-libtool:
--- lanbrowsing/kcmlisa/Makefile.in
+++ lanbrowsing/kcmlisa/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -155,8 +155,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -256,6 +254,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26641,7 +29916,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -462,7 +465,7 @@
+@@ -462,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26650,7 +29925,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -500,9 +503,9 @@
+@@ -500,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26662,7 +29937,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -901,18 +904,18 @@
+@@ -901,18 +902,18 @@
#>+ 3
@@ -26687,7 +29962,7 @@
#>+ 3
kcmkiolan.moc: $(srcdir)/kcmkiolan.h
-@@ -937,7 +940,7 @@
+@@ -937,7 +938,7 @@
#>+ 3
clean-metasources:
@@ -26696,7 +29971,7 @@
#>+ 2
KDE_DIST=kcmreslisa.desktop portsettingsbar.h Makefile.in findnic.h kcmreslisa.h kcmlisa.desktop kcmkiolan.desktop configure.in.in kcmlisa.h kcmkiolan.h setupwizard.h Makefile.am
-@@ -988,7 +991,7 @@
+@@ -988,7 +989,7 @@
#>+ 11
@@ -26707,7 +29982,16 @@
echo "#define KDE_USE_FINAL 1" >> kcm_lanbrowser_la.all_cpp.final; \
--- lanbrowsing/kio_lan/Makefile.in
+++ lanbrowsing/kio_lan/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -146,8 +146,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -247,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26717,7 +30001,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
+@@ -463,7 +464,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26726,7 +30010,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +504,9 @@
+@@ -501,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26740,7 +30024,16 @@
@$(NORMAL_INSTALL)
--- lanbrowsing/lisa/Makefile.in
+++ lanbrowsing/lisa/Makefile.in
-@@ -259,6 +259,9 @@
+@@ -158,8 +158,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -259,6 +257,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26750,7 +30043,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
+@@ -488,7 +489,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26759,7 +30052,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +529,9 @@
+@@ -526,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26773,7 +30066,16 @@
@$(NORMAL_INSTALL)
--- lanbrowsing/Makefile.in
+++ lanbrowsing/Makefile.in
-@@ -212,6 +212,9 @@
+@@ -111,8 +111,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -212,6 +210,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26783,7 +30085,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -409,7 +410,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -26792,7 +30094,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -447,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26806,7 +30108,16 @@
mostlyclean-libtool:
--- librss/Makefile.in
+++ librss/Makefile.in
-@@ -251,6 +251,9 @@
+@@ -150,8 +150,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -251,6 +249,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26816,7 +30127,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -465,7 +468,7 @@
+@@ -465,7 +466,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26825,7 +30136,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +506,9 @@
+@@ -503,9 +504,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26837,7 +30148,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -829,7 +832,7 @@
+@@ -829,7 +830,7 @@
-rm -f loader.moc image.moc testlibrss.moc
#>+ 2
@@ -26848,7 +30159,16 @@
clean-closures:
--- Makefile.in
+++ Makefile.in
-@@ -230,6 +230,9 @@
+@@ -129,8 +129,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -230,6 +228,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26858,7 +30178,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -435,7 +438,7 @@
+@@ -435,7 +436,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -26867,7 +30187,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,12 +480,12 @@
+@@ -477,12 +478,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -26882,7 +30202,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -494,7 +497,7 @@
+@@ -494,7 +495,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -26891,7 +30211,7 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -1004,7 +1007,7 @@
+@@ -1004,7 +1005,7 @@
.NOEXPORT:
#>+ 2
@@ -26902,7 +30222,16 @@
docs-am:
--- wifi/kcmwifi/Makefile.in
+++ wifi/kcmwifi/Makefile.in
-@@ -247,6 +247,9 @@
+@@ -146,8 +146,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -247,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26912,7 +30241,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -461,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26921,7 +30250,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -499,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26933,7 +30262,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -801,18 +804,18 @@
+@@ -801,18 +802,18 @@
mocs: mainconfig.moc
#>+ 3
@@ -26958,7 +30287,7 @@
#>+ 3
wificonfig.moc: $(srcdir)/wificonfig.h
-@@ -823,7 +826,7 @@
+@@ -823,7 +824,7 @@
#>+ 3
clean-metasources:
@@ -26967,7 +30296,7 @@
#>+ 2
KDE_DIST=mainconfigbase.ui mainconfig.h configcrypto.ui configcrypto.ui.h configpower.ui.h kcmwifi.h Makefile.in ifconfigpage.h vendorconfig.h indent-options ifconfigpagebase.ui kcmwifi.desktop wificonfig.h configadvanced.ui configpower.ui Makefile.am
-@@ -882,7 +885,7 @@
+@@ -882,7 +883,7 @@
#>+ 11
@@ -26978,7 +30307,16 @@
echo "#define KDE_USE_FINAL 1" >> kcm_wifi_la.all_cpp.final; \
--- wifi/kwireless/Makefile.in
+++ wifi/kwireless/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -142,8 +142,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -243,6 +241,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26988,7 +30326,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -457,7 +460,7 @@
+@@ -457,7 +458,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26997,7 +30335,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -495,9 +498,9 @@
+@@ -495,9 +496,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27011,7 +30349,16 @@
@$(NORMAL_INSTALL)
--- wifi/locations/Makefile.in
+++ wifi/locations/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27021,7 +30368,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
+@@ -407,7 +408,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27030,7 +30377,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -445,9 +448,9 @@
+@@ -445,9 +446,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27044,7 +30391,16 @@
mostlyclean-libtool:
--- wifi/Makefile.in
+++ wifi/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -173,8 +173,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -274,6 +272,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27054,7 +30410,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -523,7 +524,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27063,7 +30419,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -561,9 +562,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27075,7 +30431,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -979,18 +982,18 @@
+@@ -979,18 +980,18 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub interface_dcop.kidl
#>+ 3
@@ -27100,7 +30456,7 @@
#>+ 3
interface_wireless.moc: $(srcdir)/interface_wireless.h
-@@ -1015,7 +1018,7 @@
+@@ -1015,7 +1016,7 @@
#>+ 3
clean-metasources:
@@ -27109,7 +30465,7 @@
#>+ 2
KDE_DIST=kwifimanagerui.rc hi64-app-kwifimanager.png hi16-app-kwifimanager.png hi128-app-kwifimanager.png hi32-app-kwifimanager.png hi22-app-kwifimanager.png hisc-app-kwifimanager.svgz Makefile.in hi48-app-kwifimanager.png configure.in.in kwifimanager.desktop Makefile.am
-@@ -1030,29 +1033,29 @@
+@@ -1030,29 +1031,29 @@
#>+ 25
install-kde-icons:
@@ -27151,7 +30507,7 @@
#>+ 15
force-reedit:
-@@ -1093,7 +1096,7 @@
+@@ -1093,7 +1094,7 @@
#>+ 11
@@ -27162,7 +30518,16 @@
echo "#define KDE_USE_FINAL 1" >> kwifimanager.all_cpp.final; \
--- wifi/pixmaps/Makefile.in
+++ wifi/pixmaps/Makefile.in
-@@ -206,6 +206,9 @@
+@@ -105,8 +105,6 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
+-GLIB_CFLAGS = @GLIB_CFLAGS@
+-GLIB_LIBS = @GLIB_LIBS@
+ GLINC = @GLINC@
+ GLLIB = @GLLIB@
+ GMSGFMT = @GMSGFMT@
+@@ -206,6 +204,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27172,7 +30537,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -415,7 +416,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -27181,7 +30546,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -453,9 +456,9 @@
+@@ -453,9 +454,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
More information about the pkg-kde-commits
mailing list