| 1 |
# HG changeset patch
|
| 2 |
# Parent d90c3d4786da4cfa7944c9009a0071e3ea6f8581
|
| 3 |
|
| 4 |
diff -r d90c3d4786da configure.ac
|
| 5 |
--- a/configure.ac Wed Jun 13 11:43:31 2012 +0900
|
| 6 |
+++ b/configure.ac Wed Jun 13 11:44:38 2012 +0900
|
| 7 |
@@ -464,20 +464,26 @@
|
| 8 |
AC_DEFINE_UNQUOTED(STONITH_PLUGIN_DIR,"$STONITH_PLUGIN_DIR", Location for Stonith plugins)
|
| 9 |
AC_SUBST(STONITH_PLUGIN_DIR)
|
| 10 |
|
| 11 |
-AC_PATH_PROGS(HG, hg false)
|
| 12 |
+AC_PATH_PROGS(GIT, git false)
|
| 13 |
AC_MSG_CHECKING(build version)
|
| 14 |
-BUILD_VERSION=unknown
|
| 15 |
-if test -f $srcdir/.hg_archival.txt; then
|
| 16 |
- BUILD_VERSION=`cat $srcdir/.hg_archival.txt | awk '/node:/ { print $2 }'`
|
| 17 |
-elif test -x $HG -a -d .hg; then
|
| 18 |
- BUILD_VERSION=`$HG id -itb`
|
| 19 |
- if test $? != 0; then
|
| 20 |
- BUILD_VERSION=unknown
|
| 21 |
- fi
|
| 22 |
+
|
| 23 |
+BUILD_VERSION=$Format:%H$
|
| 24 |
+if test $BUILD_VERSION != ":%H$"; then
|
| 25 |
+ AC_MSG_RESULT(archive hash: $BUILD_VERSION)
|
| 26 |
+
|
| 27 |
+elif test -x $GIT -a -d .git; then
|
| 28 |
+ BUILD_VERSION=`$GIT log --pretty="format:%h" -n 1`
|
| 29 |
+ AC_MSG_RESULT(git hash: $BUILD_VERSION)
|
| 30 |
+
|
| 31 |
+else
|
| 32 |
+ # The current directory name make a reasonable default
|
| 33 |
+ # Most generated archives will include the hash or tag
|
| 34 |
+ BASE=`basename $PWD`
|
| 35 |
+ BUILD_VERSION=`echo $BASE | sed s:.*[[Pp]]acemaker-::`
|
| 36 |
+ AC_MSG_RESULT(directory based hash: $BUILD_VERSION)
|
| 37 |
fi
|
| 38 |
|
| 39 |
AC_DEFINE_UNQUOTED(BUILD_VERSION, "$BUILD_VERSION", Build version)
|
| 40 |
-AC_MSG_RESULT($BUILD_VERSION)
|
| 41 |
AC_SUBST(BUILD_VERSION)
|
| 42 |
|
| 43 |
dnl ===============================================
|
Parent Directory
| 
Revision Log