CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/04/20 08:16:46
Modified files:
stepmake : aclocal.m4
. : configure.in SConstruct ChangeLog
Log message:
(no gui_b): Remove optional gtk+ requirement.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/aclocal.m4.diff?tr1=1.139&tr2=1.140&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/configure.in.diff?tr1=1.147&tr2=1.148&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/SConstruct.diff?tr1=1.77&tr2=1.78&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3482&tr2=1.3483&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3482 lilypond/ChangeLog:1.3483
--- lilypond/ChangeLog:1.3482 Tue Apr 19 22:47:17 2005
+++ lilypond/ChangeLog Wed Apr 20 08:16:46 2005
@@ -1,3 +1,7 @@
+2005-04-20 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * configure.in (no gui_b): Remove optional gtk+ requirement.
+
2005-04-20 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/dynamic-engraver.cc (process_music): set right bound to
Index: lilypond/SConstruct
diff -u lilypond/SConstruct:1.77 lilypond/SConstruct:1.78
--- lilypond/SConstruct:1.77 Mon Apr 18 21:31:24 2005
+++ lilypond/SConstruct Wed Apr 20 08:16:45 2005
@@ -318,14 +318,14 @@
print f
return test_version (lst, program, minimal, description,
package)
- def test_lib (lst, program, minimal, description):
+ def test_lib (lst, program, minimal, description, package):
# FIXME: test for Debian or RPM (or -foo?) based dists
# to guess (or get correct!: apt-cache search?)
# package name.
#if os.system ('pkg-config --atleast-version=0 freetype2'):
# barf
if test_version (lst, program, minimal, description,
- 'lib%(program)s-dev or %(program)s-devel'
+ 'lib%(package)s-dev or %(package)s-devel'
% vars ()):
env.ParseConfig ('pkg-config --cflags --libs
%(program)s'
% vars ())
@@ -339,9 +339,11 @@
test_program (required, 'guile-config', '1.6', 'GUILE development',
'libguile-dev or guile-devel')
test_program (required, 'mf', '0.0', 'Metafont', 'tetex-bin')
- test_program (required, 'mftrace', '1.1.6', 'mftrace
(http://xs4all.nl/~hanwen/mftrace)', 'mftrace')
+ test_program (required, 'mftrace', '1.1.6',
+ 'mftrace (http://xs4all.nl/~hanwen/mftrace)', 'mftrace')
test_program (required, 'potrace', '0.0', 'Potrace', 'potrace')
- test_program (required, 'python', '2.1', 'Python (www.python.org)',
'python')
+ test_program (required, 'python', '2.1', 'Python (www.python.org)',
+ 'python')
test_program (required, 'sh', '0.0', 'Bourne shell', 'sh')
optional = []
@@ -350,10 +352,14 @@
test_program (optional, 'bison', '1.25', 'Bison -- parser generator',
'bison')
test_program (optional, 'dvips', '0.0', 'Dvips', 'tetex-bin')
- test_program (optional, 'fontforge', '0.0.20041224', 'FontForge',
'fontforge')
- test_program (optional, 'flex', '0.0', 'Flex -- lexer generator',
'flex')
+ test_program (optional, 'fontforge', '0.0.20041224', 'FontForge',
+ 'fontforge')
+ test_program (optional, 'flex', '0.0', 'Flex -- lexer generator',
+ 'flex')
test_program (optional, 'guile', '1.6', 'GUILE scheme', 'guile')
- test_program (optional, 'gs', '8.14', 'Ghostscript PostScript
interpreter', 'gs or gs-afpl or gs-esp or gs-gpl')
+ test_program (optional, 'gs', '8.14',
+ 'Ghostscript PostScript interpreter',
+ 'gs or gs-afpl or gs-esp or gs-gpl')
test_program (optional, 'mftrace', '1.1.0', 'Metafont tracing Type1',
'mftrace')
test_program (optional, 'makeinfo', '4.7', 'Makeinfo tool', 'texinfo')
@@ -483,24 +489,26 @@
test_program (required, 'pkg-config', '0.9.0',
'pkg-config library compile manager', 'pkg-config')
if test_lib (required, 'freetype2', '0.0',
- 'Development files for FreeType 2 font engine'):
+ 'Development files for FreeType 2 font engine',
+ 'freetype6'):
conf.env['DEFINES']['HAVE_FREETYPE2'] = '1'
if test_lib (required, 'pangoft2', '1.6.0',
- 'Development files for pango, with fontconfig2'):
+ 'Development files for pango, with FreeType2',
+ 'pango1.0'):
conf.env['DEFINES']['HAVE_PANGO_FT2'] = '1'
conf.env['DEFINES']['HAVE_PANGO16'] = '1'
if test_lib (optional, 'fontconfig', '2.2.0',
- 'Development files for fontconfig'):
+ 'Development files for fontconfig', 'fontconfig1'):
conf.env['DEFINES']['HAVE_FONTCONFIG'] = '1'
#this could happen only for compiling pango-*
if env['gui']:
test_lib (required, 'gtk+-2.0', '2.4.0',
- 'Development files for GTK+')
+ 'Development files for GTK+', 'gtk2.0')
if test_lib (required, 'pango', '1.6.0',
- 'Development files for pango'):
+ 'Development files for pango', 'pango1.0'):
conf.env['DEFINES']['HAVE_PANGO16'] = '1'
if conf.CheckCHeader ('pango/pangofc-fontmap.h'):
@@ -579,11 +587,16 @@
sys.stdout.write ('\n')
sys.stdout.write ('\n')
sys.stdout.write ('Examples:')
+ sys.stdout.write ('\n')
sys.stdout.write (' scons lily # build lilypond')
+ sys.stdout.write ('\n')
sys.stdout.write (' scons all # build everything')
+ sys.stdout.write ('\n')
sys.stdout.write (' scons doc # build documentation')
+ sys.stdout.write ('\n')
## TODO
## sys.stdout.write (' scons prefix=/usr DESTDIR=/tmp/pkg
all install')
+ ## sys.stdout.write ('\n')
Exit (0)
elif not env['checksums']:
# When using timestams, config.hh is NEW. The next
Index: lilypond/configure.in
diff -u lilypond/configure.in:1.147 lilypond/configure.in:1.148
--- lilypond/configure.in:1.147 Sun Apr 17 09:38:04 2005
+++ lilypond/configure.in Wed Apr 20 08:16:45 2005
@@ -72,9 +72,7 @@
STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0)
if test "$gui_b" = "yes"; then
STEPMAKE_GTK2(gtk+-2.0, REQUIRED, 2.4.0)
-else
- STEPMAKE_GTK2(gtk+-2.0, OPTIONAL, 2.4.0)
-fi
+fi # $gui_b
STEPMAKE_FREETYPE2(freetype2, REQUIRED, 0)
#STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
Index: lilypond/stepmake/aclocal.m4
diff -u lilypond/stepmake/aclocal.m4:1.139 lilypond/stepmake/aclocal.m4:1.140
--- lilypond/stepmake/aclocal.m4:1.139 Mon Apr 18 21:43:03 2005
+++ lilypond/stepmake/aclocal.m4 Wed Apr 20 08:16:45 2005
@@ -1083,7 +1083,9 @@
AC_SUBST(FREETYPE2_CFLAGS)
AC_SUBST(FREETYPE2_LIBS)
else
- r="lib$1-dev or $1-devel"
+ # UGR
+ #r="lib$1-dev or $1-devel"
+ r="libfreetype6-dev or freetype?-devel"
ver="$(pkg-config --modversion $1)"
STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
fi
@@ -1098,7 +1100,7 @@
else
# UGR
# r="lib$1-dev or $1-devel"
- r="libgtk+2.0-dev or gtk2-devel"
+ r="libgtk2.0-dev or gtk2-devel"
ver="$(pkg-config --modversion $1)"
STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
fi
@@ -1148,8 +1150,8 @@
LIBS="$save_LIBS"
else
# UGR
- #r="lib$1-dev or $1-devel"
- r="libpango1.0-dev or pango1.0-devel"
+ #r="lib$1-dev or $1-devel"e
+ r="libpango1.0-dev or pango?-devel"
ver="$(pkg-config --modversion $1)"
STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
fi
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
