diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-10-04 22:21:59 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-10-04 22:21:59 +0000 |
commit | 5ee968d66be70aa75be2aea60fc0753c584ce473 (patch) | |
tree | 021af18a825e7e11b3ae931b951847faac063eaa /wscript | |
parent | d29c5cdfb039ad28488da76ba9952af1be927884 (diff) |
fix up various aspects of building against a private/personal dependency stack
git-svn-id: svn://localhost/ardour2/branches/3.0@13209 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 24 |
1 files changed, 21 insertions, 3 deletions
@@ -470,13 +470,30 @@ def configure(conf): # the library itself is part of glibc, or on a bare-bones build system # where we need to pick it up from the GTK dependency stack. # - if not os.path.isfile ('/usr/include/libintl.h'): + user_gtk_root = os.path.expanduser ('~/gtk/inst') + if not os.path.isfile ('/usr/include/libintl.h') or os.getenv('PKG_CONFIG_PATH').find (user_gtk_root) >= 0: # XXXX hack hack hack - prefinclude = ''.join ([ '-I', os.path.expanduser ('~/gtk/inst/include') ]) - preflib = ''.join ([ '-L', os.path.expanduser ('~/gtk/inst/lib') ]) + prefinclude = ''.join ([ '-I', user_gtk_root + '/include']) + preflib = ''.join ([ '-L', user_gtk_root + '/lib']) conf.env.append_value('CFLAGS', [ prefinclude ]) conf.env.append_value('CXXFLAGS', [prefinclude ]) conf.env.append_value('LINKFLAGS', [ preflib ]) + conf.define ('NEED_INTL', 1) + autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ' + user_gtk_root, 'yes') + else: + autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ', 'no') + + user_ardour_root = os.path.expanduser ('~/a3/inst') + if os.getenv('PKG_CONFIG_PATH').find (user_ardour_root) >= 0: + # XXXX hack hack hack + prefinclude = ''.join ([ '-I', user_ardour_root + '/include']) + preflib = ''.join ([ '-L', user_ardour_root + '/lib']) + conf.env.append_value('CFLAGS', [ prefinclude ]) + conf.env.append_value('CXXFLAGS', [prefinclude ]) + conf.env.append_value('LINKFLAGS', [ preflib ]) + autowaf.display_msg(conf, 'Will build against private Ardour dependency stack in ' + user_ardour_root, 'yes') + else: + autowaf.display_msg(conf, 'Will build against private Ardour dependency stack', 'no') if sys.platform == 'darwin': @@ -685,6 +702,7 @@ const char* const ardour_config_info = "\\n\\ write_config_text('C compiler flags', conf.env['CFLAGS']) write_config_text('C++ compiler flags', conf.env['CXXFLAGS']) + write_config_text('Linker flags', conf.env['LINKFLAGS']) config_text.write ('";\n}\n') config_text.close () |