From 1ad26bc193f6b7693888054e4ddb96cf5fd260ee Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Thu, 22 Jul 2010 12:21:14 -0500 Subject: [PATCH] autoconf: Force absolute INSTALL Force using an absolute path for install-sh. Autoconf normally prefers using a relative path, which confuses (at least) part of the libafs build system. Change-Id: I6962e61bb866362f674708e611ff22eb190a771a Reviewed-on: http://gerrit.openafs.org/2461 Tested-by: Andrew Deason Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- acinclude.m4 | 1 + src/cf/abs-install.m4 | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 src/cf/abs-install.m4 diff --git a/acinclude.m4 b/acinclude.m4 index bc50f5d9fd..c46d472b33 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -264,6 +264,7 @@ AM_PROG_LEX dnl if we are flex, be lex-compatible OPENAFS_LEX_IS_FLEX([AC_SUBST([LEX], ["$LEX -l"])]) +OPENAFS_FORCE_ABS_INSTALL OPENAFS_CHECK_BIGENDIAN OPENAFS_PRINTF_TAKES_Z_LEN diff --git a/src/cf/abs-install.m4 b/src/cf/abs-install.m4 new file mode 100644 index 0000000000..a899929d3e --- /dev/null +++ b/src/cf/abs-install.m4 @@ -0,0 +1,13 @@ +dnl Force $INSTALL to be an absolute path; some of the libafs build +dnl gets confused by a relative $INSTALL +AC_DEFUN([OPENAFS_FORCE_ABS_INSTALL],[ + if test "$INSTALL" = "${srcdir}/build-tools/install-sh -c" || + test "$INSTALL" = "build-tools/install-sh -c" ; then + + INSTALL=`cd "$srcdir"; pwd`/build-tools/install-sh + if test -f "$INSTALL" ; then :; else + AC_MSG_ERROR([Error translating install-sh to an absolute path: $INSTALL does not exist?]) + fi + INSTALL="$INSTALL -c" + fi +])