From: Luke Howard <lukeh@padl.com>
Date: Wed, 30 Mar 2011 11:00:20 +0000 (+1100)
Subject: saslauthd build fixes
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=cyrus-sasl.git;a=commitdiff_plain;h=5e3317cb5a547b66d8a9b7750fbea11aee4d6e4b

saslauthd build fixes
---

diff --git a/autogen.sh b/autogen.sh
index 32f62b2..b777640 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,3 +9,13 @@ aclocal -I . -I cmulocal -I config && \
     libtoolize --automake -c && \
     autoconf && \
     automake --add-missing --copy
+
+cd saslauthd
+
+autoreconf -ivf
+
+aclocal -I . -I ../cmulocal -I ../config && \
+    autoheader && \
+    libtoolize --automake -c && \
+    autoconf && \
+    automake --add-missing --copy
diff --git a/config.h.in b/config.h.in
index 308b967..c518077 100644
--- a/config.h.in
+++ b/config.h.in
@@ -339,9 +339,6 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff --git a/saslauthd/aclocal.m4 b/saslauthd/aclocal.m4
index 93d6510..a13bc14 100644
--- a/saslauthd/aclocal.m4
+++ b/saslauthd/aclocal.m4
@@ -901,3 +901,14 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../config/kerberos_v4.m4])
+m4_include([../config/sasldb.m4])
+m4_include([../cmulocal/berkdb.m4])
+m4_include([../cmulocal/bsd_sockets.m4])
+m4_include([../cmulocal/c-attribute.m4])
+m4_include([../cmulocal/common.m4])
+m4_include([../cmulocal/cyrus.m4])
+m4_include([../cmulocal/init_automake.m4])
+m4_include([../cmulocal/ipv6.m4])
+m4_include([../cmulocal/openssl.m4])
+m4_include([../cmulocal/sasl2.m4])
diff --git a/saslauthd/saslauthd.h.in b/saslauthd/saslauthd.h.in
index ded7b92..3eac951 100644
--- a/saslauthd/saslauthd.h.in
+++ b/saslauthd/saslauthd.h.in
@@ -65,6 +65,15 @@
 /* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
 #undef HAVE_GSS_C_NT_USER_NAME
 
+/* Define to 1 if you have the `gss_decapsulate_token' function. */
+#undef HAVE_GSS_DECAPSULATE_TOKEN
+
+/* Define to 1 if you have the `gss_encapsulate_token' function. */
+#undef HAVE_GSS_ENCAPSULATE_TOKEN
+
+/* Define to 1 if you have the `gss_oid_equal' function. */
+#undef HAVE_GSS_OID_EQUAL
+
 /* Include HTTP form Support */
 #undef HAVE_HTTPFORM