From 418b9c936da1fa2a0a69b8272b6766c6c5d27636 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Sun, 2 Jul 2006 17:35:14 +0000 Subject: [PATCH] Scons: check the validity of QTDIR, and the existence of uic and moc git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14293 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/scons/SConstruct | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index d843a15c89..836a5ea815 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -542,8 +542,11 @@ if env.has_key('qt_dir') and env['qt_dir']: env.AppendUnique(LIBPATH = [os.path.join(env['qt_dir'], 'lib')]) # set environment so that moc etc can be found even if its path is not set properly env.PrependENVPath('PATH', os.path.join(env['qt_dir'], 'bin')) -else: +elif os.path.isdir(os.environ.get('QTDIR', '/usr/lib/qt-3.3')): env['QTDIR'] = os.environ.get('QTDIR', '/usr/lib/qt-3.3') +else: + # QTDIR is not always used so no warning is issued. + env['QTDIR'] = 'QTDIR_is_not_defined' if env.has_key('qt_lib_path') and env['qt_lib_path']: qt_lib_path = env.subst('$qt_lib_path') @@ -781,6 +784,13 @@ if not fast_start: else: env['MSGFMT'] = env_cache['MSGFMT'] +# check uic and moc commands for qt frontends +if not fast_start: + if frontend[:2] == 'qt' and (conf.CheckCommand('uic') == None \ + or conf.CheckCommand('moc') == None): + print 'uic or moc command is not found for frontend', frontend + Exit(1) + # # Customized builders # -- 2.39.2