anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 02:49:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Warn user that build will fail if bc is not installed.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39945 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2011-10-23 15:35:36 +00:00
parent 8a4b25875a
commit 6781444835
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/qt4.m4
View File

@ -142,6 +142,7 @@ AC_DEFUN([QT4_DO_IT_ALL],
AC_PATH_PROGS(MOC4, [moc-qt4 moc],[],$qt4_cv_bin:$PATH) 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(UIC4, [uic-qt4 uic],[],$qt4_cv_bin:$PATH)
AC_PATH_PROGS(RCC4, [rcc-qt4 rcc],[],$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], AC_DEFUN([QT4_DO_PKG_CONFIG],

5
configure.ac
View File

@ -130,7 +130,7 @@ for frontend in $FRONTENDS ; do
FRONTEND_INFO="${FRONTEND_INFO}\ FRONTEND_INFO="${FRONTEND_INFO}\
Qt 4 Frontend:\n\ Qt 4 Frontend:\n\
Qt 4 version:\t\t${QT4_VERSION}\n" Qt 4 version:\t\t${QT4_VERSION}\n"
dnl qt 4 build will fail without moc or uic dnl qt 4 build will fail without moc, uic, or bc
if test -z "$MOC4"; then if test -z "$MOC4"; then
LYX_ERROR([moc 4 binary not found !]) LYX_ERROR([moc 4 binary not found !])
fi fi
@ -140,6 +140,9 @@ dnl qt 4 build will fail without moc or uic
if test -z "$QT4_LIB"; then if test -z "$QT4_LIB"; then
LYX_ERROR([qt 4 library not found !]) LYX_ERROR([qt 4 library not found !])
fi fi
if test "$bc_found" = "no"; then
LYX_ERROR([bc binary not found !])
fi
;; ;;
*) *)
LYX_ERROR(Unknown frontend '$frontend');; LYX_ERROR(Unknown frontend '$frontend');;