proper merge

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

diff --git a/utils/gssd/Makefile.in b/utils/gssd/Makefile.in
index 244fa4ec39a14bb7d51e09f1f0d8ed82c70c3cfc..82c849513bf9b7d4f9f8d243a6acfd9dc9e5887d 100644 (file)
--- a/utils/gssd/Makefile.in
+++ b/utils/gssd/Makefile.in
@@ -48,12 +48,8 @@ am__aclocal_m4_deps = $(top_srcdir)/aclocal/bsdsignals.m4 \
        $(top_srcdir)/aclocal/libevent.m4 \
        $(top_srcdir)/aclocal/libnfsidmap.m4 \
        $(top_srcdir)/aclocal/librpcsecgss.m4 \
+       $(top_srcdir)/aclocal/libsqlite3.m4 \
        $(top_srcdir)/aclocal/libtirpc.m4 \
-       $(top_srcdir)/aclocal/libtool.m4 \
-       $(top_srcdir)/aclocal/ltoptions.m4 \
-       $(top_srcdir)/aclocal/ltsugar.m4 \
-       $(top_srcdir)/aclocal/ltversion.m4 \
-       $(top_srcdir)/aclocal/lt~obsolete.m4 \
        $(top_srcdir)/aclocal/nfs-utils.m4 \
        $(top_srcdir)/aclocal/rpcsec_vers.m4 \
        $(top_srcdir)/aclocal/tcp-wrappers.m4 \
@@ -78,8 +74,8 @@ gss_clnt_send_err_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
        -o $@
 am__objects_1 = gssd-context.$(OBJEXT) gssd-context_mit.$(OBJEXT) \
        gssd-context_heimdal.$(OBJEXT) gssd-context_lucid.$(OBJEXT) \
-       gssd-context_spkm3.$(OBJEXT) gssd-gss_util.$(OBJEXT) \
-       gssd-gss_oids.$(OBJEXT) gssd-err_util.$(OBJEXT)
+       gssd-gss_util.$(OBJEXT) gssd-gss_oids.$(OBJEXT) \
+       gssd-err_util.$(OBJEXT)
 am_gssd_OBJECTS = $(am__objects_1) gssd-gssd.$(OBJEXT) \
        gssd-gssd_main_loop.$(OBJEXT) gssd-gssd_proc.$(OBJEXT) \
        gssd-krb5_util.$(OBJEXT)
@@ -93,8 +89,7 @@ gssd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 am__objects_2 = svcgssd-context.$(OBJEXT) \
        svcgssd-context_mit.$(OBJEXT) \
        svcgssd-context_heimdal.$(OBJEXT) \
-       svcgssd-context_lucid.$(OBJEXT) \
-       svcgssd-context_spkm3.$(OBJEXT) svcgssd-gss_util.$(OBJEXT) \
+       svcgssd-context_lucid.$(OBJEXT) svcgssd-gss_util.$(OBJEXT) \
        svcgssd-gss_oids.$(OBJEXT) svcgssd-err_util.$(OBJEXT)
 am_svcgssd_OBJECTS = $(am__objects_2) svcgssd-svcgssd.$(OBJEXT) \
        svcgssd-svcgssd_main_loop.$(OBJEXT) \
@@ -102,6 +97,7 @@ am_svcgssd_OBJECTS = $(am__objects_2) svcgssd-svcgssd.$(OBJEXT) \
        svcgssd-svcgssd_proc.$(OBJEXT) svcgssd-svcgssd_krb5.$(OBJEXT)
 svcgssd_OBJECTS = $(am_svcgssd_OBJECTS)
 svcgssd_DEPENDENCIES = ../../support/nfs/libnfs.a \
+       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
 svcgssd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -212,12 +208,17 @@ LIBBLKID = @LIBBLKID@
 LIBBSD = @LIBBSD@
 LIBCAP = @LIBCAP@
 LIBCRYPT = @LIBCRYPT@
+LIBDL = @LIBDL@
+LIBEVENT = @LIBEVENT@
 LIBKEYUTILS = @LIBKEYUTILS@
 LIBMOUNT = @LIBMOUNT@
+LIBNFSIDMAP = @LIBNFSIDMAP@
 LIBNSL = @LIBNSL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSOCKET = @LIBSOCKET@
+LIBSQLITE = @LIBSQLITE@
+LIBTIRPC = @LIBTIRPC@
 LIBTOOL = @LIBTOOL@
 LIBWRAP = @LIBWRAP@
 LIPO = @LIPO@
@@ -282,7 +283,6 @@ dvidir = @dvidir@
 enable_gss = @enable_gss@
 enable_ipv6 = @enable_ipv6@
 enable_mountconfig = @enable_mountconfig@
-enable_nfsv3 = @enable_nfsv3@
 enable_nfsv4 = @enable_nfsv4@
 enable_nfsv41 = @enable_nfsv41@
 exec_prefix = @exec_prefix@
@@ -312,6 +312,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 startstatd = @startstatd@
+statdpath = @statdpath@
 statduser = @statduser@
 statedir = @statedir@
 sysconfdir = @sysconfdir@
@@ -333,7 +334,6 @@ COMMON_SRCS = \
        context_mit.c \
        context_heimdal.c \
        context_lucid.c \
-       context_spkm3.c \
        gss_util.c \
        gss_oids.c \
        err_util.c \
@@ -357,7 +357,7 @@ gssd_SOURCES = \
 gssd_LDADD = ../../support/nfs/libnfs.a \
                $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(KRBLIBS)
 
-gssd_LDFLAGS = $(KRBLDFLAGS)
+gssd_LDFLAGS = $(KRBLDFLAGS) $(LIBTIRPC)
 gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
              $(RPCSECGSS_CFLAGS) $(GSSGLUE_CFLAGS) $(KRBCFLAGS)
 
@@ -374,8 +374,8 @@ svcgssd_SOURCES = \
 
 svcgssd_LDADD = \
        ../../support/nfs/libnfs.a \
-       $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) -lnfsidmap \
-       $(KRBLIBS)
+       $(RPCSECGSS_LIBS) $(GSSGLUE_LIBS) $(LIBNFSIDMAP) \
+       $(KRBLIBS) $(LIBTIRPC)
 
 svcgssd_LDFLAGS = $(KRBLDFLAGS)
 svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
@@ -518,7 +518,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-context_heimdal.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-context_lucid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-context_mit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-context_spkm3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-err_util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-gss_oids.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gssd-gss_util.Po@am__quote@
@@ -530,7 +529,6 @@ distclean-compile:
 @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@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-context_mit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-context_spkm3.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-err_util.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-gss_oids.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svcgssd-gss_util.Po@am__quote@
@@ -631,20 +629,6 @@ gssd-context_lucid.obj: context_lucid.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gssd_CFLAGS) $(CFLAGS) -c -o gssd-context_lucid.obj `if test -f 'context_lucid.c'; then $(CYGPATH_W) 'context_lucid.c'; else $(CYGPATH_W) '$(srcdir)/context_lucid.c'; fi`
 
-gssd-context_spkm3.o: context_spkm3.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gssd_CFLAGS) $(CFLAGS) -MT gssd-context_spkm3.o -MD -MP -MF $(DEPDIR)/gssd-context_spkm3.Tpo -c -o gssd-context_spkm3.o `test -f 'context_spkm3.c' || echo '$(srcdir)/'`context_spkm3.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/gssd-context_spkm3.Tpo $(DEPDIR)/gssd-context_spkm3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='context_spkm3.c' object='gssd-context_spkm3.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) $(gssd_CFLAGS) $(CFLAGS) -c -o gssd-context_spkm3.o `test -f 'context_spkm3.c' || echo '$(srcdir)/'`context_spkm3.c
-
-gssd-context_spkm3.obj: context_spkm3.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gssd_CFLAGS) $(CFLAGS) -MT gssd-context_spkm3.obj -MD -MP -MF $(DEPDIR)/gssd-context_spkm3.Tpo -c -o gssd-context_spkm3.obj `if test -f 'context_spkm3.c'; then $(CYGPATH_W) 'context_spkm3.c'; else $(CYGPATH_W) '$(srcdir)/context_spkm3.c'; fi`
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/gssd-context_spkm3.Tpo $(DEPDIR)/gssd-context_spkm3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='context_spkm3.c' object='gssd-context_spkm3.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) $(gssd_CFLAGS) $(CFLAGS) -c -o gssd-context_spkm3.obj `if test -f 'context_spkm3.c'; then $(CYGPATH_W) 'context_spkm3.c'; else $(CYGPATH_W) '$(srcdir)/context_spkm3.c'; fi`
-
 gssd-gss_util.o: gss_util.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gssd_CFLAGS) $(CFLAGS) -MT gssd-gss_util.o -MD -MP -MF $(DEPDIR)/gssd-gss_util.Tpo -c -o gssd-gss_util.o `test -f 'gss_util.c' || echo '$(srcdir)/'`gss_util.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/gssd-gss_util.Tpo $(DEPDIR)/gssd-gss_util.Po
@@ -799,20 +783,6 @@ svcgssd-context_lucid.obj: context_lucid.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-context_lucid.obj `if test -f 'context_lucid.c'; then $(CYGPATH_W) 'context_lucid.c'; else $(CYGPATH_W) '$(srcdir)/context_lucid.c'; fi`
 
-svcgssd-context_spkm3.o: context_spkm3.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -MT svcgssd-context_spkm3.o -MD -MP -MF $(DEPDIR)/svcgssd-context_spkm3.Tpo -c -o svcgssd-context_spkm3.o `test -f 'context_spkm3.c' || echo '$(srcdir)/'`context_spkm3.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/svcgssd-context_spkm3.Tpo $(DEPDIR)/svcgssd-context_spkm3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='context_spkm3.c' object='svcgssd-context_spkm3.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-context_spkm3.o `test -f 'context_spkm3.c' || echo '$(srcdir)/'`context_spkm3.c
-
-svcgssd-context_spkm3.obj: context_spkm3.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -MT svcgssd-context_spkm3.obj -MD -MP -MF $(DEPDIR)/svcgssd-context_spkm3.Tpo -c -o svcgssd-context_spkm3.obj `if test -f 'context_spkm3.c'; then $(CYGPATH_W) 'context_spkm3.c'; else $(CYGPATH_W) '$(srcdir)/context_spkm3.c'; fi`
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/svcgssd-context_spkm3.Tpo $(DEPDIR)/svcgssd-context_spkm3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='context_spkm3.c' object='svcgssd-context_spkm3.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-context_spkm3.obj `if test -f 'context_spkm3.c'; then $(CYGPATH_W) 'context_spkm3.c'; else $(CYGPATH_W) '$(srcdir)/context_spkm3.c'; fi`
-
 svcgssd-gss_util.o: gss_util.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(svcgssd_CFLAGS) $(CFLAGS) -MT svcgssd-gss_util.o -MD -MP -MF $(DEPDIR)/svcgssd-gss_util.Tpo -c -o svcgssd-gss_util.o `test -f 'gss_util.c' || echo '$(srcdir)/'`gss_util.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/svcgssd-gss_util.Tpo $(DEPDIR)/svcgssd-gss_util.Po