Unicodesymbols: - add all characters supported by the textcomp-package

[lyx.git] / config / qt4.m4

diff --git a/config/qt4.m4 b/config/qt4.m4
index 7a73a9de165afe3382c335bf0831da21cdfa555c..0a88f1220cc52f8e8ba4f55df14bbbd15b056ea2 100644 (file)
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -136,13 +136,8 @@ AC_DEFUN([QT4_DO_IT_ALL],
 
        dnl Check if it possible to do a pkg-config
        QT4_DO_PKG_CONFIG
-       if test -n "$qt4_cv_dir" -o -n "$qt4_cv_includes" -o -n "$qt4_cv_libraries"; then
-               dnl The user gave commandline arguments, override pkg-config
+       if test "$pkg_failed" != "no" ; then
                QT4_DO_MANUAL_CONFIG
-       else
-               if test "$pkg_failed" != "no" ; then
-                       QT4_DO_MANUAL_CONFIG
-               fi
        fi
        AC_PATH_PROGS(MOC4, [moc-qt4 moc],[],$qt4_cv_bin:$PATH)
        AC_PATH_PROGS(UIC4, [uic-qt4 uic],[],$qt4_cv_bin:$PATH)
@@ -153,7 +148,7 @@ AC_DEFUN([QT4_DO_PKG_CONFIG],
        PKG_PROG_PKG_CONFIG
        save_PKG_CONFIG_PATH=$PKG_CONFIG_PATH
        if test -n "$qt4_cv_dir" ; then
-         PKG_CONFIG_PATH=$qt4_cv_dir/lib:$PKG_CONFIG_PATH
+         PKG_CONFIG_PATH=$qt4_cv_dir/lib:$qt4_cv_dir/lib/pkgconfig:$PKG_CONFIG_PATH
          export PKG_CONFIG_PATH
        fi
        PKG_CHECK_MODULES(QT4_CORE, QtCore,,[:])
@@ -205,9 +200,7 @@ AC_DEFUN([QT4_DO_MANUAL_CONFIG],
 
        QT4_CHECK_COMPILE
 
-       if test -n "$qt4_cv_libname"; then
-               QT4_LIB=$qt4_cv_libname;
-       fi
+       QT4_LIB=$qt4_cv_libname;
        AC_SUBST(QT4_LIB)
        AC_SUBST(QT4_CORE_LIB)