[Licq-cvs] CVS: qt-gui acinclude.m4.in,1.39,1.40

[Rob K. <ca...@us...>]

Update of /cvsroot/licq/qt-gui
In directory usw-pr-cvs1:/tmp/cvs-serv3843

Modified Files:
	acinclude.m4.in 
Log Message:
Fix KDE2/KDE3 compilation and runtime problems with the file dialog, using
-lkfile for KDE2 and -lkio for KDE3. My system already finds -lqt-mt for 3
and -lqt for 2 automatically though, so I didn't touch Qt detection.


Index: acinclude.m4.in
===================================================================
RCS file: /cvsroot/licq/qt-gui/acinclude.m4.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- acinclude.m4.in	31 Jan 2002 23:27:32 -0000	1.39
+++ acinclude.m4.in	14 Feb 2002 08:18:11 -0000	1.40
@@ -362,8 +362,15 @@
     AC_MSG_RESULT([libraries $kde_libraries, headers $kde_includes])
     AC_DEFINE(USE_KDE)
     LIB_NAME="licq_kde-gui.la"
-    KDE_LIBS="-lkdecore -lkdeui -lkio"
+
+    # KDE 2 or 3? (libkfile no longer exists in KDE3, so link with -lkio)
+    if test -f $kde_libraries/libkfile.so ; then
+      KDE_LIBS="-lkfile"
+    else
+      KDE_LIBS="-lkio"
+    fi
     AC_SUBST(KDE_LIBS)
+
     have_kde=yes
     AC_SUBST(have_kde)
   else