[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kopete-devel
Subject:    [Kopete-devel] kdenetwork/kopete
From:       Martijn Klingens <klingens () kde ! org>
Date:       2003-08-29 13:58:42
[Download RAW message or body]

CVS commit by mklingens: 

Compile libkopete/compat ONLY for KDE 3.1.x and not for CVS HEAD. The
current compile fixes for KDE 3.1 break CVS HEAD, notably linking.

To use, add $(LIB_KOPETECOMPAT) to the KConfigureDialog KCMs.
This resolves to an empty string for KDE HEAD, and to libkopete for KDE 3.1.

The proper include paths are in $(KOPETE_KCDIALOG_INCLUDES), which again is
empty for HEAD.

I'll fix the other makefiles shortly.

CCMAIL: kopete-devel@kde.org


  M +21 -4     configure.in.in   1.8
  M +10 -4     libkopete/Makefile.am   1.75
  M +2 -0      libkopete/configure.in.in   1.3


--- kdenetwork/kopete/configure.in.in  #1.7:1.8
@@ -15,8 +15,24 @@
 
 KOPETE_INCLUDES='-I$(top_srcdir)/kopete/libkopete \
                -I$(top_srcdir)/kopete/libkopete/ui \
                -I$(top_builddir)/kopete/libkopete/ui'
-if test "$ac_cv_header_knotifydialog_h" = "no"; then
-  KOPETE_INCLUDES=$KOPETE_INCLUDES' -I$(top_srcdir)/kopete/libkopete/compat'
-  LIB_KOPETECOMPAT='$(top_builddir)/kopete/libkopete/compat/libkopetecompat.la'
-fi
+KOPETE_KCDIALOG_INCLUDES=''
+
+# -- Check for KDE 3.1 and enable the compat dir --------------------
+AC_MSG_CHECKING([for kdelibs newer than 3.1.x])
+AC_TRY_COMPILE(dnl
+[
+#include <kdeversion.h>
+
+#if !( KDE_IS_VERSION( 3, 1, 90 ) )
+#error Need to enable libkopete/compat/
+#endif
+],
+[
+],
+        KOPETE_INCLUDES=$KOPETE_INCLUDES' -I$(top_srcdir)/kopete/libkopete/compat'
+        KOPETE_KCDIALOG_INCLUDES=$KOPETE_KCDIALOG_INCLUDES' \
-I$(top_srcdir)/kopete/libkopete/compat/kcdialog' +        \
LIB_KOPETECOMPAT='$(top_builddir)/kopete/libkopete/libkopete.la' +)
+AM_CONDITIONAL(compile_LIBKOPETE_COMPAT, test -n "$KOPETE_KCDIALOG_INCLUDES")
+# -- End KDE 3.1 check ----------------------------------------------
 
 KDE_FIND_PATH(xml2-config, XML_CONFIG, [${prefix}/bin ${exec_prefix}/bin \
/usr/local/bin /opt/local/bin /usr/bin], [ @@ -95,4 +111,5 @@
 
 AC_SUBST(KOPETE_INCLUDES)
+AC_SUBST(KOPETE_KCDIALOG_INCLUDES)
 AC_SUBST(LIB_KOPETECOMPAT)
 

--- kdenetwork/kopete/libkopete/Makefile.am  #1.74:1.75
@@ -1,8 +1,14 @@
-SUBDIRS = private ui compat .
+if compile_LIBKOPETE_COMPAT
+COMPAT_DIR = compat
+COMPAT_LIBS = $(LIB_KOPETECOMPAT) \
../libkopete/compat/kcdialog/libkopetecompat_kcdialog.la +endif
+
+SUBDIRS = private ui $(COMPAT_DIR) .
 
 METASOURCES = AUTO
 
 AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CAST \
-        $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private \
-I$(top_srcdir)/kopete/libkopete/ui -I$(top_srcdir)/kopete/libkopete/compat/kcdialog \
$(all_includes) +        $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private \
-I$(top_srcdir)/kopete/libkopete/ui \ +        $(KOPETE_KCDIALOG_INCLUDES) \
$(all_includes)  
 lib_LTLIBRARIES = libkopete.la
@@ -15,6 +21,5 @@
 
 libkopete_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
-libkopete_la_LIBADD = ui/libkopeteui.la \
-        $(LIB_KOPETECOMPAT) ../libkopete/compat/kcdialog/libkopetecompat_kcdialog.la \
$(LIB_KIO) $(LIB_XSS) +libkopete_la_LIBADD = ui/libkopeteui.la $(COMPAT_LIBS) \
$(LIB_KIO) $(LIB_XSS)  
 servicetype_DATA = kopeteplugin.desktop kopeteprotocol.desktop
@@ -22,2 +27,3 @@
 
 # vim: set noet:
+

--- kdenetwork/kopete/libkopete/configure.in.in  #1.2:1.3
@@ -1,2 +1,3 @@
+# -- Check for XScreenSaver -----------------------------------------
 AC_CHECK_HEADERS(tgmath.h)xss_save_ldflags="$LDFLAGS"
 LDFLAGS="$X_LDFLAGS"
@@ -28,2 +29,3 @@
 AC_SUBST(LIB_XSS)
 LDFLAGS="$xss_save_ldflags"
+


_______________________________________________
Kopete-devel mailing list
Kopete-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/kopete-devel


[prev in list] [next in list] [prev in thread] [next in thread]