From 9d3ef9337fafe5dcf3865d3aced290be0f887c11 Mon Sep 17 00:00:00 2001 From: Marcio Barbosa Date: Thu, 31 May 2018 09:46:56 -0300 Subject: [PATCH] autoconf: do not reference the missing script Currently, OpenAFS does not use automake. As a result, the missing script is not copied to the build-tools directory. Since this script is not present in the tree, am_missing_run is not initialized. Unfortunately, the current version still has a few references to this variable. In order to preserve a similar behavior, this commit replaces these references by AC_ERROR. While we are changing these, remove the AC_CHECK_PROGS calls for AR and STRIP, since libtool already checks these for us. Change-Id: I833dc6e8611dc7227db4ec77b0160dfa47b7e531 Reviewed-on: https://gerrit.openafs.org/12982 Reviewed-by: Andrew Deason Reviewed-by: Michael Meffie Reviewed-by: Mark Vitale Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- src/cf/osconf.m4 | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index 21db61f2bb..8e3ce2763b 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -25,14 +25,22 @@ PAM_OPTMZ= dnl standard programs AC_PROG_RANLIB -AC_CHECK_PROGS(AS, as, [${am_missing_run}as]) -AC_CHECK_PROGS(AR, ar, [${am_missing_run}ar]) -AC_CHECK_PROGS(MV, mv, [${am_missing_run}mv]) -AC_CHECK_PROGS(RM, rm, [${am_missing_run}rm]) -AC_CHECK_PROGS(LD, ld, [${am_missing_run}ld]) -AC_CHECK_PROGS(CP, cp, [${am_missing_run}cp]) -AC_CHECK_PROGS(STRIP, strip, [${am_missing_run}strip]) -AC_CHECK_PROGS(GENCAT, gencat, [${am_missing_run}gencat]) +AC_CHECK_PROGS(AS, as, [false]) +AC_CHECK_PROGS(MV, mv, [false]) +AC_CHECK_PROGS(RM, rm, [false]) +AC_CHECK_PROGS(LD, ld, [false]) +AC_CHECK_PROGS(CP, cp, [false]) +AC_CHECK_PROGS(GENCAT, gencat, [false]) + +dnl if ar is not present, libtool.m4 (provided by libtool) sets AR to false +dnl if strip is not present, libtool.m4 (provided by libtool) sets STRIP to : +AS_IF([test "x$AR" = "xfalse"], [AC_MSG_ERROR([cannot find required command 'ar'])]) +AS_IF([test "x$AS" = "xfalse"], [AC_MSG_ERROR([cannot find required command 'as'])]) +AS_IF([test "x$MV" = "xfalse"], [AC_MSG_ERROR([cannot find required command 'mv'])]) +AS_IF([test "x$RM" = "xfalse"], [AC_MSG_ERROR([cannot find required command 'rm'])]) +AS_IF([test "x$LD" = "xfalse"], [AC_MSG_ERROR([cannot find required command 'ld'])]) +AS_IF([test "x$CP" = "xfalse"], [AC_MSG_ERROR([cannot find required command 'cp'])]) +AS_IF([test "x$GENCAT" = "xfalse"], [AC_MSG_ERROR([cannot find required command 'gencat'])]) dnl TODO - need to disable STRIP if we are doing debugging in any user space code