reverse logic used to decide whether or not to explicitly link against libintl, which should not happen on a linux system where glibc includes the libintl API
git-svn-id: svn://localhost/ardour2/branches/3.0@13973 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
2fee2bc60c
commit
9d29fb8e0a
32
wscript
32
wscript
|
@ -8,7 +8,7 @@ import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
# Variables for 'waf dist'
|
# Variables for 'waf dist'
|
||||||
VERSION = '3.0rc1'
|
VERSION = '3.0rc2'
|
||||||
APPNAME = 'Ardour3'
|
APPNAME = 'Ardour3'
|
||||||
|
|
||||||
# Mandatory variables
|
# Mandatory variables
|
||||||
|
@ -483,18 +483,28 @@ def configure(conf):
|
||||||
#
|
#
|
||||||
user_gtk_root = os.path.expanduser ('~/gtk/inst')
|
user_gtk_root = os.path.expanduser ('~/gtk/inst')
|
||||||
pkg_config_path = os.getenv('PKG_CONFIG_PATH')
|
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):
|
if os.path.isfile ('/usr/include/libintl.h'):
|
||||||
# XXXX hack hack hack
|
# libintl is part of the system., so use it
|
||||||
prefinclude = ''.join ([ '-I', user_gtk_root + '/include'])
|
autowaf.display_msg(conf, 'Will reply on libintl built into libc', 'yes')
|
||||||
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:
|
else:
|
||||||
autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ', 'no')
|
if (pkg_config_path is not None):
|
||||||
|
# told to search for pkgconfig files
|
||||||
|
if pkg_config_path.find (user_gtk_root) >= 0:
|
||||||
|
# told to search user_gtk_root
|
||||||
|
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:
|
||||||
|
print ('\n\n**** Cannot locate libintl.h and PKG_CONFIG_PATH does not include ', user_gtk_root, '- this needs fixing before the build can continue')
|
||||||
|
sys.exit (-1)
|
||||||
|
else:
|
||||||
|
print ('\n\n**** Cannot locate libintl.h and PKG_CONFIG_PATH is not set - this needs fixing before the build can continue')
|
||||||
|
|
||||||
|
|
||||||
user_ardour_root = os.path.expanduser ('~/a3/inst')
|
user_ardour_root = os.path.expanduser ('~/a3/inst')
|
||||||
if pkg_config_path is not None and 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
|
||||||
|
|
Loading…
Reference in New Issue
Block a user