summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1995-06-28 18:29:26 +0000
committerTheodore Tso <tytso@mit.edu>1995-06-28 18:29:26 +0000
commit323ef88ce9b471d2a5a064c33e77860d54df1f0d (patch)
treed6626870c1ad9b8895fc90c02610e38d1e17ad83 /src
parent966b47e499faefe16dc615ac4df920f95131db6d (diff)
downloadkrb5-323ef88ce9b471d2a5a064c33e77860d54df1f0d.tar.gz
krb5-323ef88ce9b471d2a5a064c33e77860d54df1f0d.tar.xz
krb5-323ef88ce9b471d2a5a064c33e77860d54df1f0d.zip
Work around bug in autoconf which causes a relative path for dnl
AC_PROG_INSTALL to be cached. We workaround this by unsetting the cache variable if it contains a relative pathname. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6187 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog13
-rw-r--r--src/aclocal.m418
2 files changed, 27 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2e04996e1..7534f23cd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,15 @@
+Wed Jun 28 10:43:10 1995 <tytso@rsx-11.mit.edu>
+
+ * aclocal.m4 (INSTALL_VARIABLE_HACKSRCTOP): Work around bug in
+ autoconf which causes a relative path for dnl
+ AC_PROG_INSTALL to be cached. We workaround this by
+ unsetting the cache variable if it contains a relative
+ pathname.
Tue Jun 27 16:28:23 EDT 1995 Paul Park (pjpark@mit.edu)
- * acconfig.h - Reinstate KRB5_PROVIDE_PROTOTYPES. This is needed for
- compilers which recognize prototypes but don't set __STDC__
- or _WINDOWS.
+ * acconfig.h - Reinstate KRB5_PROVIDE_PROTOTYPES. This is needed
+ for compilers which recognize prototypes but don't set
+ __STDC__ or _WINDOWS.
Fri Jun 23 20:14:45 1995 Sam Hartman <hartmans@tardis.MIT.EDU>
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index e9a6caa51..3949790f6 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -63,6 +63,21 @@ define(AC_POP_MAKEFILE,[dnl
PUSHEOF
])dnl
dnl
+dnl Work around bug in autoconf which causes a relative path for
+dnl AC_PROG_INSTALL to be cached.
+dnl
+define(INSTALL_VARIABLE_HACK,[dnl
+#
+# Work around a bug in autoconf; unset the cache variable for the install
+# program if it is a relative path.
+#
+case "$ac_cv_path_install" in
+../*|./*|[[a-zA-Z]]*)
+ unset ac_cv_path_install
+ ;;
+esac
+])dnl
+dnl
dnl append subdir rule -- MAKE_SUBDIRS("making",all)
dnl
define(_MAKE_SUBDIRS,[dnl
@@ -123,12 +138,13 @@ dnl drop in standard rules for all configure files -- CONFIG_RULES
dnl
define(CONFIG_RULES,[dnl
V5_SET_TOPDIR dnl
+INSTALL_VARIABLE_HACK dnl
WITH_CC dnl
WITH_CCOPTS dnl
WITH_LINKER dnl
WITH_CPPOPTS dnl
WITH_KRB4 dnl
-AC_CONST
+AC_CONST dnl
WITH_NETLIB dnl
KRB_INCLUDE dnl
AC_PUSH_MAKEFILE()dnl