Test for YYLINENO so that pepsy will build cleanly on all platforms

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

3 files changed, 24 insertions, 16 deletions

diff --git a/src/isode/pepsy/Makefile.in b/src/isode/pepsy/Makefile.in
index b26daa0d3..dd762142c 100644
--- a/src/isode/pepsy/Makefile.in
+++ b/src/isode/pepsy/Makefile.in
@@ -4,12 +4,13 @@
 
 srcdir = @srcdir@
 VPATH = @srcdir@
+DEFS = @DEFS@
 
 BUILDTOP = ../../
 TOPDIR = $(BUILDTOP)
 
-OPTIONS	=	-I. -I$(HDIR) $(PEPYPATH) $(KRBOPT)
-CFLAGS  =       $(OPTIONS) $(LOPTIONS) 
+OPTIONS	=	-I. -I$(HDIR) -I$(TOPDIR)include $(PEPYPATH) $(KRBOPT)
+CFLAGS  =       $(OPTIONS) $(LOPTIONS) $(DEFS)
 
 HDIR	=	$(TOPDIR)isode/h/
 UTILDIR	=	$(TOPDIR)isode/util/
@@ -19,8 +20,8 @@ PEPSYDIRM=	$(INCDIR)pepsy
 PEPSYDIR=	$(PEPSYDIRM)/
 PSAPDIRM=	$(TOPDIR)isode/psap
 PSAPDIR=	$(PSAPDIRM)/
-LIBISODE=	$(TOPDIR)libisode.a
-LIBDSAP	=	$(TOPDIR)libdsap.a
+LIBISODE=	$(TOPDIR)lib/libisode.a
+LIBDSAP	=	$(TOPDIR)lib/libdsap.a
 
 KRBINC	=	$(TOPDIR)include/
 ISODEINCM=	$(KRBINC)isode
@@ -50,8 +51,8 @@ PEPYPATH=	-DPEPYPATH -DPEPSYPATH=\".:$(PEPSYDIRM)\"
 PEPSYLIBES=	$(PSAPDIR)/sprintoid.o $(PSAPDIR)/pl_tables.o \
 		$(PSAPDIR)/oid_cmp.o $(PSAPDIR)/oid_cpy.o \
 		$(PSAPDIR)/oid_free.o ../compat/libcompat.a
-LIBES   =	$(TOPDIR)libpsap.a $(TOPDIR)libcompat.a
-LLIBS   =	$(TOPDIR)llib-lpsap $(TOPDIR)llib-lcompat
+LIBES   =	$(TOPDIR)lib/libpsap.a $(TOPDIR)lib/libcompat.a
+LLIBS   =	$(TOPDIR)lib/llib-lpsap $(TOPDIR)lib/llib-lcompat
 HFILES	=	$(HDIR)psap.h \
 		$(HDIR)manifest.h $(HDIR)general.h $(HDIR)config.h
 
@@ -95,14 +96,16 @@ PEPSY-O	= pepsy.o pepsy-yacc.o pepsy_misc.o pass2.o etabs.o dtabs.o ptabs.o \
 
 inst-pepsy:	$(BINDIR)pepsy
 
-$(BINDIR)pepsy:	xpepsy
-		-cp $@ zxpepsy
-		-rm -f $@
-		cp xpepsy $@
-		-@ls -gls $@
-		-@echo ""
+#$(BINDIR)pepsy:	xpepsy
+#		-cp $@ zxpepsy
+#		-rm -f $@
+#		cp xpepsy $@
+#		-@ls -gls $@
+#		-@echo ""
 
 pepsy:		xpepsy
+		-mv pepsy pepsy.old
+		$(LN) xpepsy pepsy
 		-@echo ""
 
 xpepsy:		pepsyvrsn.o $(PEPSYLIBES)
@@ -176,8 +179,8 @@ libpepsy:	libpepsy.a true
 libpepsy.a:     $(LIBFILES)
 	        -rm -f $@
 	        @$(UTILDIR)make-lib.sh $(SYSTEM) $@ $(LIBFILES)
-	        -@rm -f $(TOPDIR)libpepsy.a
-	        -@$(LN) libpepsy.a $(TOPDIR)libpepsy.a || cp libpepsy.a $(TOPDIR)libpepsy.a
+	        -@rm -f $(TOPDIR)lib/libpepsy.a
+	        -@$(LN) libpepsy.a $(TOPDIR)lib/libpepsy.a || cp libpepsy.a $(TOPDIR)lib/libpepsy.a
 	        -@ls -l $@
 	        -@echo "PEPSY library built normally"
 
diff --git a/src/isode/pepsy/configure.in b/src/isode/pepsy/configure.in
index cdff2db09..56b3e2378 100644
--- a/src/isode/pepsy/configure.in
+++ b/src/isode/pepsy/configure.in
@@ -1,2 +1,3 @@
 AC_INIT(configure.in)
+HAVE_YYLINENO
 AC_OUTPUT(Makefile)
diff --git a/src/isode/pepsy/pepsy.c b/src/isode/pepsy/pepsy.c
index b33d089ff..6ff802d14 100644
--- a/src/isode/pepsy/pepsy.c
+++ b/src/isode/pepsy/pepsy.c
@@ -36,7 +36,10 @@ static char *rcsid = "$Header$";
  *
  *
  * $Log$
- * Revision 1.2  1994/06/11 08:05:55  tlyu
+ * Revision 1.3  1994/06/12 23:49:17  tytso
+ * Test for YYLINENO so that pepsy will build cleanly on all platforms.
+ *
+ * Revision 1.2  1994/06/11  08:05:55  tlyu
  * mips yylineno breakage
  *
  * Revision 1.1  1994/06/10  03:31:15  eichin
@@ -70,8 +73,9 @@ static char *rcsid = "$Header$";
 #include <varargs.h>
 #include "pepsydefs.h"
 #include "pass2.h"
+#include <krb5/autoconf.h>
 
-#if defined(USING_BISON)
+#if defined(USING_BISON) || defined(NO_YYLINENO)
 int yylineno = 0;		/* Bison doesn't have yylineno, sigh */
 				/* ultrix doesn't either */
 #endif