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

List:       kde-commits
Subject:    kdevelop
From:       Harald Fernengel <harry () kdevelop ! org>
Date:       2003-04-23 20:30:25
[Download RAW message or body]

CVS commit by harald: 

only build on KDE < 3.1 and Qt < 3.1


  M +1 -0      configure.in.in   1.47
  M +44 -0     kdevelop.m4.in   1.18
  M +1 -1      lib/Makefile.am   1.23


--- kdevelop/configure.in.in  #1.46:1.47
@@ -9,4 +9,5 @@
 KDEV_CHECK_SVN
 KDEV_CHECK_QEDITOR
+KDEV_CHECK_COMPAT
 KDEV_CHECK_BDB
 #KDEV_PATH_PYTHONDOCDIR

--- kdevelop/kdevelop.m4.in  #1.17:1.18
@@ -467,4 +467,48 @@
 ])
 
+dnl  **********
+dnl  check whether we need the compat lib
+dnl  **********
+
+AC_DEFUN(KDEV_CHECK_COMPAT,
+[
+  AC_MSG_CHECKING(whether to build the compat lib)
+
+  AC_CACHE_VAL(ac_cv_qt31_setup,
+  [
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+
+    save_CXXFLAGS="$CXXFLAGS"
+
+    CXXFLAGS="$CXXFLAGS $QT_INCLUDES $KDE_INCLUDES $X_CFLAGS"
+
+    AC_TRY_LINK([
+      #include <qglobal.h>
+      #include <kdeversion.h>
+    ],
+    [
+      #if QT_VERSION < 0x030100
+         choke me
+      #endif
+      #if KDE_VERSION < 0x030100
+         KDE_choke me
+      #endif
+    ],
+      ac_cv_qt31_setup=yes,
+      ac_cv_qt31_setup=no
+    )
+    CXXFLAGS="$save_CXXFLAGS"
+    AC_LANG_RESTORE
+   ])
+
+  if test "$ac_cv_qt31_setup" == "yes"; then
+    AC_MSG_RESULT(no)
+  else
+    AC_MSG_RESULT(yes)
+    COMPAT_SUBDIR=compat
+  fi
+AC_SUBST(COMPAT_SUBDIR)
+])
 
 dnl  **********

--- kdevelop/lib/Makefile.am  #1.22:1.23
@@ -17,4 +17,4 @@
 
 
-SUBDIRS = interfaces sourceinfo util project widgets qextmdi antlr structure catalog \
cppparser compat +SUBDIRS = interfaces sourceinfo util project widgets qextmdi antlr \
structure catalog cppparser $(COMPAT_SUBDIR)  


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