patch: make it work ;)

[Oswald Buddenhagen]

hi,

this patch replaces the use of $KDE_INCLUDES with $ac_kde_includes - the
latter is expanded by KDE_EXPAND_MAKEVAR, thus being actually usable
outside a makefile.
this problem is probably present in other parts of kde as well, but so
far i did not notice it. :)

apart from that, i converted some AC_TRY_LINKs to AC_TRY_COMPILEs and
removed some unnecessary (afaics) includes. feel free to ignore at your
liking.

greetings

-- 
Hi! I'm a .signature virus! Copy me into your ~/.signature, please!
--
Chaos, panic, and disorder - my work here is done.
-------------- next part --------------
Index: kdevelop.m4.in
===================================================================
RCS file: /home/kde/kdevelop/kdevelop.m4.in,v
retrieving revision 1.31
diff -U2 -r1.31 kdevelop.m4.in
--- kdevelop.m4.in	27 Oct 2003 21:52:16 -0000	1.31
+++ kdevelop.m4.in	31 Jan 2004 21:03:31 -0000
@@ -421,5 +421,5 @@
     save_CXXFLAGS="$CXXFLAGS"
 
-    CXXFLAGS="$CXXFLAGS $X_CFLAGS -ldb"
+    CXXFLAGS="$CXXFLAGS -ldb"
 
     AC_TRY_LINK([
@@ -483,7 +483,7 @@
     AC_LANG_CPLUSPLUS
     save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="$KDE_INCLUDES"
+    CXXFLAGS="-I$ac_kde_includes"
 
-    AC_TRY_LINK([
+    AC_TRY_COMPILE([
       #include <kdeversion.h>
     ],
@@ -533,7 +533,7 @@
     save_CXXFLAGS="$CXXFLAGS"
 
-    CXXFLAGS="$CXXFLAGS $QT_INCLUDES $KDE_INCLUDES $X_CFLAGS"
+    CXXFLAGS="$QT_INCLUDES $ac_kde_includes"
 
-    AC_TRY_LINK([
+    AC_TRY_COMPILE([
       #include <qglobal.h>
       #include <kdeversion.h>
@@ -581,7 +581,7 @@
     save_CXXFLAGS="$CXXFLAGS"
 
-    CXXFLAGS="$CXXFLAGS $QT_INCLUDES $X_CFLAGS"
+    CXXFLAGS="$QT_INCLUDES"
 
-    AC_TRY_LINK([
+    AC_TRY_COMPILE([
       #include <qglobal.h>
     ],