Audit all the LASSERT calls, and try to do something sensible at

[lyx.git] / config / qt4.m4

diff --git a/config/qt4.m4 b/config/qt4.m4
index 2fd66b450397898b8631660bb23b1b038aa1e1e2..2ac6d70f7d9c1e526f351349d22bea83bab1617f 100644 (file)
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -52,9 +52,7 @@ AC_DEFUN([QT4_CHECK_COMPILE],
 
        if test -z "$qt4_cv_libname"; then
                AC_MSG_RESULT([failed])
-               if test "$FATAL" = 1 ; then
-                       AC_MSG_ERROR([Cannot compile a simple Qt 4 executable. Check you have the right \$QT4DIR !])
-               fi
+               AC_MSG_ERROR([cannot compile a simple Qt 4 executable. Check you have the right \$QT4DIR.])
        else
                AC_MSG_RESULT([$qt4_cv_libname])
        fi
@@ -92,10 +90,6 @@ AC_DEFUN([QT4_DO_IT_ALL],
        dnl this variable is precious
        AC_ARG_VAR(QT4DIR, [the place where the Qt 4 files are, e.g. /usr/lib/qt4])
 
-       dnl Please leave this alone. I use this file in
-       dnl oprofile.
-       FATAL=0
-
        AC_ARG_WITH(qt4-dir, [AC_HELP_STRING([--with-qt4-dir], [where the root of Qt 4 is installed])],
                [ qt4_cv_dir=`eval echo "$withval"/` ])
 
@@ -141,15 +135,27 @@ AC_DEFUN([QT4_DO_IT_ALL],
                QT4_DO_MANUAL_CONFIG
        fi
 
+       if test -z "$QT4_LIB"; then
+         AC_MSG_ERROR([cannot find qt4 library.])
+       fi
+
        dnl Check qt version
-       AS_VERSION_COMPARE($QT4_VERSION, $1, 
-       [LYX_ERROR([LyX requires version $1 of Qt. Only version $QT4_VERSION has been found.])
+       AS_VERSION_COMPARE($QT4_VERSION, $1,
+       [AC_MSG_ERROR([LyX requires at least version $1 of Qt. Only version $QT4_VERSION has been found.])
        ])
 
        AC_PATH_PROGS(MOC4, [moc-qt4 moc],[],$qt4_cv_bin:$PATH)
+       if test -z "$MOC4"; then
+         AC_MSG_ERROR([cannot find moc binary.])
+       fi
        AC_PATH_PROGS(UIC4, [uic-qt4 uic],[],$qt4_cv_bin:$PATH)
+       if test -z "$UIC4"; then
+         AC_MSG_ERROR([cannot find uic binary.])
+       fi
        AC_PATH_PROGS(RCC4, [rcc-qt4 rcc],[],$qt4_cv_bin:$PATH)
-       AC_CHECK_PROG(bc_found,[bc],[yes],[no],$PATH)
+       if test -z "$RCC4"; then
+         AC_MSG_ERROR([cannot find rcc binary.])
+       fi
 ])
 
 AC_DEFUN([QT4_DO_PKG_CONFIG],
@@ -193,7 +199,7 @@ AC_DEFUN([QT4_DO_MANUAL_CONFIG],
        case $have_x in
            yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
                 CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
-            no) LYX_ERROR([Cannot find X window libraries and/or headers.]);;
+            no) AC_MSG_ERROR([cannot find X window libraries and/or headers.]);;
        disable) ;;
        esac