diff options
Diffstat (limited to 'aclocal')
| -rw-r--r-- | aclocal/librpcsecgss.m4 | 17 | ||||
| -rw-r--r-- | aclocal/libtirpc.m4 | 10 | ||||
| -rw-r--r-- | aclocal/rpcsec_vers.m4 | 7 |
3 files changed, 25 insertions, 9 deletions
diff --git a/aclocal/librpcsecgss.m4 b/aclocal/librpcsecgss.m4 index 5791260..d1dd25e 100644 --- a/aclocal/librpcsecgss.m4 +++ b/aclocal/librpcsecgss.m4 @@ -3,12 +3,17 @@ dnl KRB5LIBS must be set before this function is invoked. dnl AC_DEFUN([AC_LIBRPCSECGSS], [ - dnl Check for library, but do not add -lrpcsecgss to LIBS - AC_CHECK_LIB([rpcsecgss], [authgss_create_default], [librpcsecgss=1], - [AC_MSG_ERROR([librpcsecgss not found.])]) + dnl libtirpc provides an rpcsecgss API + if test "$enable_tirpc" = no; then - AC_CHECK_LIB([rpcsecgss], [authgss_set_debug_level], - [AC_DEFINE([HAVE_AUTHGSS_SET_DEBUG_LEVEL], 1, - [Define to 1 if you have the `authgss_set_debug_level' function.])]) + dnl Check for library, but do not add -lrpcsecgss to LIBS + AC_CHECK_LIB([rpcsecgss], [authgss_create_default], [librpcsecgss=1], + [AC_MSG_ERROR([librpcsecgss not found.])]) + + AC_CHECK_LIB([rpcsecgss], [authgss_set_debug_level], + [AC_DEFINE([HAVE_AUTHGSS_SET_DEBUG_LEVEL], 1, + [Define to 1 if you have the `authgss_set_debug_level' function.])]) + + fi ])dnl diff --git a/aclocal/libtirpc.m4 b/aclocal/libtirpc.m4 index b1f3669..af4c7d3 100644 --- a/aclocal/libtirpc.m4 +++ b/aclocal/libtirpc.m4 @@ -2,6 +2,12 @@ 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. @@ -12,8 +18,10 @@ AC_DEFUN([AC_LIBTIRPC], [ [AC_MSG_ERROR([libtirpc not found.])]) dnl also must have the headers installed where we expect - AC_CHECK_HEADERS([tirpc/netconfig.h], , + dnl look for headers; add -I compiler option if found + AC_CHECK_HEADERS([${tirpc_header_dir}/netconfig.h], , [AC_MSG_ERROR([libtirpc headers not found.])]) + AC_SUBST([AM_CPPFLAGS], ["-I${tirpc_header_dir}"]) fi diff --git a/aclocal/rpcsec_vers.m4 b/aclocal/rpcsec_vers.m4 index df7cfb9..5d13db3 100644 --- a/aclocal/rpcsec_vers.m4 +++ b/aclocal/rpcsec_vers.m4 @@ -1,8 +1,11 @@ dnl Checks librpcsec version AC_DEFUN([AC_RPCSEC_VERSION], [ - PKG_CHECK_MODULES([RPCSECGSS], [librpcsecgss >= 0.16], , - [AC_MSG_ERROR([Unable to locate information required to use librpcsecgss. If you have pkgconfig installed, you might try setting environment variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])]) + dnl TI-RPC replaces librpcsecgss + if test "$enable_tirpc" = no; then + PKG_CHECK_MODULES([RPCSECGSS], [librpcsecgss >= 0.16], , + [AC_MSG_ERROR([Unable to locate information required to use librpcsecgss. If you have pkgconfig installed, you might try setting environment variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])]) + fi PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1]) |