IJMPC/D: update layout and template files

[lyx.git] / config / qt4.m4

diff --git a/config/qt4.m4 b/config/qt4.m4
index be2a21ebf92fec80c5472454d90e624e6b3fcef6..5cbf7f753835d241b0c5b68d1c528fe6538ed411 100644 (file)
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -142,6 +142,7 @@ AC_DEFUN([QT4_DO_IT_ALL],
        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_CHECK_PROG(bc_found,[bc],[yes],[no],$PATH)
 ])
 
 AC_DEFUN([QT4_DO_PKG_CONFIG],
@@ -201,10 +202,18 @@ AC_DEFUN([QT4_DO_MANUAL_CONFIG],
                done
                QT4_CORE_INCLUDES="-I$qt4_cv_includes -I$qt4_cv_includes/QtCore"
        fi
-       if test -n "$qt4_cv_libraries"; then
+       case "$qt4_cv_libraries" in
+       *framework*)
+               QT4_LDFLAGS="-F$qt4_cv_libraries"
+               QT4_CORE_LDFLAGS="-F$qt4_cv_libraries"
+               ;;
+       "")
+               ;;
+       *)
                QT4_LDFLAGS="-L$qt4_cv_libraries"
                QT4_CORE_LDFLAGS="-L$qt4_cv_libraries"
-       fi
+               ;;
+       esac
        AC_SUBST(QT4_INCLUDES)
        AC_SUBST(QT4_CORE_INCLUDES)
        AC_SUBST(QT4_LDFLAGS)