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

clean up some SConsscript silliness and explicitly include libintl when SYSLIBS=1 is in effect (though to be honest, this is odd for Linux, since the libintl should be provided by glibc) 

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@13207 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-10-04 20:19:59 +00:00
parent ed9210b236
commit c7c11d2532
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SConstruct
View File

@ -245,8 +245,7 @@ def i18n (buildenv, sources, installenv):
# on glibc systems, libintl is part of libc. not true on OS X
#
if re.search ("darwin[0-9]", config[config_kernel]):
buildenv.Merge ([ libraries['intl'] ])
buildenv.Merge ([ libraries['intl'] ])
installenv.Alias ('potupdate', buildenv.PotBuild (potfile, sources))
@ -907,11 +906,9 @@ def prep_libcheck(topenv, libinfo):
# things need to build with this in mind
#
GTKROOT = os.path.expanduser ('~/gtk/inst')
libinfo.Append(CPPPATH= GTKROOT + "/include", LIBPATH= GTKROOT + "/lib")
libinfo.Append(CXXFLAGS="-I" + GTKROOT + "/include", LINKFLAGS="-L" + GTKROOT + "/lib")
ARDOURDEP_ROOT = os.path.expanduser ('~/a3/inst')
libinfo.Append(CPPPATH= ARDOURDEP_ROOT + "/include", LIBPATH= ARDOURDEP_ROOT + "/lib")
libinfo.Append(CXXFLAGS="-I" + ARDOURDEP_ROOT + "/include", LINKFLAGS="-L" + ARDOURDEP_ROOT + "/lib")
libinfo.Append(CPPPATH= GTKROOT + "/include", LINKFLAGS= "-L" + GTKROOT + "/lib")
libinfo.Append(CPPPATH= ARDOURDEP_ROOT + "/include", LINKFLAGS= "-L" + ARDOURDEP_ROOT + "/lib")
prep_libcheck(env, env)
@ -1326,8 +1323,9 @@ if env['NLS']:
if env['NLS'] == 0:
print nls_error
else:
if config[config_arch] == 'apple':
if env['SYSLIBS'] or config[config_arch] == 'apple':
libraries['intl'] = LibraryInfo (LIBS='intl')
print 'Libintl will be explicitly included'
else:
libraries['intl'] = LibraryInfo ()
print "International version will be built."