This patch fixes a bug in acinclude.m4.in which should solve the qt-mt +
KDE-with-qt problem.
The qt-gui plugin compiles without any problem with or without KDE (2.x).
Please comment & apply.
Laurent Pinchart
Index: acinclude.m4.in
===================================================================
RCS file: /cvsroot/licq/qt-gui/acinclude.m4.in,v
retrieving revision 1.40
diff -u -r1.40 acinclude.m4.in
--- acinclude.m4.in 14 Feb 2002 08:18:11 -0000 1.40
+++ acinclude.m4.in 17 Feb 2002 14:20:05 -0000
@@ -237,11 +237,11 @@
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
-
+
save_CXXFLAGS="$CXXFLAGS"
save_LDFLAGS="$LDFLAGS"
save_LIBS="$LIBS"
-
+
CXXFLAGS="$CXXFLAGS $QT_INCLUDES $X_CFLAGS"
LDFLAGS="$X_LIBS $QT_LDFLAGS $LDFLAGS"
LIBS="$LIB_QT $X_PRE_LIBS -lX11 -lXext $LIBS"
@@ -257,6 +257,10 @@
ac_cv_qt_setup=yes,
ac_cv_qt_setup=no
)
+
+ CXXFLAGS="$save_$CXXFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+ LIBS="$save_LIBS"
])
AC_MSG_RESULT($ac_cv_qt_setup)
