diff options
| author | Björn Baumbach <bb@sernet.de> | 2015-07-27 12:14:37 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2015-08-04 07:27:23 +0200 |
| commit | ab824a3b978663d85aaf585b4441ff6cc82e510a (patch) | |
| tree | 722ce3d2945cb461785fba07ed9a616336200271 | |
| parent | eb55fd0841a5fdc58364d628930113edc90ca5b6 (diff) | |
| download | samba-ab824a3b978663d85aaf585b4441ff6cc82e510a.tar.gz | |
configure: add --with-gpfs option for selecting directory with gpfs headers
Fix for bug #11421 part 1.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11421
Signed-off-by: Björn Baumbach <bb@sernet.de>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
(cherry picked from commit b9bef361d95daf0f38363acbdec9c23f094ffaca)
| -rw-r--r-- | lib/util/wscript | 4 | ||||
| -rw-r--r-- | lib/util/wscript_configure | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/util/wscript b/lib/util/wscript index 26b5564babc..953becf6563 100644 --- a/lib/util/wscript +++ b/lib/util/wscript @@ -17,3 +17,7 @@ def set_options(opt): opt.add_option('--without-lttng', help=("Disable lttng integration"), action='store_false', dest='enable_lttng') + + opt.add_option('--with-gpfs', + help=("Directory under which gpfs headers are installed"), + action="store", dest='gpfs_headers_dir', default="/usr/lpp/mmfs/include/") diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure index 95a89493d9a..e7bcbd6bffa 100644 --- a/lib/util/wscript_configure +++ b/lib/util/wscript_configure @@ -135,6 +135,6 @@ else: conf.SET_TARGET_TYPE('lttng-ust', 'EMPTY') conf.undefine('HAVE_LTTNG_TRACEF') -conf.env['CPPPATH_GPFS'] = '/usr/lpp/mmfs/include/' +conf.env['CPPPATH_GPFS'] = Options.options.gpfs_headers_dir if conf.CHECK_HEADERS('gpfs.h', False, False, "gpfs"): conf.DEFINE('HAVE_GPFS', '1') |