From: Tom Yu <tlyu@mit.edu>
Date: Mon, 24 Jan 2000 20:08:42 +0000 (+0000)
Subject: 	* Makefile.in (STLIBOBJS): Properly add gss_libinit.o to permit
X-Git-Tag: krb5-1.2-beta1~154
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d47d1898180a4b135235dde8233cfacd11d43853;p=krb5.git

	* Makefile.in (STLIBOBJS): Properly add gss_libinit.o to permit
	compiling.

	* configure.in: Add libobj to Makefile frags.

	* gss_libinit.c: Add terminating newline.  Use 0 and 1 instead of
	false and true.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11963 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 64f7f5765..68cb27763 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,13 @@
+2000-01-24  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in (STLIBOBJS): Properly add gss_libinit.o to permit
+	compiling.
+
+	* configure.in: Add libobj to Makefile frags.
+
+	* gss_libinit.c: Add terminating newline.  Use 0 and 1 instead of
+	false and true.
+
 Fri Jan 21 22:47:00 2000  Miro Jurisic  <meeroh@mit.edu>
 
 	* Makefile.in: added gss_libinit.[co]
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 5198aec4b..cddb37de8 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -12,6 +12,10 @@ LOCAL_SUBDIRS= generic krb5
 
 MAC_SUBDIRS = generic krb5
 
+LOCALINCLUDES = -Igeneric -I$(srcdir)/generic -Ikrb5 -I$(srcdir)/krb5
+STLIBOBJS=\
+	gss_libinit.o
+
 OBJS=\
 	$(OUTPRE)gss_libinit.$(OBJEXT)
 
@@ -21,7 +25,7 @@ SRCS=\
 LIB=gssapi_krb5
 LIBMAJOR=2
 LIBMINOR=1
-STOBJLISTS=generic/OBJS.ST krb5/OBJS.ST
+STOBJLISTS=OBJS.ST generic/OBJS.ST krb5/OBJS.ST
 SHLIB_EXPDEPS=\
 	$(TOPLIBD)/libkrb5$(SHLIBEXT) \
 	$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in
index bbd6db7d5..ed1f09f4f 100644
--- a/src/lib/gssapi/configure.in
+++ b/src/lib/gssapi/configure.in
@@ -14,7 +14,7 @@ AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY_WITH_DEPS
-K5_GEN_MAKEFILE(., lib)
+K5_GEN_MAKEFILE(., lib libobj)
 K5_GEN_MAKEFILE(generic, libobj)
 K5_GEN_MAKEFILE(krb5, libobj)
 K5_AC_OUTPUT
diff --git a/src/lib/gssapi/gss_libinit.c b/src/lib/gssapi/gss_libinit.c
index ac91b0fa1..e011ebd58 100644
--- a/src/lib/gssapi/gss_libinit.c
+++ b/src/lib/gssapi/gss_libinit.c
@@ -5,7 +5,7 @@
 
 #include "gss_libinit.h"
 
-static	int		initialized = false;
+static	int		initialized = 0;
 
 /*
  * Initialize the GSSAPI library.
@@ -18,7 +18,7 @@ OM_uint32 gssint_initialize_library (void)
 	    add_error_table(&et_k5g_error_table);
 	    add_error_table(&et_ggss_error_table);
 
-		initialized = true;
+		initialized = 1;
 	}
 	
 	return 0;
@@ -39,5 +39,5 @@ void gssint_cleanup_library (void)
     remove_error_table(&et_k5g_error_table);
     remove_error_table(&et_ggss_error_table);
 	
-	initialized = false;
-}
\ No newline at end of file
+	initialized = 0;
+}