diff options
| -rw-r--r-- | aclocal/rpcsec_vers.m4 | 6 | ||||
| -rw-r--r-- | utils/gssd/Makefile.am | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/aclocal/rpcsec_vers.m4 b/aclocal/rpcsec_vers.m4 index 5d13db3..e59c0aa 100644 --- a/aclocal/rpcsec_vers.m4 +++ b/aclocal/rpcsec_vers.m4 @@ -1,12 +1,12 @@ dnl Checks librpcsec version AC_DEFUN([AC_RPCSEC_VERSION], [ - dnl TI-RPC replaces librpcsecgss + dnl TI-RPC replaces librpcsecgss, but we still need libgssglue 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])]) + else + PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1]) fi - PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1]) - ])dnl diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am index e42b339..95a2bd0 100644 --- a/utils/gssd/Makefile.am +++ b/utils/gssd/Makefile.am @@ -39,11 +39,11 @@ gssd_SOURCES = \ write_bytes.h gssd_LDADD = ../../support/nfs/libnfs.a \ - $(RPCSECGSS_LIBS) $(KRBLIBS) + $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS) gssd_LDFLAGS = $(KRBLDFLAGS) gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \ - $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) + $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS) svcgssd_SOURCES = \ $(COMMON_SRCS) \ @@ -56,18 +56,18 @@ svcgssd_SOURCES = \ svcgssd_LDADD = \ ../../support/nfs/libnfs.a \ - $(RPCSECGSS_LIBS) -lnfsidmap \ + $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) -lnfsidmap \ $(KRBLIBS) svcgssd_LDFLAGS = $(KRBLDFLAGS) svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \ - $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) + $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS) gss_clnt_send_err_SOURCES = gss_clnt_send_err.c gss_clnt_send_err_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \ - $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) + $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS) MAINTAINERCLEANFILES = Makefile.in |