From: Michael Meffie <mmeffie@sinenomine.net>
Date: Fri, 13 Apr 2012 15:58:02 +0000 (-0400)
Subject: Build: check for gencat
X-Git-Tag: upstream/1.6.10_pre1^2~72
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c2af2b7b9597b5f5ab779a092b5bf9a2d35ea746;p=packages%2Fo%2Fopenafs.git

Build: check for gencat

Check for the gencat program and give a missing warning if
not present.

Reviewed-on: http://gerrit.openafs.org/7203
Reviewed-by: Simon Wilkinson <simonxwilkinson@gmail.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit dcefc4576020c2c076af1a4af07cc827bf4eea40)

Change-Id: I383af43e6bb26de0095629e99d41e0e0b6bcb685
Reviewed-on: http://gerrit.openafs.org/11158
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
index 66d6c024f..dca92f88e 100644
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@ -29,15 +29,15 @@ 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 ;; \
 		sun*_4* ) \
 			/usr/etc/gencat 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 02d272597..017cb6fc4 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 30068baa5..0cc605ead 100644
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -45,6 +45,7 @@ DARWIN_INFOFILE=@DARWIN_INFOFILE@
 DBG = @DBG@
 DEST = @DEST@
 FSINCLUDES = @FSINCLUDES@
+GENCAT = @GENCAT@
 INCLUDE_LIBINTL = @INCLUDE_libintl@
 KERN_DBG = @KERN_DBG@
 KERN_OPTMZ = @KERN_OPTMZ@