[Opalvoip-svn] SF.net SVN: opalvoip:[34687] ptlib/trunk

[<rjo...@us...>]

Revision: 34687
          http://sourceforge.net/p/opalvoip/code/34687
Author:   rjongbloed
Date:     2016-03-15 11:53:49 +0000 (Tue, 15 Mar 2016)
Log Message:
-----------
Fixed configure with new mechanism for hiding build number

Modified Paths:
--------------
    ptlib/trunk/configure
    ptlib/trunk/make/my_macros.m4

Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure	2016-03-15 11:20:20 UTC (rev 34686)
+++ ptlib/trunk/configure	2016-03-15 11:53:49 UTC (rev 34687)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for PTLib 2.17alpha1.
+# Generated by GNU Autoconf 2.69 for PTLib 2.17alpha0x10001.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
 # Identity of this package.
 PACKAGE_NAME='PTLib'
 PACKAGE_TARNAME='ptlib'
-PACKAGE_VERSION='2.17alpha1'
-PACKAGE_STRING='PTLib 2.17alpha1'
+PACKAGE_VERSION='2.17alpha0x10001'
+PACKAGE_STRING='PTLib 2.17alpha0x10001'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1608,7 +1608,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PTLib 2.17alpha1 to adapt to many kinds of systems.
+\`configure' configures PTLib 2.17alpha0x10001 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1674,7 +1674,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PTLib 2.17alpha1:";;
+     short | recursive ) echo "Configuration of PTLib 2.17alpha0x10001:";;
    esac
   cat <<\_ACEOF
 
@@ -1924,7 +1924,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PTLib configure 2.17alpha1
+PTLib configure 2.17alpha0x10001
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2850,7 +2850,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PTLib $as_me 2.17alpha1, which was
+It was created by PTLib $as_me 2.17alpha0x10001, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7289,7 +7289,7 @@
    if ${PTLIB_BUILD+:} false; then :
   build=${PTLIB_BUILD}
 else
-  build=`cat $VERSION_DIR/version.h | grep BUILD_NUMBER  | cut -f3 -d' '`
+  build=`cat $VERSION_DIR/version.h | grep BUILD_NUMBER  | cut -f3 -d' ' | sed 's/0x[1-9]*0*//'`
 fi
    if ${PTLIB_STAGE+:} false; then :
   stage=${PTLIB_STAGE}
@@ -20187,7 +20187,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PTLib $as_me 2.17alpha1, which was
+This file was extended by PTLib $as_me 2.17alpha0x10001, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20253,7 +20253,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-PTLib config.status 2.17alpha1
+PTLib config.status 2.17alpha0x10001
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: ptlib/trunk/make/my_macros.m4
===================================================================
--- ptlib/trunk/make/my_macros.m4	2016-03-15 11:20:20 UTC (rev 34686)
+++ ptlib/trunk/make/my_macros.m4	2016-03-15 11:53:49 UTC (rev 34687)
@@ -304,7 +304,7 @@
 AC_DEFUN([MY_VERSION_FILE],[
    AS_VAR_SET_IF([$2[_MAJOR]],[major=${$2[_MAJOR]}],[major=`cat $1 | grep MAJOR_VERSION | cut -f3 -d' '`])
    AS_VAR_SET_IF([$2[_MINOR]],[minor=${$2[_MINOR]}],[minor=`cat $1 | grep MINOR_VERSION | cut -f3 -d' '`])
-   AS_VAR_SET_IF([$2[_BUILD]],[build=${$2[_BUILD]}],[build=`cat $1 | grep BUILD_NUMBER  | cut -f3 -d' '`])
+   AS_VAR_SET_IF([$2[_BUILD]],[build=${$2[_BUILD]}],[build=`cat $1 | grep BUILD_NUMBER  | cut -f3 -d' ' | sed 's/0x@<:@1-9@:>@*0*//'`])
    AS_VAR_SET_IF([$2[_STAGE]],[stage=${$2[_STAGE]}],[stage=`cat $1 | grep BUILD_TYPE    | cut -f 3 -d ' ' | sed 's/BetaCode/-beta/' | sed 's/AlphaCode/-alpha/' | sed 's/ReleaseCode/\./'`])
    version="${major}.${minor}.${build}"
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.