Skip to content

Commit

Permalink
Put the version at 2.4.3 in anticipation of building releases
Browse files Browse the repository at this point in the history
The git describe thing is nifty, but it gets in the way when building
directly from the archive and has a bit of a chicken and egg with
autotools.  Need something like versioneer which is dynamic in a repo,
but fixed in a distribution.
  • Loading branch information
markwal committed Apr 2, 2016
1 parent 5c68c71 commit dcd7540
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for gpx 2.4.2-18-g4866eb4-dirty.
# Generated by GNU Autoconf 2.69 for gpx 2.4.3.
#
# Report bugs to <https://github.com/markwal/GPX/issues>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='gpx'
PACKAGE_TARNAME='gpx'
PACKAGE_VERSION='2.4.2-18-g4866eb4-dirty'
PACKAGE_STRING='gpx 2.4.2-18-g4866eb4-dirty'
PACKAGE_VERSION='2.4.3'
PACKAGE_STRING='gpx 2.4.3'
PACKAGE_BUGREPORT='https://github.com/markwal/GPX/issues'
PACKAGE_URL='https://github.com/markwal/GPX'

Expand Down Expand Up @@ -1283,7 +1283,7 @@ if test "$ac_init_help" = "long"; then
# 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 gpx 2.4.2-18-g4866eb4-dirty to adapt to many kinds of systems.
\`configure' configures gpx 2.4.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1349,7 +1349,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of gpx 2.4.2-18-g4866eb4-dirty:";;
short | recursive ) echo "Configuration of gpx 2.4.3:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1441,7 +1441,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
gpx configure 2.4.2-18-g4866eb4-dirty
gpx configure 2.4.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1994,7 +1994,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by gpx $as_me 2.4.2-18-g4866eb4-dirty, which was
It was created by gpx $as_me 2.4.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2857,7 +2857,7 @@ fi
# Define the identity of the package.
PACKAGE='gpx'
VERSION='2.4.2-18-g4866eb4-dirty'
VERSION='2.4.3'
cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -5517,7 +5517,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by gpx $as_me 2.4.2-18-g4866eb4-dirty, which was
This file was extended by gpx $as_me 2.4.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -5584,7 +5584,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
gpx config.status 2.4.2-18-g4866eb4-dirty
gpx config.status 2.4.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ([2.69])
AC_INIT([gpx], [m4_esyscmd_s([git describe --tag --dirty])], [https://github.com/markwal/GPX/issues],,[https://github.com/markwal/GPX])
AC_INIT([gpx], [2.4.3], [https://github.com/markwal/GPX/issues],,[https://github.com/markwal/GPX])
AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
AM_EXTRA_RECURSIVE_TARGETS([test])
AC_CONFIG_SRCDIR([src/gpx/gpx.c])
Expand Down

0 comments on commit dcd7540

Please sign in to comment.