From d521bfd735a1ed168b784e407ca211422cc47a95 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 1 Mar 2004 14:50:29 +0000 Subject: [PATCH] openbsd fixes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@8469 a592a061-630c-0410-9148-cb99ea01b6c8 --- boost/ChangeLog | 4 ++++ boost/boost/config/platform/bsd.hpp | 4 +++- config/ChangeLog | 5 +++++ config/qt.m4 | 12 ++++++++---- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/boost/ChangeLog b/boost/ChangeLog index 24b24617e0..3067093c7e 100644 --- a/boost/ChangeLog +++ b/boost/ChangeLog @@ -1,3 +1,7 @@ +2004-03-01 Zvezdan Petkovic + + * boost/config/platform/bsd.hpp: config fix for OpenBSD + 2004-02-03 Angus Leeming * boost/detail/limits.hpp: add support for Itanium machines. diff --git a/boost/boost/config/platform/bsd.hpp b/boost/boost/config/platform/bsd.hpp index 0af5364f52..6053d7a2c4 100644 --- a/boost/boost/config/platform/bsd.hpp +++ b/boost/boost/config/platform/bsd.hpp @@ -44,7 +44,9 @@ // // The BSD has macros only, no functions: // -#define BOOST_NO_CTYPE_FUNCTIONS +#if !defined(__OpenBSD__) +# define BOOST_NO_CTYPE_FUNCTIONS +#endif // // thread API's not auto detected: diff --git a/config/ChangeLog b/config/ChangeLog index 2e89e0d9c8..7e7557a9c8 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2004-03-01 Zvezdan Petkovic + + * qt.m4 (QT_DO_IT_ALL): if the variables MOC or UIC are set, honor + their value + 2004-02-19 Jean-Marc Lasgouttes * configure.in (VERSION): diff --git a/config/qt.m4 b/config/qt.m4 index e8ef8aefbb..ed551ea617 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