diff options
author | David Robillard <d@drobilla.net> | 2009-04-18 16:15:12 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-04-18 16:15:12 +0000 |
commit | 3ae378a17c21257d7fb15316380898a61fe2cc5d (patch) | |
tree | 37034084829b4a558612d0a8c1e276a56c1538a5 /libs/pbd | |
parent | 588900a09bd10aaeffb3908ac0602503d60acf0e (diff) |
Upgrade to waf 1.5.4.
git-svn-id: svn://localhost/ardour2/branches/3.0@4991 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/pbd')
-rw-r--r-- | libs/pbd/gettext.h | 2 | ||||
-rw-r--r-- | libs/pbd/mountpoint.cc | 2 | ||||
-rw-r--r-- | libs/pbd/wscript | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libs/pbd/gettext.h b/libs/pbd/gettext.h index 339c74ffe7..2645402e95 100644 --- a/libs/pbd/gettext.h +++ b/libs/pbd/gettext.h @@ -20,7 +20,7 @@ #define _LIBGETTEXT_H 1 /* NLS can be disabled through the configure --disable-nls option. */ -#if ENABLE_NLS +#ifdef ENABLE_NLS /* Get declarations of GNU message catalog functions. */ # include <libintl.h> diff --git a/libs/pbd/mountpoint.cc b/libs/pbd/mountpoint.cc index e85a299e0b..cdc4ccea8d 100644 --- a/libs/pbd/mountpoint.cc +++ b/libs/pbd/mountpoint.cc @@ -32,7 +32,7 @@ using std::string; #include "wafconfig.h" #endif -#if HAVE_GETMNTENT +#ifdef HAVE_GETMNTENT #include <mntent.h> struct mntent_sorter { diff --git a/libs/pbd/wscript b/libs/pbd/wscript index 4c69934baf..5e21f8ce7d 100644 --- a/libs/pbd/wscript +++ b/libs/pbd/wscript @@ -91,9 +91,9 @@ def build(bld): obj.uselib = 'GLIBMM SIGCPP XML UUID' obj.vnum = LIBPBD_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - obj.cxxflags = '-DPACKAGE=\\\"libpbd\\\"' + obj.cxxflags = ['-DPACKAGE="libpbd"'] if bld.env['PBD_HAVE_EXECINFO']: - obj.cxxflags += ' -DHAVE_EXECINFO ' + obj.cxxflags += ['-DHAVE_EXECINFO'] def shutdown(): autowaf.shutdown() |