diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-10-05 08:53:18 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-10-05 08:53:18 +0000 |
| commit | 1a9d9b058c74c6e73da85ee90334a087844a36b2 (patch) | |
| tree | 3283c91f5377c5a2eace554ab33e87acc4316fdd /wscript | |
| parent | 5ee968d66be70aa75be2aea60fc0753c584ce473 (diff) | |
Fix wscript when PKG_CONFIG_PATH is empty.
git-svn-id: svn://localhost/ardour2/branches/3.0@13210 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -471,7 +471,8 @@ def configure(conf): # where we need to pick it up from the GTK dependency stack. # 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 prefinclude = ''.join ([ '-I', user_gtk_root + '/include']) 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') 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 prefinclude = ''.join ([ '-I', user_ardour_root + '/include']) preflib = ''.join ([ '-L', user_ardour_root + '/lib']) |