Use version string in configure.ac when git repo is not found
This commit is contained in:
14
configure.ac
14
configure.ac
@@ -1,11 +1,11 @@
|
||||
# configure.ac COPYRIGHT FUJITSU LIMITED 2015-2016
|
||||
AC_PREREQ(2.63)
|
||||
m4_define([IHK_VERSION_m4],[0.9.0])dnl
|
||||
m4_define([MCKERNEL_VERSION_m4],[0.9.0])dnl
|
||||
m4_define([DCFA_VERSION_m4],[0.9.0])dnl
|
||||
m4_define([IHK_RELEASE_DATE_m4],[2013-11-18])dnl
|
||||
m4_define([MCKERNEL_RELEASE_DATE_m4],[2013-11-18])dnl
|
||||
m4_define([DCFA_RELEASE_DATE_m4],[2013-11-18])dnl
|
||||
m4_define([IHK_VERSION_m4],[1.4.0])dnl
|
||||
m4_define([MCKERNEL_VERSION_m4],[1.4.0])dnl
|
||||
m4_define([DCFA_VERSION_m4],[1.4.0])dnl
|
||||
m4_define([IHK_RELEASE_DATE_m4],[2017-10-30])dnl
|
||||
m4_define([MCKERNEL_RELEASE_DATE_m4],[2017-10-30])dnl
|
||||
m4_define([DCFA_RELEASE_DATE_m4],[2017-10-30])dnl
|
||||
|
||||
AC_INIT([mckernel], MCKERNEL_VERSION_m4)
|
||||
|
||||
@@ -504,7 +504,7 @@ AC_DEFINE_UNQUOTED(SBINDIR,"$SBINDIR",[Path of install directory for system bina
|
||||
|
||||
ABS_SRCDIR=$( cd $( dirname $0 ); pwd )
|
||||
IHK_ABS_SRCDIR=${ABS_SRCDIR}/../ihk
|
||||
BUILDID=$( cd $IHK_ABS_SRCDIR; git rev-list -1 HEAD | cut -c1-8 )
|
||||
BUILDID=$( cd $IHK_ABS_SRCDIR; if @<:@ ! -d .git @:>@; then echo $IHK_VERSION; else bash -c 'git rev-list -1 HEAD | cut -c1-8'; fi )
|
||||
AC_MSG_NOTICE([BUILDID=$BUILDID])
|
||||
if test "x$BUILDID" != "x" ; then
|
||||
AC_DEFINE_UNQUOTED(BUILDID,"$BUILDID",[IHK build-id to confirm IHK and McKernel built at the same time are used])
|
||||
|
||||
Reference in New Issue
Block a user