On Thu, Dec 19, 2002 at 01:52:19PM +0000, Mike Meredith wrote:

> checks for a working qt library fails with missing symbols 
> (QTString::Text). The command to link conftest.cc tries to link the qt 
> library before compiling the C++ file :-

The below patch should fix this. Lars, should I apply ?

regards
john


Index: config/qt.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/qt.m4,v
retrieving revision 1.5
diff -u -r1.5 qt.m4
--- config/qt.m4        13 Sep 2002 01:47:29 -0000      1.5
+++ config/qt.m4        19 Dec 2002 22:49:36 -0000
@@ -81,7 +81,8 @@
 dnl check a particular libname
 AC_DEFUN(QT_TRY_LINK,
 [
-       CXXFLAGS="$BASE_CXXFLAGS $1"
+       SAVE_LIBS="$LIBS"
+       LIBS="$LIBS $1"
        AC_TRY_LINK([
        #include <qglobal.h>
        #include <qstring.h>
@@ -94,7 +95,7 @@
        ],
        qt_cv_libname=$1,
        )
-       CXXFLAGS="$BASE_CXXFLAGS"
+       LIBS="$SAVE_LIBS"
 ])
  
 dnl check we can do a compile
@@ -106,7 +107,7 @@
        [
                AC_LANG_CPLUSPLUS
                SAVE_CXXFLAGS=$CXXFLAGS
-               BASE_CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS" 
+               CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS" 
 
                for libname in -lqt3 -lqt2 -lqt -lqt-mt;
                do
@@ -210,5 +211,7 @@
        QT_LIB=$qt_cv_libname;
        AC_SUBST(QT_LIB)
 
-       QT_GET_VERSION
+       if test -n "$qt_cv_libname"; then
+               QT_GET_VERSION
+       fi
 ])
-- 
"ALL television is children's television."
        - Richard Adler 

Reply via email to