diff options
-rw-r--r-- | build-scripts/sugar.modules | 1 | ||||
-rwxr-xr-x | sugar-jhbuild | 38 |
2 files changed, 22 insertions, 17 deletions
diff --git a/build-scripts/sugar.modules b/build-scripts/sugar.modules index e8d36c5..f85657a 100644 --- a/build-scripts/sugar.modules +++ b/build-scripts/sugar.modules @@ -57,6 +57,7 @@ <dep package="gecko-embed"/> <dep package="matchbox-window-manager"/> <dep package="gnome-python-desktop"/> + <dep package="pygoocanvas"/> </dependencies> </autotools> <mozillamodule id="mozilla" autogenargs="--enable-default-toolkit=gtk2 --disable-mailnews --disable-ldap --disable-debug --enable-optimize --disable-tests --enable-crypto --enable-xft --with-system-zlib --disable-freetype2 --enable-application=browser --disable-javaxpcom --enable-extensions=default" cvsroot="mozilla.org" revision="MOZILLA_1_8_BRANCH" projects="xulrunner"> diff --git a/sugar-jhbuild b/sugar-jhbuild index 94c6156..20ff038 100755 --- a/sugar-jhbuild +++ b/sugar-jhbuild @@ -37,29 +37,33 @@ else: if command == 'build': update_jhbuild() +# System dependencies + +skip_modules = [ +'startup-notification', +'libglade', +'gtk+', +'libXrender', +'fontconfig', +'glib', +'gtk-doc', +'libgnomeui', +'libgnomecanvas', +'pyorbit' +] + +if LibDependency('mozilla', 'mozilla-gtkmozembed').check() or \ + LibDependency('xulrunner', 'xulrunner-gtkmozembed').check(): + skip_modules.append('mozilla') + sys.path.append(os.path.join(build_scripts_dir, 'jhbuild')) import jhbuild.config import jhbuild.commands config = configure() -config.skip.append('startup-notification') -config.skip.append('libglade') -config.skip.append('gtk+') -config.skip.append('libXrender') -config.skip.append('fontconfig') -config.skip.append('glib') -config.skip.append('gtk-doc') -config.skip.append('libgnomeui') -config.skip.append('libgnomecanvas') -config.skip.append('pyorbit') - -if LibDependency('libwnck', 'libwnck-1.0').check(): - config.skip.append('libwnck') - -if LibDependency('mozilla', 'mozilla-gtkmozembed').check() or \ - LibDependency('xulrunner', 'xulrunner-gtkmozembed').check(): - config.skip.append('mozilla') +for module in skip_modules: + config.skip.append(module) jhbuild.config.addpath('XDG_DATA_DIRS', '/usr/share') |