summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>1994-06-14 14:15:06 +0000
committerTom Yu <tlyu@mit.edu>1994-06-14 14:15:06 +0000
commit599bf8c555124706b0c5350cca2c7669f417d804 (patch)
tree368b0b1e9993ec3fa62ff831695f4df150a6cf7e /src
parent2d959de81b3b8f843525f1feb9aee8cf3e532ad7 (diff)
fixed recursion of configure (hopefully)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3764 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/aclocal.m417
1 files changed, 14 insertions, 3 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 9999ab147..ae3f85e91 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -81,9 +81,10 @@ if [ -z "${norecursion}" ] ; then
### The recursion line is here.
if [ ! -z "${recprog}" ] ; then
- if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} \
- ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
- ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${removing} ${redirect} ; then
+# if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} \
+# ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
+# ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${removing} ${redirect} ; then
+ if eval ${config_shell} ${recprog} "<<<$>>>@" ; then
true
else
echo Configure in `pwd` failed, exiting. 1>&2
@@ -235,6 +236,16 @@ echo "krb5-root defaults to /krb5"
KRB5ROOT=/krb5)dnl
AC_SUBST(KRB5ROOT)])dnl
dnl
+dnl set $(KRB4) from --with-krb4=value -- WITH_KRB4
+dnl
+define(WITH_KRB4,[
+AC_WITH([krb4],
+echo "krb4 is $withval"
+KRB4=$withval,
+echo "krb4 defaults to /usr/kerberos"
+KRB4=/usr/kerberos)dnl
+AC_SUBST(KRB4)])dnl
+dnl
dnl Imake LinkFile rule, so they occur in the right place -- LinkFile(dst,src)
dnl
define(LinkFile,[