Merge branch 'upstream'

[nfs-utils.git] / utils / gssd / Makefile.in

diff --git a/utils/gssd/Makefile.in b/utils/gssd/Makefile.in
index 41503abb0b30ebb441ff83497f1ab4ecf2126e3a..1441131d563db9e7d65b13a102d0c7e2f2c23219 100644 (file)
--- a/utils/gssd/Makefile.in
+++ b/utils/gssd/Makefile.in
@@ -39,9 +39,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/aclocal/bsdsignals.m4 \
        $(top_srcdir)/aclocal/kerberos5.m4 \
+       $(top_srcdir)/aclocal/libblkid.m4 \
        $(top_srcdir)/aclocal/nfs-utils.m4 \
        $(top_srcdir)/aclocal/tcp-wrappers.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -69,7 +70,8 @@ am_gssd_OBJECTS = $(am__objects_1) gssd-gssd.$(OBJEXT) \
        gssd-krb5_util.$(OBJEXT)
 gssd_OBJECTS = $(am_gssd_OBJECTS)
 am__DEPENDENCIES_1 =
-gssd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+gssd_DEPENDENCIES = ../../support/nfs/libnfs.a $(am__DEPENDENCIES_1) \
+       $(am__DEPENDENCIES_1)
 gssd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CCLD) $(gssd_CFLAGS) $(CFLAGS) $(gssd_LDFLAGS) \
        $(LDFLAGS) -o $@
@@ -79,8 +81,8 @@ am__objects_2 = svcgssd-context.$(OBJEXT) \
        svcgssd-context_lucid.$(OBJEXT) \
        svcgssd-context_spkm3.$(OBJEXT) svcgssd-gss_util.$(OBJEXT) \
        svcgssd-gss_oids.$(OBJEXT) svcgssd-err_util.$(OBJEXT)
-am_svcgssd_OBJECTS = $(am__objects_2) svcgssd-cacheio.$(OBJEXT) \
-       svcgssd-svcgssd.$(OBJEXT) svcgssd-svcgssd_main_loop.$(OBJEXT) \
+am_svcgssd_OBJECTS = $(am__objects_2) svcgssd-svcgssd.$(OBJEXT) \
+       svcgssd-svcgssd_main_loop.$(OBJEXT) \
        svcgssd-svcgssd_mech2file.$(OBJEXT) \
        svcgssd-svcgssd_proc.$(OBJEXT)
 svcgssd_OBJECTS = $(am_svcgssd_OBJECTS)
@@ -149,9 +151,9 @@ EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GREP = @GREP@
-GSSAPI_CFLAGS = @GSSAPI_CFLAGS@
-GSSAPI_LIBS = @GSSAPI_LIBS@
 GSSD = @GSSD@
+GSSGLUE_CFLAGS = @GSSGLUE_CFLAGS@
+GSSGLUE_LIBS = @GSSGLUE_LIBS@
 HAVE_LIBWRAP = @HAVE_LIBWRAP@
 HAVE_TCP_WRAPPER = @HAVE_TCP_WRAPPER@
 IDMAPD = @IDMAPD@
@@ -193,8 +195,10 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
+RPCGEN_PATH = @RPCGEN_PATH@
 RPCSECGSS_CFLAGS = @RPCSECGSS_CFLAGS@
 RPCSECGSS_LIBS = @RPCSECGSS_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -252,6 +256,7 @@ sbindir = @sbindir@
 secure_statd = @secure_statd@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
+startstatd = @startstatd@
 statduser = @statduser@
 statedir = @statedir@
 sysconfdir = @sysconfdir@
@@ -293,20 +298,20 @@ gssd_SOURCES = \
        krb5_util.h \
        write_bytes.h
 
-gssd_LDADD = $(RPCSECGSS_LIBS) $(KRBLIBS)
+gssd_LDADD = ../../support/nfs/libnfs.a \
+               $(RPCSECGSS_LIBS) $(KRBLIBS)
+
 gssd_LDFLAGS = $(KRBLDFLAGS)
 gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
              $(RPCSECGSS_CFLAGS) $(KRBCFLAGS)
 
 svcgssd_SOURCES = \
        $(COMMON_SRCS) \
-       cacheio.c \
        svcgssd.c \
        svcgssd_main_loop.c \
        svcgssd_mech2file.c \
        svcgssd_proc.c \
        \
-       cacheio.h \
        svcgssd.h
 
 svcgssd_LDADD = \
@@ -432,7 +437,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-gssd_main_loop.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-gssd_proc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-krb5_util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-cacheio.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-context.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-context_heimdal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-context_lucid.Po@am__quote@
@@ -761,20 +765,6 @@ svcgssd-err_util.obj: err_util.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -c -o svcgssd-err_util.obj `if test -f 'err_util.c'; then $(CYGPATH_W) 'err_util.c'; else $(CYGPATH_W) '$(srcdir)/err_util.c'; fi`
 
-svcgssd-cacheio.o: cacheio.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -MT svcgssd-cacheio.o -MD -MP -MF $(DEPDIR)/svcgssd-cacheio.Tpo -c -o svcgssd-cacheio.o `test -f 'cacheio.c' || echo '$(srcdir)/'`cacheio.c
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/svcgssd-cacheio.Tpo $(DEPDIR)/svcgssd-cacheio.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='cacheio.c' object='svcgssd-cacheio.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -c -o svcgssd-cacheio.o `test -f 'cacheio.c' || echo '$(srcdir)/'`cacheio.c
-
-svcgssd-cacheio.obj: cacheio.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -MT svcgssd-cacheio.obj -MD -MP -MF $(DEPDIR)/svcgssd-cacheio.Tpo -c -o svcgssd-cacheio.obj `if test -f 'cacheio.c'; then $(CYGPATH_W) 'cacheio.c'; else $(CYGPATH_W) '$(srcdir)/cacheio.c'; fi`
-@am__fastdepCC_TRUE@   mv -f $(DEPDIR)/svcgssd-cacheio.Tpo $(DEPDIR)/svcgssd-cacheio.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='cacheio.c' object='svcgssd-cacheio.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -c -o svcgssd-cacheio.obj `if test -f 'cacheio.c'; then $(CYGPATH_W) 'cacheio.c'; else $(CYGPATH_W) '$(srcdir)/cacheio.c'; fi`
-
 svcgssd-svcgssd.o: svcgssd.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -MT svcgssd-svcgssd.o -MD -MP -MF $(DEPDIR)/svcgssd-svcgssd.Tpo -c -o svcgssd-svcgssd.o `test -f 'svcgssd.c' || echo '$(srcdir)/'`svcgssd.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/svcgssd-svcgssd.Tpo $(DEPDIR)/svcgssd-svcgssd.Po