X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=SConstruct;h=6ec14e2274343aaa9aea12cab07c8a56fa1947be;hb=543171165412bc915d8ea1f308d070c74924b2f1;hp=5df9fd05989864d6084c706bb0b4b1e44cffea90;hpb=fe3687d66d2a768c83fede50ce901c6ef1b4969e;p=lilypond.git

diff --git a/SConstruct b/SConstruct
index 5df9fd0598..6ec14e2274 100644
--- a/SConstruct
+++ b/SConstruct
@@ -134,7 +134,6 @@ config_vars = [
     'LIBS',
     'LINKFLAGS',
     'MF',
-    'MFTRACE',
     'PERL',
     'PYTHON',
     'SH',
@@ -171,10 +170,17 @@ srcdir = Dir ('.').srcnode ().abspath
 #ugh
 sys.path.append (os.path.join (srcdir, 'stepmake', 'bin'))
 
-import packagepython
-
-package = packagepython.Package (srcdir)
-version = packagepython.version_tuple_to_str (package.version)
+try:
+    import packagepython
+    packagepython.Package (srcdir)
+    packagepython.version_tuple_to_str (package.version)
+except:
+    print '*** FIXME: no packagepython.  setting version to 1.0'
+    class Package:
+        name = 'lilypond'
+        release_dir = '.'
+    package = Package
+    version = '1.0'
 
 ENV = { 'PYTHONPATH': '' }
 for key in ['GUILE_LOAD_PATH', 'LD_LIBRARY_PATH', 'PATH', 'PKG_CONFIG_PATH',
@@ -427,8 +433,6 @@ def configure (target, source, env):
     test_program (required, 'guile-config', '1.8', 'GUILE development',
             'libguile-dev or guile-devel')
     test_program (required, 'mf', '0.0', 'Metafont', 'tetex-bin')
-    test_program (required, 'mftrace', '1.1.19',
-              'mftrace (http://xs4all.nl/~hanwen/mftrace)', 'mftrace')
     test_program (required, 'python', '2.1', 'Python (www.python.org)',
               'python')
     # Silly, and breaks with /bin/sh == dash