Hi all,

this patch lets us build classpath with Qt-4.1.0 again, released a few days ago. The problem is the reorganization of the Qt include directory which changed from include to include/module, means in our case, include/QtGui and include/QtCore.

ok?

Andreas

P.s, merry Christmas to all!

2005-12-25  Andreas Tobler  <[EMAIL PROTECTED]>

        * configure.ac (QT_CFLAGS): Check for 4.1.0 version and for QtCore
        to have the right include flags.

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.121
diff -u -r1.121 configure.ac
--- configure.ac        3 Dec 2005 16:59:42 -0000       1.121
+++ configure.ac        25 Dec 2005 21:59:38 -0000
@@ -366,7 +366,7 @@

   dnl Check for AWT related Qt4
   if test "x${COMPILE_QT_PEER}" = xyes; then
-    PKG_CHECK_MODULES(QT, QtGui >= 4.0.1, HAVE_QT4="yes", HAVE_QT4="no")
+ PKG_CHECK_MODULES(QT, QtCore QtGui >= 4.1.0, HAVE_QT4="yes", HAVE_QT4="no")
     if test "x$HAVE_QT4" = "xyes"; then
       dnl Check needed because in some cases the QtGui includedir
       dnl doesn't contain the subsystem dir.


_______________________________________________
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches

Reply via email to