From: Chuck Lever Date: Mon, 16 Mar 2009 17:42:44 +0000 (-0400) Subject: nfs-utils: clean up handling of libgssglue in gssd Makefile X-Git-Tag: nfs-utils-1-1-6-rc2 X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=1a4bbe59d5cf0684c46b329fcc765eac97dab6ba nfs-utils: clean up handling of libgssglue in gssd Makefile From: Jeff Layton Make the pkgconfig check for libgssglue conditional on tirpc being enabled. When it's disabled, the pkgconfig check for librpcsecgss will pull in the gssglue lib and include dir automatically. Also, make sure we include GSSGLUE_CFLAGS and the GSSGLUE_LIBS to the appropriate places in utils/gssd/Makefile.am so that we pick up the gssglue libs when tirpc is enabled. Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever Signed-off-by: Steve Dickson --- 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