From 672f874f40cc4704fb949e8b0a99219eb0493162 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 1 Mar 2004 15:18:28 +0000
Subject: [PATCH] openbsd fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8470 a592a061-630c-0410-9148-cb99ea01b6c8
---
 config/ChangeLog |  5 +++++
 config/qt.m4     | 12 ++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/config/ChangeLog b/config/ChangeLog
index 8a469ea1a3..98324b2772 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -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
diff --git a/config/qt.m4 b/config/qt.m4
index 9327c4c432..a1c231a607 100644
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -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