diff options
Diffstat (limited to 'aclocal')
| -rw-r--r-- | aclocal/libtirpc.m4 | 67 |
1 files changed, 12 insertions, 55 deletions
diff --git a/aclocal/libtirpc.m4 b/aclocal/libtirpc.m4 index b823364..ebc1bea 100644 --- a/aclocal/libtirpc.m4 +++ b/aclocal/libtirpc.m4 @@ -2,61 +2,18 @@ dnl Checks for TI-RPC library and headers dnl AC_DEFUN([AC_LIBTIRPC], [ - AC_ARG_WITH([tirpcinclude], - [AC_HELP_STRING([--with-tirpcinclude=DIR], - [use TI-RPC headers in DIR])], - [tirpc_header_dir=$withval], - [tirpc_header_dir=/usr/include/tirpc]) - - dnl if --enable-tirpc was specifed, the following components - dnl must be present, and we set up HAVE_ macros for them. - - if test "$enable_tirpc" != "no"; then - - dnl look for the library - AC_CHECK_LIB([tirpc], [clnt_tli_create], [:], - [if test "$enable_tirpc" = "yes"; then - AC_MSG_ERROR([libtirpc not found.]) - else - AC_MSG_WARN([libtirpc not found. TIRPC disabled!]) - enable_tirpc="no" - fi]) - fi - - if test "$enable_tirpc" != "no"; then - - dnl Check if library contains authgss_free_private_data - AC_CHECK_LIB([tirpc], [authgss_free_private_data], [have_free_private_data=yes], - [have_free_private_data=no]) - fi - - if test "$enable_tirpc" != "no"; then - dnl also must have the headers installed where we expect - dnl look for headers; add -I compiler option if found - AC_CHECK_HEADERS([${tirpc_header_dir}/netconfig.h], - AC_SUBST([AM_CPPFLAGS], ["-I${tirpc_header_dir}"]), - [if test "$enable_tirpc" = "yes"; then - AC_MSG_ERROR([libtirpc headers not found.]) - else - AC_MSG_WARN([libtirpc headers not found. TIRPC disabled!]) - enable_tirpc="no" - fi]) - - fi - - dnl now set $LIBTIRPC accordingly - if test "$enable_tirpc" != "no"; then - AC_DEFINE([HAVE_LIBTIRPC], 1, - [Define to 1 if you have and wish to use libtirpc.]) - LIBTIRPC="-ltirpc" - if test "$have_free_private_data" = "yes"; then - AC_DEFINE([HAVE_AUTHGSS_FREE_PRIVATE_DATA], 1, - [Define to 1 if your rpcsec library provides authgss_free_private_data,]) - fi - else - LIBTIRPC="" - fi - + PKG_PROG_PKG_CONFIG([0.9.0]) + AS_IF( + [test "$enable_tirpc" != "no"], + [PKG_CHECK_MODULES([TIRPC], [libtirpc >= 0.2.4], + [LIBTIRPC="${TIRPC_LIBS}" + AM_CPPFLAGS="${AM_CPPFLAGS} ${TIRPC_CFLAGS}" + AC_DEFINE([HAVE_LIBTIRPC], [1], + [Define to 1 if you have and wish to use libtirpc.])], + [AS_IF([test "$enable_tirpc" != "no"], [AC_MSG_ERROR([libtirpc not found.])], + [LIBTIRPC=""])])]) + + AC_SUBST([AM_CPPFLAGS]) AC_SUBST(LIBTIRPC) ])dnl |