- cosmetics in the main Makefile

- changes to make the spnego dir work with the autools stuff

diff --git a/Makefile.in b/Makefile.in
index 7a0c276..f191007 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,5 +32,5 @@ clean:
 
 distclean: clean
        (cd spnegokrb5 && make distclean)
-       $(RM) config.h config.status Makefile configure autom4te.cache config.log
-       
+       $(RM) config.h config.status Makefile configure config.log
+       $(RM) -rf autom4te.cache src/.libs

diff --git a/config.h.in b/config.h.in
index 2e34697..e576298 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,6 +1,6 @@
 
 /* Define to the version of this package. */
-/* Conflicts with defintions from Apache
+/* Conflicts with defintions from Apache */
 /* #undef PACKAGE_VERSION */
 
 /* Define to `unsigned' if <sys/types.h> does not define. */

diff --git a/spnegokrb5/.cvsignore b/spnegokrb5/.cvsignore
new file mode 100644 (file)
index 0000000..f3c7a7c
--- /dev/null
+++ b/spnegokrb5/.cvsignore
@@ -0,0 +1 @@
+Makefile

diff --git a/spnegokrb5/Makefile.in b/spnegokrb5/Makefile.in
index c16a9e8..10568a0 100644 (file)
--- a/spnegokrb5/Makefile.in
+++ b/spnegokrb5/Makefile.in
@@ -1,6 +1,7 @@
-include ../makefile.include
+KRB5_CPPFLAGS = @KRB5_CPPFLAGS@
+KRB5_LDFLAGS = @KRB5_LDFLAGS@
 
-CPPFLAGS = -I. -I$(KRB5_ROOT)/include -I$(KRB5_ROOT)/include/gssapi
+CPPFLAGS = -I. -I.. $(KRB5_CPPFLAGS)
 CFLAGS = -Wall -g
 
 gen_files =                    \

diff --git a/spnegokrb5/spnegokrb5.h b/spnegokrb5/spnegokrb5.h
index 84a4db8..c18edea 100644 (file)
--- a/spnegokrb5/spnegokrb5.h
+++ b/spnegokrb5/spnegokrb5.h
@@ -5,7 +5,12 @@
 extern "C" {
 #endif
 
-#include <gssapi.h>
+#include "config.h"
+#ifdef HEIMDAL
+#  include <gssapi.h>
+#else
+#  include <gssapi/gssapi.h>
+#endif
 
 OM_uint32 gss_init_sec_context_spnego(
             OM_uint32 *,

diff --git a/spnegokrb5/spnegokrb5_locl.h b/spnegokrb5/spnegokrb5_locl.h
index 57fa9b2..1c3d47c 100644 (file)
--- a/spnegokrb5/spnegokrb5_locl.h
+++ b/spnegokrb5/spnegokrb5_locl.h
@@ -1,7 +1,14 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <gssapi.h>
+#include "config.h"
+
+#ifdef HEIMDAL
+#  include <gssapi.h>
+#else
+#  include <gssapi/gssapi.h>
+#  include <gssapi/gssapi_generic.h>
+#endif
 #include <spnego_asn1.h>
 #include <spnegokrb5.h>
 #include <der.h>