nfs-utils: clean up handling of libgssglue in gssd Makefile

From: Jeff Layton <jlayton@redhat.com>

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 <jlayton@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/aclocal/rpcsec_vers.m4 b/aclocal/rpcsec_vers.m4
index 5d13db3b68e1173c3f90a60379fac4d3cd22705a..e59c0aa4a8b39ea26fcbed0893938b273940116d 100644 (file)
--- a/aclocal/rpcsec_vers.m4
+++ b/aclocal/rpcsec_vers.m4
@@ -1,12 +1,12 @@
 dnl Checks librpcsec version
 AC_DEFUN([AC_RPCSEC_VERSION], [
 
 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])])
   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
 
   fi
 

-  PKG_CHECK_MODULES([GSSGLUE], [libgssglue >= 0.1])
-

 ])dnl
 ])dnl

diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am
index e42b33972ee6eec15195ff5854cad2e1c5451e95..95a2bd0f8c6cc21247d71549680b04a52f01772e 100644 (file)
--- 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 \
        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) \
 gssd_LDFLAGS = $(KRBLDFLAGS)
 
 gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \

-             $(RPCSECGSS_CFLAGS) $(KRBCFLAGS)
+             $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)

 
 svcgssd_SOURCES = \
        $(COMMON_SRCS) \
 
 svcgssd_SOURCES = \
        $(COMMON_SRCS) \


@@ -56,18 +56,18 @@ svcgssd_SOURCES = \
 
 svcgssd_LDADD = \
        ../../support/nfs/libnfs.a \
 
 svcgssd_LDADD = \
        ../../support/nfs/libnfs.a \

-       $(RPCSECGSS_LIBS) -lnfsidmap \
+       $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) -lnfsidmap \

        $(KRBLIBS)
 
 svcgssd_LDFLAGS = $(KRBLDFLAGS)
 
 svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
        $(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) \
 
 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
 
 
 MAINTAINERCLEANFILES = Makefile.in