Take into account the latex encoding when generating math preview snippets.

[lyx.git] / config / qt4.m4

diff --git a/config/qt4.m4 b/config/qt4.m4
index 098845f8ba9ddcf97efc26cb170bab98026c3b14..c5b95eda24c98ba7266819aad827c93908a5949b 100644 (file)
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -28,6 +28,15 @@ AC_DEFUN([QT4_CHECK_COMPILE],
                AC_LANG_CPLUSPLUS
                SAVE_CXXFLAGS=$CXXFLAGS
                CXXFLAGS="$CXXFLAGS $QT4_INCLUDES $QT4_LDFLAGS"
+               for libname in -lQtCore -lQtCore4
+               do
+                       QT4_TRY_LINK($libname)
+                       if test -n "$qt4_cv_libname"; then
+                               QT4_CORE_LIB="$qt4_cv_libname"
+                               break;
+                       fi
+               done
+               qt4_cv_libname=
                for libname in '-lQtCore -lQtGui' \
                               '-lQtCore4 -lQtGui4'
                do
@@ -115,7 +124,7 @@ AC_DEFUN([QT4_DO_IT_ALL],
        fi
 
        dnl Preprocessor flags
-       QT4_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT_NO_KEYWORDS"
+       QT4_CPPFLAGS="-DQT_NO_STL -DQT_NO_KEYWORDS"
        case ${host} in
        *mingw*) QT4_CPPFLAGS="-DQT_DLL $QT4_CPPFLAGS";;
        *cygwin*)
@@ -126,24 +135,37 @@ AC_DEFUN([QT4_DO_IT_ALL],
        AC_SUBST(QT4_CPPFLAGS)
 
        dnl Check if it possible to do a pkg-config
-       QT4_DO_PKG_CONFIG
+       PKG_PROG_PKG_CONFIG
+       if test -n "$PKG_CONFIG" ; then
+               QT4_DO_PKG_CONFIG
+       fi
        if test "$pkg_failed" != "no" ; then
                QT4_DO_MANUAL_CONFIG
        fi
        AC_PATH_PROGS(MOC4, [moc-qt4 moc],[],$qt4_cv_bin:$PATH)
        AC_PATH_PROGS(UIC4, [uic-qt4 uic],[],$qt4_cv_bin:$PATH)
+       AC_PATH_PROGS(RCC4, [rcc-qt4 rcc],[],$qt4_cv_bin:$PATH)
 ])
 
 AC_DEFUN([QT4_DO_PKG_CONFIG],
 [
-       PKG_PROG_PKG_CONFIG
+       dnl tell pkg-config to look also in $qt4_cv_dir/lib.
        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_FRONTEND, QtCore QtGui)
-       if test "$pkg_failed" == "no" ; then
+       PKG_CHECK_MODULES(QT4_CORE, QtCore,,[:])
+       if test "$pkg_failed" = "no" ; then
+               QT4_CORE_INCLUDES=$QT4_CORE_CFLAGS
+               AC_SUBST(QT4_CORE_INCLUDES)
+               QT4_CORE_LDFLAGS=`$PKG_CONFIG --libs-only-L QtCore`
+               AC_SUBST(QT4_CORE_LDFLAGS)
+               QT4_CORE_LIB=`$PKG_CONFIG --libs-only-l QtCore`
+               AC_SUBST(QT4_CORE_LIB)
+       fi
+       PKG_CHECK_MODULES(QT4_FRONTEND, QtCore QtGui,,[:])
+       if test "$pkg_failed" = "no" ; then
                QT4_INCLUDES=$QT4_FRONTEND_CFLAGS
                dnl QT4_LDFLAGS=$QT4_FRONTEND_LIBS
                QT4_LDFLAGS=`$PKG_CONFIG --libs-only-L QtCore QtGui`
@@ -153,8 +175,7 @@ AC_DEFUN([QT4_DO_PKG_CONFIG],
                AC_SUBST(QT4_VERSION)
                QT4_LIB=`$PKG_CONFIG --libs-only-l QtCore QtGui`
                AC_SUBST(QT4_LIB)
-       else
-               QT4_DO_MANUAL_CONFIG
+               LIBS="$LIBS `$PKG_CONFIG --libs-only-other QtCore QtGui`"
        fi
        PKG_CONFIG_PATH=$save_PKG_CONFIG_PATH
 ])
@@ -164,22 +185,29 @@ AC_DEFUN([QT4_DO_MANUAL_CONFIG],
        dnl flags for compilation
        QT4_INCLUDES=
        QT4_LDFLAGS=
+       QT4_CORE_INCLUDES=
+       QT4_CORE_LDFLAGS=
        if test -n "$qt4_cv_includes"; then
                QT4_INCLUDES="-I$qt4_cv_includes"
                for i in Qt QtCore QtGui; do
                        QT4_INCLUDES="$QT4_INCLUDES -I$qt4_cv_includes/$i"
                done
+               QT4_CORE_INCLUDES="-I$qt4_cv_includes -I$qt4_cv_includes/QtCore"
        fi
        if test -n "$qt4_cv_libraries"; then
                QT4_LDFLAGS="-L$qt4_cv_libraries"
+               QT4_CORE_LDFLAGS="-L$qt4_cv_libraries"
        fi
        AC_SUBST(QT4_INCLUDES)
+       AC_SUBST(QT4_CORE_INCLUDES)
        AC_SUBST(QT4_LDFLAGS)
+       AC_SUBST(QT4_CORE_LDFLAGS)
 
        QT4_CHECK_COMPILE
 
        QT4_LIB=$qt4_cv_libname;
        AC_SUBST(QT4_LIB)
+       AC_SUBST(QT4_CORE_LIB)
 
        if test -n "$qt4_cv_libname"; then
                QT4_GET_VERSION