LU-13902 config: add test for /usr/include/libiberty/

The Makefile currently assumes that -I/usr/include/libiberty
is only needed on UBUNTU.  But UBUNTU is only evaludate if
modules are being built (it is based on the base kernel found).
So with --disable-modules, -I/usr/include/liberty is never
selected.

There is no need for this indirection.  It is easy to check if
/usr/inclue/libiberty exists, and to use if it if does.
So do that.

Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I6fb482256df3c7ce537dd4d451a9da27b8d8d3ea
Reviewed-on: https://review.whamcloud.com/39749
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index a4abb21..ad23218 100644 (file)
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -440,6 +440,7 @@ AM_CONDITIONAL([RHEL], [test -f /etc/redhat-release])
 AM_CONDITIONAL([SUSE], [test -f /etc/SUSE-brand -o -f /etc/SuSE-release])
 AM_CONDITIONAL([UBUNTU], [test x$UBUNTU_KERNEL = xyes])
 AM_CONDITIONAL([BUILD_LUTF], [test x$enable_lutf = xyes])
+AM_CONDITIONAL([LIBIBERTY_SUBDIR], [test -d /usr/include/libiberty])
 
 LN_CONDITIONALS
 LC_CONDITIONALS

diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index ecc1d25..c642e16 100644 (file)
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -116,7 +116,7 @@ check_fallocate_LDADD = $(LIBLUSTREAPI)
 if LIBAIO
 aiocp_LDADD= -laio
 endif
-if UBUNTU
+if LIBIBERTY_SUBDIR
 statx_CPPFLAGS := -I/usr/include/libiberty
 endif
 statx_LDADD = $(SELINUX) -liberty