summaryrefslogtreecommitdiffstats
path: root/src/aclocal.m4
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>1994-06-29 05:35:50 +0000
committerTom Yu <tlyu@mit.edu>1994-06-29 05:35:50 +0000
commitba0c614172f11219c430b17cd14602d9f7e629e3 (patch)
tree61c2ac5235dbd41debd8aaf0d6eb63be20e1a506 /src/aclocal.m4
parent0ab5822efa69c6b2236b5f052775b2ce86c7c30e (diff)
downloadkrb5-ba0c614172f11219c430b17cd14602d9f7e629e3.tar.gz
krb5-ba0c614172f11219c430b17cd14602d9f7e629e3.tar.xz
krb5-ba0c614172f11219c430b17cd14602d9f7e629e3.zip
folding in Harry's changes
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3924 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/aclocal.m4')
-rw-r--r--src/aclocal.m412
1 files changed, 10 insertions, 2 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index a0e8cf05f4..b51cdac784 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -391,7 +391,7 @@ dnl
define(PepsyTarget,[
divert(9)
.SUFFIXES: .py
-$1_defs.h $1_pre_defs.h $1-types.h $1_tables.c: $1-asn.py
+$1_defs.h $1_pre_defs.h $1-types.h $1_tables.c:: $1-asn.py
@echo '***Ignore the warning message "Warning: Can'"'"'t find UNIV.ph failed"'
[$](PEPSY) [$](PSYFLAGS) [$](srcdir)/$1-asn.py
@@ -421,7 +421,10 @@ dnl
dnl ISODE/pepsy includes are used -- ISODE_INCLUDE
dnl
define(ISODE_INCLUDE,[
-ADD_DEF([-I${SRCTOP}/isode/h -I${BUILDTOP}/isode/h])dnl
+AC_ENABLE([isode],
+ISODELIB='[$(TOPLIBD)/libisode.a]'
+ADD_DEF([-I${SRCTOP}/isode/h -I${BUILDTOP}/isode/h]),ISODELIB=)dnl
+AC_SUBST([ISODELIB])dnl
])dnl
dnl
dnl check for yylineno -- HAVE_YYLINENO
@@ -453,3 +456,8 @@ fi
AC_VERBOSE(setting LEXLIB to $LEXLIB)
AC_SUBST(LEX)AC_SUBST(LEXLIB)])dnl
dnl
+dnl
+dnl allow for compilation with isode (yuck!)
+dnl
+define(ISODE_DEFS,
+[AC_ENABLE([isode],[ADD_DEF(KRB5_USE_ISODE)],)])dnl