diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-02 00:38:44 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-02 00:38:44 +0000 |
| commit | 6a0d6ae92d6ce61be83e9844f0573c73fd334494 (patch) | |
| tree | 2a3b9e09a3a99862c198d85add5cc696e1a4abf6 | |
| parent | cb6b3d30e6cfd115b26070db5174f3ee7e0495af (diff) | |
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
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 33c9284544..0c37fcd579 100644 --- a/SConstruct +++ b/SConstruct @@ -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() |