71 lines
2.3 KiB
Diff
71 lines
2.3 KiB
Diff
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index d5cc644..534194d 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -447,22 +447,26 @@ AC_SUBST(LIBDB)
|
||
|
|
AM_CONDITIONAL([HAVE_LIBDB], [test ! -z "$LIBDB"])
|
||
|
|
|
||
|
|
AC_ARG_ENABLE([nis],
|
||
|
|
- AS_HELP_STRING([--disable-nis], [Disable building NIS/YP support in pam_unix and pam_access]))
|
||
|
|
+ AS_HELP_STRING([--disable-nis], [Disable building NIS/YP support in pam_unix]))
|
||
|
|
|
||
|
|
AS_IF([test "x$enable_nis" != "xno"], [
|
||
|
|
- CFLAGS=$old_CFLAGS
|
||
|
|
- LIBS=$old_LIBS
|
||
|
|
+ old_CFLAGS=$CFLAGS
|
||
|
|
+ old_LIBS=$LIBS
|
||
|
|
|
||
|
|
dnl if there's libtirpc available, prefer that over the system
|
||
|
|
dnl implementation.
|
||
|
|
- PKG_CHECK_MODULES([libtirpc], [libtirpc], [
|
||
|
|
- CFLAGS="$CFLAGS $libtirpc_CFLAGS"
|
||
|
|
- LIBS="$LIBS $libtirpc_LIBS"
|
||
|
|
+ PKG_CHECK_MODULES([TIRPC], [libtirpc], [
|
||
|
|
+ CFLAGS="$CFLAGS $TIRPC_CFLAGS"
|
||
|
|
+ LIBS="$LIBS $TIRPC_LIBS"
|
||
|
|
], [:;])
|
||
|
|
|
||
|
|
- AC_SEARCH_LIBS([yp_get_default_domain], [nsl])
|
||
|
|
+ PKG_CHECK_MODULES([NSL], [libnsl], [],
|
||
|
|
+ [AC_CHECK_LIB([nsl],[yp_match],[NSL_LIBS="-lnsl"],[NSL_LIBS=""])])
|
||
|
|
+ CFLAGS="$CFLAGS $NSL_CFLAGS"
|
||
|
|
+ LIBS="$LIBS $NSL_LIBS"
|
||
|
|
|
||
|
|
AC_CHECK_FUNCS([yp_get_default_domain yperr_string yp_master yp_bind yp_match yp_unbind])
|
||
|
|
+ AC_CHECK_FUNCS([getrpcport rpcb_getaddr])
|
||
|
|
AC_CHECK_HEADERS([rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h])
|
||
|
|
AC_CHECK_DECLS([getrpcport], , , [
|
||
|
|
#if HAVE_RPC_RPC_H
|
||
|
|
@@ -470,9 +474,6 @@ AS_IF([test "x$enable_nis" != "xno"], [
|
||
|
|
#endif
|
||
|
|
])
|
||
|
|
|
||
|
|
- NIS_CFLAGS="${CFLAGS%${old_CFLAGS}}"
|
||
|
|
- NIS_LIBS="${LIBS%${old_LIBS}}"
|
||
|
|
-
|
||
|
|
CFLAGS="$old_CFLAGS"
|
||
|
|
LIBS="$old_LIBS"
|
||
|
|
])
|
||
|
|
diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
|
||
|
|
index ab0d55a..56df178 100644
|
||
|
|
--- a/modules/pam_unix/Makefile.am
|
||
|
|
+++ b/modules/pam_unix/Makefile.am
|
||
|
|
@@ -19,7 +19,7 @@ secureconfdir = $(SCONFIGDIR)
|
||
|
|
AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
|
||
|
|
-DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \
|
||
|
|
-DUPDATE_HELPER=\"$(sbindir)/unix_update\" \
|
||
|
|
- $(NIS_CFLAGS)
|
||
|
|
+ @TIRPC_CFLAGS@ @NSL_CFLAGS@
|
||
|
|
|
||
|
|
if HAVE_LIBSELINUX
|
||
|
|
AM_CFLAGS += -D"WITH_SELINUX"
|
||
|
|
@@ -30,7 +30,7 @@ if HAVE_VERSIONING
|
||
|
|
pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
|
||
|
|
endif
|
||
|
|
pam_unix_la_LIBADD = $(top_builddir)/libpam/libpam.la \
|
||
|
|
- @LIBCRYPT@ @LIBSELINUX@ $(NIS_LIBS)
|
||
|
|
+ @LIBCRYPT@ @LIBSELINUX@ @TIRPC_LIBS@ @NSL_LIBS@
|
||
|
|
|
||
|
|
securelib_LTLIBRARIES = pam_unix.la
|
||
|
|
|