Some build errors. Updates from M.Moeller

diff --git a/helpers/negotiate_auth/kerberos/Makefile.am b/helpers/negotiate_auth/kerberos/Makefile.am
index b060ec7948cf3b2ebff6a921893ac62ecca761cd..966b7d95d738d81fd0d5ae72237db26acd626120 100644 (file)
--- a/helpers/negotiate_auth/kerberos/Makefile.am
+++ b/helpers/negotiate_auth/kerberos/Makefile.am
@@ -1,31 +1,32 @@
-EXTRA_DIST = README NEWS ChangeLog AUTHORS INSTALL
+include $(top_srcdir)/src/Common.am
+
+EXTRA_DIST = README COPYING
 SUBDIRS = 
 
 bin_PROGRAMS = negotiate_kerberos_auth negotiate_kerberos_auth_test
 
 SOURCE = negotiate_kerberos_auth.cc base64.cc base64.h
 SOURCE_test = negotiate_kerberos_auth_test.cc base64.cc base64.h
-SPNEGO = spnegohelp/derparse.c spnegohelp/derparse.h \
+SPNEGO = \
+       spnegohelp/derparse.c spnegohelp/derparse.h \
        spnegohelp/spnego.c spnegohelp/spnego.h \
        spnegohelp/spnegohelp.c spnegohelp/spnegohelp.h \
-       spnegohelp/spnegparse.c spnegohelp/spnegoparse.h
-
-EXTRA_DIST += $(SPNEGO)
+       spnegohelp/spnegoparse.c spnegohelp/spnegoparse.h
 
 if HAVE_SPNEGO
 negotiate_kerberos_auth_SOURCES = $(SOURCE)
-AM_CPPFLAGS = $(KERBINCS) -I$(srcdir)
+AM_CPPFLAGS = $(INCLUDES) $(KERBINCS) -I$(srcdir)
 else
 negotiate_kerberos_auth_SOURCES = $(SOURCE) $(SPNEGO)
-AM_CPPFLAGS = $(KERBINCS) -I$(srcdir)/spnegohelp -I$(srcdir)
+AM_CPPFLAGS = $(INCLUDES) $(KERBINCS) -I$(srcdir)/spnegohelp -I$(srcdir)
 endif
 negotiate_kerberos_auth_test_SOURCES = $(SOURCE_test)
 
 
 negotiate_kerberos_auth_LDFLAGS = 
-negotiate_kerberos_auth_LDADD = -L../../../lib -lmiscutil -lm $(KERBLIBS)
+negotiate_kerberos_auth_LDADD = -L../../../lib -lmiscutil $(XTRA_LIBS) $(KERBLIBS)
 negotiate_kerberos_auth_test_LDFLAGS = 
-negotiate_kerberos_auth_test_LDADD = -L../../../lib -lmiscutil -lm $(KERBLIBS)
+negotiate_kerberos_auth_test_LDADD = -L../../../lib -lmiscutil $(XTRA_LIBS) $(KERBLIBS)
 
 KERBINCS = @KRB5INCS@
 KERBLIBS = @KRB5LIBS@