From dcefc4576020c2c076af1a4af07cc827bf4eea40 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Fri, 13 Apr 2012 11:58:02 -0400 Subject: [PATCH] Build: check for gencat Check for the gencat program and give a missing warning if not present. Change-Id: I71cdaa0840215b53071be4481a5f23b2f8667bda Reviewed-on: http://gerrit.openafs.org/7203 Reviewed-by: Simon Wilkinson Reviewed-by: Derrick Brashear Tested-by: BuildBot --- src/afs/Makefile.in | 8 ++++---- src/cf/osconf.m4 | 1 + src/config/Makefile.config.in | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in index 5e35972..7dbb9f4 100644 --- a/src/afs/Makefile.in +++ b/src/afs/Makefile.in @@ -27,13 +27,13 @@ afszcm.cat: afs_trace.msf -$(RM) -f afszcm.cat case ${SYS_NAME} in \ sgi_* ) \ - gencat -m afszcm.cat afs_trace.msf ;; \ + ${GENCAT} -m afszcm.cat afs_trace.msf ;; \ *_linux* | *_umlinux* ) \ - gencat --new afszcm.cat afs_trace.msf ;; \ + ${GENCAT} --new afszcm.cat afs_trace.msf ;; \ *_darwin_* ) \ - gencat -new afszcm.cat afs_trace.msf ;; \ + ${GENCAT} -new afszcm.cat afs_trace.msf ;; \ * ) \ - gencat afszcm.cat afs_trace.msf ;; \ + ${GENCAT} afszcm.cat afs_trace.msf ;; \ esac depinstall: afszcm.cat AFS_component_version_number.c \ diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4 index 7708462..f97bbc9 100644 --- a/src/cf/osconf.m4 +++ b/src/cf/osconf.m4 @@ -33,6 +33,7 @@ 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(LORDER, lorder, [${am_missing_run}lorder]) +AC_CHECK_PROGS(GENCAT, gencat, [${am_missing_run}gencat]) dnl TODO - need to disable STRIP if we are doing debugging in any user space code diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in index 031bb54..8990a47 100644 --- a/src/config/Makefile.config.in +++ b/src/config/Makefile.config.in @@ -47,6 +47,7 @@ DBG = @DBG@ DEST = @DEST@ DIR_roken = @DIR_roken@ FSINCLUDES = @FSINCLUDES@ +GENCAT = @GENCAT@ INCLUDE_LIBINTL = @INCLUDE_libintl@ KERN_DBG = @KERN_DBG@ KERN_OPTMZ = @KERN_OPTMZ@ -- 1.9.4