Test for the presence of rpmbuild.

[lyx.git] / config / qt.m4

diff --git a/config/qt.m4 b/config/qt.m4
index bf8ce45257a9fd80e101e3552b07e037bb65f2e5..e8ef8aefbbbc6c35669d357fe5d91f2917d7adc9 100644 (file)
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -81,7 +81,8 @@ AC_DEFUN(QT_FIND_MOC,
 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 @@ AC_DEFUN(QT_TRY_LINK,
        ],
        qt_cv_libname=$1,
        )
-       CXXFLAGS="$BASE_CXXFLAGS"
+       LIBS="$SAVE_LIBS"
 ])
  
 dnl check we can do a compile
@@ -106,7 +107,7 @@ AC_DEFUN(QT_CHECK_COMPILE,
        [
                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
@@ -146,7 +147,7 @@ AC_DEFUN(QT_GET_VERSION,
 EOF
                lyx_cv_qtversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
                        grep '^"%%%"'  2>/dev/null | \
-                       sed -e 's/^"%%%""\(.*\)""%%%"/\1/' -e 's/ //g'`
+                       sed -e 's/"%%%"//g' -e 's/"//g'`
                rm -f conftest.$ac_ext
                CPPFLAGS=$SAVE_CPPFLAGS
        ])
@@ -210,5 +211,7 @@ AC_DEFUN(QT_DO_IT_ALL,
        QT_LIB=$qt_cv_libname;
        AC_SUBST(QT_LIB)
 
-       QT_GET_VERSION
+       if test -n "$qt_cv_libname"; then
+               QT_GET_VERSION
+       fi
 ])