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

diff --git a/src/ChangeLog b/src/ChangeLog
index 2e04996e109856ff1de2f731abd2e87d21eba022..7534f23cdbd0a30f7429aed71094c3feb776946b 100644 (file)
--- 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 e9a6caa51c665a0571593e44421fb5f572403421..3949790f6210c2055dc6b61ca0ee3177dd47bc1f 100644 (file)
--- 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