LADI
/
ardour
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not explicitly link against libintl unless evidence of an independent build stack is found (which is the presence of ~/gtk/inst) 

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@13584 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-12-02 00:38:44 +00:00
parent cb6b3d30e6
commit 6a0d6ae92d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SConstruct
View File

@ -909,7 +909,10 @@ def prep_libcheck(topenv, libinfo):
ARDOURDEP_ROOT = os.path.expanduser ('~/a3/inst')
libinfo.Append(CPPPATH= [ GTKROOT + "/include" ], LINKFLAGS= "-L" + GTKROOT + "/lib")
libinfo.Append(CPPPATH= [ ARDOURDEP_ROOT + "/include" ] , LINKFLAGS= "-L" + ARDOURDEP_ROOT + "/lib")
topenv['NEED_LIBINTL'] = True
else:
topenv['NEED_LIBINTL'] = False
prep_libcheck(env, env)
@ -1323,11 +1326,12 @@ if env['NLS']:
if env['NLS'] == 0:
print nls_error
else:
if env['SYSLIBS'] or config[config_arch] == 'apple':
if env['NEED_LIBINTL'] or config[config_arch] == 'apple':
libraries['intl'] = LibraryInfo (LIBS='intl')
print 'Libintl will be explicitly included'
else:
libraries['intl'] = LibraryInfo ()
print 'Libintl will be assumed to be part of the C library'
print "International version will be built."
env = conf.Finish()