ardour/livetrax
13
0
Fork 0
Code

Fix wscript when PKG_CONFIG_PATH is empty.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13210 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-10-05 08:53:18 +00:00
parent 5ee968d66b
commit 1a9d9b058c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wscript
View File

@ -471,7 +471,8 @@ def configure(conf):
# where we need to pick it up from the GTK dependency stack. # where we need to pick it up from the GTK dependency stack.
# #
user_gtk_root = os.path.expanduser ('~/gtk/inst') 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: pkg_config_path = os.getenv('PKG_CONFIG_PATH')
if not os.path.isfile ('/usr/include/libintl.h') or (pkg_config_path is not None and pkg_config_path.find (user_gtk_root) >= 0):
# XXXX hack hack hack # XXXX hack hack hack
prefinclude = ''.join ([ '-I', user_gtk_root + '/include']) prefinclude = ''.join ([ '-I', user_gtk_root + '/include'])
preflib = ''.join ([ '-L', user_gtk_root + '/lib']) preflib = ''.join ([ '-L', user_gtk_root + '/lib'])
@ -484,7 +485,7 @@ def configure(conf):
autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ', 'no') autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ', 'no')
user_ardour_root = os.path.expanduser ('~/a3/inst') user_ardour_root = os.path.expanduser ('~/a3/inst')
if os.getenv('PKG_CONFIG_PATH').find (user_ardour_root) >= 0: if pkg_config_path is not None and os.getenv('PKG_CONFIG_PATH').find (user_ardour_root) >= 0:
# XXXX hack hack hack # XXXX hack hack hack
prefinclude = ''.join ([ '-I', user_ardour_root + '/include']) prefinclude = ''.join ([ '-I', user_ardour_root + '/include'])
preflib = ''.join ([ '-L', user_ardour_root + '/lib']) preflib = ''.join ([ '-L', user_ardour_root + '/lib'])