The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

Remove obsolete compile time option

These changes was commited to the Birdfont repository Sun, 18 Feb 2018 12:02:28 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
author Johan Mattsson <johan.mattsson.m@gmail.com>
Sun, 18 Feb 2018 12:02:28 +0000 (13:02 +0100)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Sun, 18 Feb 2018 12:02:28 +0000 (13:02 +0100)
commit 9f3d1b53a9ada3b5216b202eea28b2013703fdf6
tree f677b35f649d89c6b5e25af37a1a9e0616af03d8
parent dd36576478e63fe9ede9c0cfde5ad4dc73814875
Remove obsolete compile time option

configure
scripts/configfile.py
--- a/configure +++ b/configure @@ -65,34 +65,25 @@ print (OKGREEN + 'Using posix profile.' + ENDC) return 'True' - def configure(gtk, libbgee, valac, pkg_config): + def configure(libbgee, valac, pkg_config): global gee if not test_program_version(valac, 0, 16, 0): print (FAIL + 'valac is too old.' + ENDC) exit (1) - if gtk: - libs = [ - 'cairo', - 'gdk-pixbuf-2.0', - 'gio-2.0', - 'glib-2.0', - 'gtk+-3.0', - 'webkit2gtk-4.0', - 'libsoup-2.4', - 'libnotify', - 'sqlite3', - 'xmlbird' - ] - else: - libs = [ - 'gio-2.0', - 'glib-2.0', - 'sqlite3', - 'fontconfig', - 'xmlbird' - ] + libs = [ + 'cairo', + 'gdk-pixbuf-2.0', + 'gio-2.0', + 'glib-2.0', + 'gtk+-3.0', + 'webkit2gtk-4.0', + 'libsoup-2.4', + 'libnotify', + 'sqlite3', + 'xmlbird' + ] test_library_version(pkg_config, 'xmlbird', True, '1.2.0') @@ -124,7 +115,6 @@ parser.add_option('-p', '--prefix', dest='prefix', help='Install prefix', metavar='PREFIX') parser.add_option('-d', '--dest', dest='dest', help='Install to this directory', metavar='DEST') parser.add_option('-c', '--cc', dest='cc', help='C compiler', metavar='CC') - parser.add_option('-g', '--gtk', dest='gtk', help='Build Gtk version, default is True', metavar='GTK') parser.add_option('-e', '--gee', dest='gee', help='Version of libgee', metavar='GEE') parser.add_option('-v', '--valac', dest='valac', help='Vala compiler', metavar='VALAC') parser.add_option('-P', '--pkg-config', dest='pkg_config', help='Package config tool', metavar='PKG_CONFIG') @@ -172,10 +162,6 @@ options.dest = '' if not options.cc: options.cc = 'gcc' - if not options.gtk: - options.gtk = True - if options.gtk == 'False': - options.gtk = False if not options.gee: options.gee = 'Any' if not options.valac: @@ -187,7 +173,7 @@ else: options.nonnull = True - configure(options.gtk, options.gee, options.valac, options.pkg_config) + configure(options.gee, options.valac, options.pkg_config) configfile.write_config(options.prefix) configfile.write_compile_parameters(options.prefix, @@ -199,6 +185,5 @@ options.nonnull, valacflags, cflags, - ldflags, - options.gtk) + ldflags)
--- a/scripts/configfile.py +++ b/scripts/configfile.py @@ -38,7 +38,7 @@ f.write("}") def write_compile_parameters(prefix, dest, cc, gee, valac, pkg_config, - non_null, valacflags, cflags, ldflags, gtk): + non_null, valacflags, cflags, ldflags): settings = { 'prefix': prefix, 'dest': dest, @@ -61,11 +61,9 @@ f.write("#!/usr/bin/python3\n") for k, v in settings.items(): f.write("%s = %s\n" % (k.upper().replace('-', '_'), autoquote(v))) - - f.write("GTK = " + str(gtk) + "\n") f.write("SETTINGS = {\n") for k, v in settings.items(): f.write(' "%s": %s,\n' % (k, autoquote(v))) f.write("}\n")