diff options
| author | Daniel Burrows <dburrows@debian.org> | 2010-04-26 09:25:44 -0700 |
|---|---|---|
| committer | Daniel Burrows <dburrows@debian.org> | 2010-04-26 09:25:44 -0700 |
| commit | ceadee20bbdd1067fa21932cd3ae2b9fda7b9415 (patch) | |
| tree | 4318d05fec56c2c80c9d51457cb4d96204fff668 /site_scons | |
| parent | b2ecbb1aa13b8d98d9cbdcd10c81f03104276c35 (diff) | |
| download | aptitude-ceadee20bbdd1067fa21932cd3ae2b9fda7b9415.tar.gz | |
Split the tests for gettext utilities from the tests for libraries.
We should be able to build a gettext-enabled aptitude without the
utilities for processing pofiles, and we should be able to process
pofiles without being able to build gettext support.
Diffstat (limited to 'site_scons')
| -rw-r--r-- | site_scons/aptitude_configure.py | 1 | ||||
| -rw-r--r-- | site_scons/aptitude_configure_checks.py | 15 |
2 files changed, 13 insertions, 3 deletions
diff --git a/site_scons/aptitude_configure.py b/site_scons/aptitude_configure.py index 6a2ef0cb..d28150e2 100644 --- a/site_scons/aptitude_configure.py +++ b/site_scons/aptitude_configure.py @@ -88,6 +88,7 @@ all executable targets need.""" conf.CheckForXsltproc() conf.CheckForPo4A() + aptitude_configure_checks.FindGettextTools(conf) aptitude_configure_checks.FindGettext(conf) conf.Define('SIGC_VERSION', diff --git a/site_scons/aptitude_configure_checks.py b/site_scons/aptitude_configure_checks.py index adf935cb..a5327f51 100644 --- a/site_scons/aptitude_configure_checks.py +++ b/site_scons/aptitude_configure_checks.py @@ -417,18 +417,27 @@ int main(int argc, char **argv) return False -def FindGettext(configure): - """Look for gettext-related utilities.""" +def FindGettextTools(configure): + """Look for utilities needed to process pofiles.""" result = True - result = configure.CheckForLibintlInLibc() and result result = configure.CheckForMsgfmt() and result result = configure.CheckForXgettext() and result result = configure.CheckForMsgmerge() and result result = configure.CheckForMsginit() and result result = configure.CheckForMsgconv() and result result = configure.CheckForMsgfilter() and result + + configure.env['HAVE_GETTEXT_UTILS'] = result + return result + +def FindGettext(configure): + """Look for gettext-related functions.""" + + result = True + + result = configure.CheckForLibintlInLibc() and result result = configure.CheckHeader('libintl.h') and result result = configure.CheckHeader('locale.h') and result |