openbsd fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8470 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2004-03-01 15:18:28 +00:00
parent dd30647314
commit 672f874f40
2 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2004-03-01 Zvezdan Petkovic <zvezdan@cs.wm.edu>
* qt.m4 (QT_DO_IT_ALL): if the variables MOC or UIC are set, honor
their value
2003-09-16 Lars Gullik Bjønnes <larsbj@gullik.net>
* lyxinclude.m4 (LYX_CXX_STL_STRING): remove

View File

@ -199,11 +199,15 @@ AC_DEFUN(QT_DO_IT_ALL,
AC_SUBST(QT_INCLUDES)
AC_SUBST(QT_LDFLAGS)
QT_FIND_MOC
MOC=$ac_moc
if test -z "$MOC"; then
QT_FIND_MOC
MOC=$ac_moc
fi
AC_SUBST(MOC)
QT_FIND_UIC
UIC=$ac_uic
if test -z "$UIC"; then
QT_FIND_UIC
UIC=$ac_uic
fi
AC_SUBST(UIC)
QT_CHECK_COMPILE