More attempts to fix various debian builds.

diff --git a/src/wx/wscript b/src/wx/wscript
index 20e2e7c43640814bae85b1582577c35ab2c42e2e..de256bf60a90609c5be2b55219fdc1fafd8ff398 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -63,7 +63,7 @@ def configure(conf):
         conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_richtext-3.0', 'wx_gtk2u_xrc-3.0', 'wx_gtk2u_qa-3.0', 'wx_baseu_net-3.0', 'wx_gtk2u_html-3.0',
                                     'wx_gtk2u_adv-3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0']
         conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat']
-        if conf.env.TARGET_DEBIAN:
+        if conf.env.TARGET_DEBIAN and conf.env.DEBIAN_UNSTABLE:
             conf.env.LIB_WXWIDGETS.append('Xxf86vm')
             conf.env.LIB_WXWIDGETS.append('Xext')
             conf.env.LIB_WXWIDGETS.append('X11')

diff --git a/wscript b/wscript
index 3535438150aae6018e3b5b58c448bac65282562d..92250a50c0645f74c99a3a219e5e97e49db2fe47 100644 (file)
--- a/wscript
+++ b/wscript
@@ -13,6 +13,7 @@ def options(opt):
     opt.add_option('--disable-gui',       action='store_true', default=False, help='disable building of GUI tools')
     opt.add_option('--target-windows',    action='store_true', default=False, help='set up to do a cross-compile to make a Windows package')
     opt.add_option('--target-debian',     action='store_true', default=False, help='set up to compile for a Debian/Ubuntu package')
+    opt.add_option('--debian-unstable',   action='store_true', default=False, help='add extra libraries to static-build correctly on Debian unstable')
     opt.add_option('--target-centos',     action='store_true', default=False, help='set up to compile for a Centos package')
     opt.add_option('--magickpp-config',   action='store',      default='Magick++-config', help='path to Magick++-config')
     opt.add_option('--wx-config',         action='store',      default='wx-config', help='path to wx-config')
@@ -163,6 +164,7 @@ def configure(conf):
     conf.env.TARGET_WINDOWS = conf.options.target_windows
     conf.env.DISABLE_GUI = conf.options.disable_gui
     conf.env.TARGET_DEBIAN = conf.options.target_debian
+    conf.env.DEBIAN_UNSTABLE = conf.options.debian_unstable
     conf.env.TARGET_CENTOS = conf.options.target_centos
     conf.env.VERSION = VERSION
     conf.env.TARGET_OSX = sys.platform == 'darwin'