Switch to unified view

a/configure.ac b/configure.ac
1
1
2
# Software version. There is no direct link with the library version_info
2
# Software version. There is no direct link with the library version_info
3
# except that we sort or promise that no api and abi incompatibilities
3
# except that we sort or promise that no api and abi incompatibilities
4
# occur with revision (3rd number) changes.
4
# occur with revision (3rd number) changes.
5
<<<<<<< HEAD
5
# ! When changing the version, also change the defines in upnpplib.hxx !
6
# ! When changing the version, also change the defines in upnpplib.hxx !
6
AC_INIT([libupnpp], [0.15.3], [jfd@lesbonscomptes.com],
7
AC_INIT([libupnpp], [0.16.0], [jfd@lesbonscomptes.com],
7
             [libupnpp], [http://www.lesbonscomptes.com/upmpdcli])
8
             [libupnpp], [http://www.lesbonscomptes.com/upmpdcli])
8
9
9
# Lib version info. See:
10
# Lib version info. See:
10
# https://www.sourceware.org/autobook/autobook/autobook_91.html#SEC91
11
# https://www.sourceware.org/autobook/autobook/autobook_91.html#SEC91
11
# https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
12
# https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
...
...
21
# - If any interfaces have been removed or changed since the last public
22
# - If any interfaces have been removed or changed since the last public
22
#   release, then set age to 0 AND CHANGE PACKAGE NAME. 
23
#   release, then set age to 0 AND CHANGE PACKAGE NAME. 
23
# libupnpp packages are named libupnppX where X is the .so major number
24
# libupnpp packages are named libupnppX where X is the .so major number
24
# (c-a). This allows packages for multiple incompatible ABIs to be
25
# (c-a). This allows packages for multiple incompatible ABIs to be
25
# installed
26
# installed
26
VERSION_INFO=6:2:0
27
VERSION_INFO=7:0:0
27
28
28
AC_PREREQ([2.53])
29
AC_PREREQ([2.53])
29
AC_CONFIG_SRCDIR([libupnpp/upnpplib.hxx])
30
AC_CONFIG_SRCDIR([libupnpp/upnpplib.hxx])
30
AC_CONFIG_HEADERS([libupnpp/config.h])
31
AC_CONFIG_HEADERS([libupnpp/config.h])
31
AH_BOTTOM([#include "libupnpp/conf_post.h"])
32
AH_BOTTOM([#include "libupnpp/conf_post.h"])