* configure.ac: Extract the GS_ symbols from the version number provided to AC_INIT instead of duplicating it. --- configure.ac | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac index d6e2be0..dcce828 100644 --- a/configure.ac +++ b/configure.ac @@ -38,10 +38,23 @@ CPPFLAGS="${CPPFLAGS:=}" CXXFLAGS="${CXXFLAGS:=}" LDFLAGS="${LDFLAGS:=}" -GS_VERSION_MAJOR=9 -GS_VERSION_MINOR=6 -GS_VERSION_PATCH=0 GS_REVISIONDATE=20130101 +# Extract major.minor.micro from the version number provided to AC_INIT above +majmin=${PACKAGE_VERSION%\.*} + +major=${PACKAGE_VERSION/%\.*\.*/} +minor=${majmin/#*\./} +micro=${PACKAGE_VERSION/#*\.*\./} + +# Strip any leading zeros +GS_VERSION_MAJOR=${major#"${major%%[!0]*}"} +GS_VERSION_MINOR=${minor#"${minor%%[!0]*}"} +GS_VERSION_PATCH=${micro#"${micro%%[!0]*}"} + +# If any component is now "" replace it with "0" +GS_VERSION_MAJOR=${GS_VERSION_MAJOR:-0} +GS_VERSION_MINOR=${GS_VERSION_MINOR:-0} +GS_VERSION_PATCH=${GS_VERSION_PATCH:-0} GS_VERSION=`expr $GS_VERSION_MAJOR \* 10000 + $GS_VERSION_MINOR \* 100 + $GS_VERSION_PATCH` -- 1.7.10.4