From 6ff7049c5ea877adc86a5181124f944992a88387 Mon Sep 17 00:00:00 2001
From: Mark Eichin <eichin@mit.edu>
Date: Wed, 15 Jun 1994 01:08:24 +0000
Subject: [PATCH] fixes for srcdir, LEX tests

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3791 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/include/krb5/Makefile.in     |  3 ++
 src/include/krb5/configure.in    |  1 +
 src/isode/compat/Makefile.in     |  4 +--
 src/isode/pepsy/Makefile.in      | 55 +++++++++++++++++---------------
 src/isode/pepsy/configure.in     |  2 ++
 src/isode/pepsy/pepsydefs.h.gnrc |  9 ++++--
 src/isode/psap/Makefile.in       | 12 +++----
 src/lib/crypto/os/Makefile.in    |  6 ++--
 8 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 4972c714e..34c4795d5 100644
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -1,6 +1,9 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+
 KRB5ROOT = @KRB5ROOT@
 KDB5DIR = $(KRB5ROOT)
 KRB5SRVTABDIR = /etc
diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in
index cc915004e..6bbe220fb 100644
--- a/src/include/krb5/configure.in
+++ b/src/include/krb5/configure.in
@@ -1,5 +1,6 @@
 AC_INIT(acconfig.h)
 AC_CONFIG_HEADER(autoconf.h)
+AC_PROG_LEX
 HAVE_YYLINENO
 AC_FUNC_CHECK(strdup,AC_DEFINE(HAS_STRDUP))
 CHECK_DIRENT
diff --git a/src/isode/compat/Makefile.in b/src/isode/compat/Makefile.in
index 32599d41c..35adc03e8 100644
--- a/src/isode/compat/Makefile.in
+++ b/src/isode/compat/Makefile.in
@@ -16,7 +16,7 @@ ISODEINCM=	$(KRBINC)isode
 ISODEINC=	$(ISODEINCM)/
 
 HDIR	=	$(TOPDIR)isode/h/
-UTILDIR	=	$(TOPDIR)isode/util/
+UTILDIR	=	$(srcdir)/$(BUILDTOP)isode/util/
 INCDIRM	=	$(HDIR)
 INCDIR	=	$(INCDIRM)/
 PEPSYDIRM=	$(INCDIR)pepsy
@@ -131,7 +131,7 @@ str2vec.o:	$(HFILES)
 tailor.o:	$(HFILES) $(HDIR)isoaddrs.h $(HDIR)tailor.h $(HDIR)logger.h 
 		$(CC) $(CFLAGS) -DBINPATH=\"$(BINDIR)\" \
 			-DETCPATH=\"$(ETCDIR)\" -DSBINPATH=\"$(SBINDIR)\" \
-			-DLOGPATH=\"$(LOGDIR)\" -c tailor.c
+			-DLOGPATH=\"$(LOGDIR)\" -c $(srcdir)/tailor.c
 baduser.o:	$(HFILES) $(HDIR)tailor.h $(HDIR)logger.h
 chkpassword.o:	$(HFILES)
 getpassword.o:	$(HFILES)
diff --git a/src/isode/pepsy/Makefile.in b/src/isode/pepsy/Makefile.in
index dd762142c..9ffba0b8f 100644
--- a/src/isode/pepsy/Makefile.in
+++ b/src/isode/pepsy/Makefile.in
@@ -12,8 +12,8 @@ TOPDIR = $(BUILDTOP)
 OPTIONS	=	-I. -I$(HDIR) -I$(TOPDIR)include $(PEPYPATH) $(KRBOPT)
 CFLAGS  =       $(OPTIONS) $(LOPTIONS) $(DEFS)
 
-HDIR	=	$(TOPDIR)isode/h/
-UTILDIR	=	$(TOPDIR)isode/util/
+HDIR	=	$(srcdir)/$(TOPDIR)isode/h/
+UTILDIR	=	$(srcdir)/$(BUILDTOP)isode/util/
 INCDIRM	=	$(HDIR)
 INCDIR	=	$(INCDIRM)/
 PEPSYDIRM=	$(INCDIR)pepsy
@@ -29,6 +29,9 @@ ISODEINC=	$(KRBINC)isode/
 PEPSYINCM=	$(ISODEINC)pepsy
 PEPSYINC=	$(ISODEINC)pepsy/
 
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+
 LIBES	=	libcompat.a
 LLIBS   =
 LN	=	ln
@@ -50,7 +53,7 @@ PEPYPATH=	-DPEPYPATH -DPEPSYPATH=\".:$(PEPSYDIRM)\"
 # to prevent a lot of unnecessary re-loading
 PEPSYLIBES=	$(PSAPDIR)/sprintoid.o $(PSAPDIR)/pl_tables.o \
 		$(PSAPDIR)/oid_cmp.o $(PSAPDIR)/oid_cpy.o \
-		$(PSAPDIR)/oid_free.o ../compat/libcompat.a
+		$(PSAPDIR)/oid_free.o ../compat/libcompat.a $(LEXLIB)
 LIBES   =	$(TOPDIR)lib/libpsap.a $(TOPDIR)lib/libcompat.a
 LLIBS   =	$(TOPDIR)lib/llib-lpsap $(TOPDIR)lib/llib-lcompat
 HFILES	=	$(HDIR)psap.h \
@@ -63,7 +66,7 @@ LIBFILES=	$(DRFILES) $(SUPFILES)
 CFILES	=	enc.c dec.c fre.c prnt.c main.c util.c  \
 		vprint.c pepsy_str.c py_advise.c
 
-HFILES	=	$(HDIR)/pepsy.h test_table.h
+HFILES	=	$(TOPDIR)include/isode/pepsy.h test_table.h
 HEADERS	=	UNIV.ph UNIV-types.h
 
 OFILES	=	$(LIBFILES) main.o
@@ -113,7 +116,7 @@ xpepsy:		pepsyvrsn.o $(PEPSYLIBES)
 			pepsyvrsn.o $(PEPSYLIBES) -lm
 
 pepsy.o:	pepsy.c pepsydefs.h $(HFILES)
-		$(CC) $(CFLAGS) -c pepsy.c
+		$(CC) $(CFLAGS) -c $(srcdir)/pepsy.c
 
 
 pepsyvrsn.c:	$(PEPSY-O)
@@ -131,7 +134,7 @@ pepsy-yacc.y:	yacc.y.gnrc
 		$(UTILDIR)extract.sh PEPSY SCTRL < $? > $@
 
 pepsy_misc.o:	pepsy_misc.c pepsydefs.h
-		$(CC) $(CFLAGS) -c pepsy_misc.c
+		$(CC) $(CFLAGS) -c $(srcdir)/pepsy_misc.c
 
 lex.c:		lex.l
 		$(LEX) $(LEXFLAGS) lex.l
@@ -146,18 +149,18 @@ pepsydefs.h:	pepsydefs.h.gnrc
 pepsy.h:	pepsy.h.gnrc
 		$(UTILDIR)extract.sh PEPSY < $? > $@
 
-pass2.o:	pass2.c
-		$(CC) $(CFLAGS) -c pass2.c
-etabs.o:	etabs.c
-		$(CC) $(CFLAGS) -c etabs.c
-dtabs.o:	dtabs.c
-		$(CC) $(CFLAGS) -c dtabs.c
-ptabs.o:	ptabs.c
-		$(CC) $(CFLAGS) -c ptabs.c
-dfns.o:		dfns.c
-		$(CC) $(CFLAGS) -c dfns.c
-mod.o:		mod.c
-		$(CC) $(CFLAGS) -c mod.c
+pass2.o:	$(srcdir)/pass2.c
+		$(CC) $(CFLAGS) -c $(srcdir)/pass2.c
+etabs.o:	$(srcdir)/etabs.c
+		$(CC) $(CFLAGS) -c $(srcdir)/etabs.c
+dtabs.o:	$(srcdir)/dtabs.c
+		$(CC) $(CFLAGS) -c $(srcdir)/dtabs.c
+ptabs.o:	$(srcdir)/ptabs.c
+		$(CC) $(CFLAGS) -c $(srcdir)/ptabs.c
+dfns.o:		$(srcdir)/dfns.c
+		$(CC) $(CFLAGS) -c $(srcdir)/dfns.c
+mod.o:		$(srcdir)/mod.c
+		$(CC) $(CFLAGS) -c $(srcdir)/mod.c
 
 
 l-pepsy:	$(PEPSY-C) pepsydefs.h pepsyvrsn.c true
@@ -292,20 +295,20 @@ pep:		$(PEPFILES)
 pep-saber:	$(PEPFILES)
 		#load $(CFLAGS) (PEPFILES)
 
-main.o: 	T1-types.h test_table.h main.c
-		$(CC) $(CFLAGS) -DPRNT=1 -c main.c
+main.o: 	T1-types.h test_table.h $(srcdir)/main.c
+		$(CC) $(CFLAGS) -DPRNT=1 -c $(srcdir)/main.c
 
 enc.o:		enc.c pepsy-driver.h
-		$(CC) $(CFLAGS) -c enc.c
+		$(CC) $(CFLAGS) -c $(srcdir)/enc.c
 
 dec.o:		dec.c pepsy-driver.h
-		$(CC) $(CFLAGS) -c dec.c
+		$(CC) $(CFLAGS) -c $(srcdir)/dec.c
 
 prnt.o: 	prnt.c pepsy-driver.h
-		$(CC) $(CFLAGS) -c prnt.c
+		$(CC) $(CFLAGS) -c $(srcdir)/prnt.c
 
 util.o: 	util.c pepsy-driver.h
-		$(CC) $(CFLAGS) -c util.c
+		$(CC) $(CFLAGS) -c $(srcdir)/util.c
 
 T1_tables.o:	T1_tables.c T1-types.h UNIV-types.h
 
@@ -324,8 +327,8 @@ T3_tables.o:	T3_tables.c T3-types.h UNIV-types.h
 T3_tables.c T3-types.h:	t3.py xpepsy
 		./xpepsy -A -f -m -i pepy-refs.h t3.py
 
-prt.o:		prnt.c $(HDIR)/pepsy.h
-		$(CC) $(CFLAGS) -Dprintf=vprint -o $@ prnt.c
+prt.o:		prnt.c $(TOPDIR)include/isode/pepsy.h
+		$(CC) $(CFLAGS) -Dprintf=vprint -o $@ $(srcdir)/prnt.c
 
 
 ################################################################
diff --git a/src/isode/pepsy/configure.in b/src/isode/pepsy/configure.in
index 56b3e2378..3f73b8465 100644
--- a/src/isode/pepsy/configure.in
+++ b/src/isode/pepsy/configure.in
@@ -1,3 +1,5 @@
 AC_INIT(configure.in)
+AC_PROG_LEX
+AC_YYTEXT_POINTER
 HAVE_YYLINENO
 AC_OUTPUT(Makefile)
diff --git a/src/isode/pepsy/pepsydefs.h.gnrc b/src/isode/pepsy/pepsydefs.h.gnrc
index c90c0f208..e958c2c15 100644
--- a/src/isode/pepsy/pepsydefs.h.gnrc
+++ b/src/isode/pepsy/pepsydefs.h.gnrc
@@ -17,9 +17,12 @@
  *
  *
  * $Log$
- * Revision 1.2  1994/06/11 07:42:43  tlyu
- * fixed yytext declaration problem
+ * Revision 1.3  1994/06/15 01:08:19  eichin
+ * fixes for srcdir, LEX tests
  *
+Revision 1.2  1994/06/11 07:42:43  tlyu
+fixed yytext declaration problem
+
 Revision 1.1  1994/06/10  03:31:25  eichin
 autoconfed isode for kerberos work
 
@@ -394,7 +397,7 @@ extern char *yyprfdflt;
 extern int yydebug;
 extern int yylineno;
 
-#if defined(linux)
+#if defined(YYTEXT_POINTER)
 extern char *yytext;
 #else
 #ifndef	HPUX
diff --git a/src/isode/psap/Makefile.in b/src/isode/psap/Makefile.in
index dc1d77338..73c43255f 100644
--- a/src/isode/psap/Makefile.in
+++ b/src/isode/psap/Makefile.in
@@ -17,7 +17,7 @@ ISODEINCM=	$(KRBINC)isode
 ISODEINC=	$(ISODEINCM)/
 
 HDIR	=	$(TOPDIR)isode/h/
-UTILDIR	=	$(TOPDIR)isode/util/
+UTILDIR	=	$(srcdir)/$(BUILDTOP)isode/util/
 INCDIRM	=	$(HDIR)
 INCDIR	=	$(INCDIRM)/
 PEPSYDIRM=	$(INCDIR)pepsy
@@ -230,10 +230,10 @@ uvec2ps.o:	$(HFILES) $(HDIR)tailor.h $(HDIR)logger.h
 psaptest:	psaptest.o $(LIBES)
 		$(LDCC) $(LDFLAGS) -o $@ psaptest.o $(LIBES) $(LSOCKET)
 
-psaptest.o:	$(HFILES) $(HDIR)tailor.h $(HDIR)logger.h psaptest.c
-		$(CC) $(CFLAGS) -c psaptest.c
+psaptest.o:	$(HFILES) $(HDIR)tailor.h $(HDIR)logger.h $(srcdir)/psaptest.c
+		$(CC) $(CFLAGS) -c $(srcdir)/psaptest.c
 
-l-psaptest:;	$(LINT) $(LFLAGS) psaptest.c llib-lpsap $(LLIBS) \
+l-psaptest:;	$(LINT) $(LFLAGS) $(srcdir)/psaptest.c llib-lpsap $(LLIBS) \
 			| grep -v "warning: possible pointer alignment problem"
 
 
@@ -245,14 +245,14 @@ hex2pe:		hex2pe.o
 		$(LDCC) $(LDFLAGS) -o $@ hex2pe.o
 
 hex2pe.o:	$(HFILES) hex2pe.c
-		$(CC) $(CFLAGS) -c hex2pe.c
+		$(CC) $(CFLAGS) -c $(srcdir)/hex2pe.c
 
 
 dec2pe:		dec2pe.o
 		$(LDCC) $(LDFLAGS) -o $@ dec2pe.o
 
 dec2pe.o:	$(HFILES) dec2pe.c
-		$(CC) $(CFLAGS) -c dec2pe.c
+		$(CC) $(CFLAGS) -c $(srcdir)/dec2pe.c
 
 
 ################################################################
diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in
index 333750843..86ca11ee5 100644
--- a/src/lib/crypto/os/Makefile.in
+++ b/src/lib/crypto/os/Makefile.in
@@ -27,13 +27,13 @@ OBJS=	rnd_confoun.o localaddr.o ustime.o $(LIBOBJS)
 SRCS=	rnd_confoun.c localaddr.c ustime.c 
 
 localaddr.c: ../../krb5/os/localaddr.c
-	$(LN) ../../krb5/os/localaddr.c $@
+	-$(LN) $(srcdir)/../../krb5/os/localaddr.c $@
 
 ustime.c: ../../krb5/os/ustime.c
-	$(LN) ../../krb5/os/ustime.c $@
+	-$(LN) $(srcdir)/../../krb5/os/ustime.c $@
 
 memmove.c: ../../krb5/posix/memmove.c
-	$(LN) ../../krb5/posix/memmove.c $@
+	-$(LN) $(srcdir)/../../krb5/posix/memmove.c $@
 
 
 
-- 
2.26.2