From a86d71fe5dce7b25372199afc9a9bfc5631c84e1 Mon Sep 17 00:00:00 2001 From: Stanislav Kholmanskikh Date: Tue, 25 Mar 2014 18:24:29 +0400 Subject: [PATCH] Implemented autoconf check for libtirpc This library is needed to build testcases/network/rpc/rpc-tirpc. Signed-off-by: Stanislav Kholmanskikh --- configure.ac | 1 + include/mk/config.mk.default | 2 ++ include/mk/config.mk.in | 2 ++ m4/ltp-tirpc.m4 | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 m4/ltp-tirpc.m4 diff --git a/configure.ac b/configure.ac index 9f397e7c2..97cb4dadb 100644 --- a/configure.ac +++ b/configure.ac @@ -178,5 +178,6 @@ LTP_CHECK_FCHOWNAT LTP_CHECK_MKNODAT LTP_CHECK_FALLOCATE LTP_CHECK_SYSCALL_FCNTL +LTP_CHECK_TIRPC AC_OUTPUT diff --git a/include/mk/config.mk.default b/include/mk/config.mk.default index ea8276678..20d83232d 100644 --- a/include/mk/config.mk.default +++ b/include/mk/config.mk.default @@ -42,6 +42,8 @@ YACC := bison -y #NUMA_CPPFLAGS := -DNUMA_VERSION1_COMPATIBILITY #NUMA_LIBS := -lnuma #SELINUX_LIBS := -lselinux +#TIRPC_CPPFLAGS := -I/usr/include/tirpc +#TIRPC_LIBS := -ltirpc prefix := /opt/ltp diff --git a/include/mk/config.mk.in b/include/mk/config.mk.in index 478b899bb..73bd96495 100644 --- a/include/mk/config.mk.in +++ b/include/mk/config.mk.in @@ -44,6 +44,8 @@ LEXLIB := @LEXLIB@ NUMA_CPPFLAGS := @NUMA_CPPFLAGS@ NUMA_LIBS := @NUMA_LIBS@ SELINUX_LIBS := @SELINUX_LIBS@ +TIRPC_CPPFLAGS := @TIRPC_CPPFLAGS@ +TIRPC_LIBS := @TIRPC_LIBS@ prefix := @prefix@ diff --git a/m4/ltp-tirpc.m4 b/m4/ltp-tirpc.m4 new file mode 100644 index 000000000..73fde51c9 --- /dev/null +++ b/m4/ltp-tirpc.m4 @@ -0,0 +1,34 @@ +dnl +dnl Copyright (c) 2014 Oracle and/or its affiliates. All Rights Reserved. +dnl +dnl This program is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU General Public License as +dnl published by the Free Software Foundation; either version 2 of +dnl the License, or (at your option) any later version. +dnl +dnl This program is distributed in the hope that it would be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write the Free Software Foundation, +dnl Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +dnl + +dnl +dnl LTP_CHECK_TIRPC +dnl ---------------------------- +dnl +AC_DEFUN([LTP_CHECK_TIRPC],[ + TIRPC_CPPFLAGS="" + TIRPC_LIBS="" + + AC_CHECK_HEADER(tirpc/netconfig.h,[ + TIRPC_CPPFLAGS="-I/usr/include/tirpc" + AC_DEFINE(HAVE_LIBTIRPC, 1, [Define to 1 if you have libtirpc headers installed]) + AC_CHECK_LIB(tirpc, rpcb_set, [TIRPC_LIBS="-ltirpc"])]) + + AC_SUBST(TIRPC_CPPFLAGS) + AC_SUBST(TIRPC_LIBS) +])