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
AC_INIT([libupnpp], [0.14.1], [jfd@lesbonscomptes.com],
5
AC_INIT([libupnpp], [0.15.0], [jfd@lesbonscomptes.com],
6
             [libupnpp], [http://www.lesbonscomptes.com/upmpdcli])
6
             [libupnpp], [http://www.lesbonscomptes.com/upmpdcli])
7
7
8
# Lib version info. See:
8
# Lib version info. See:
9
# https://www.sourceware.org/autobook/autobook/autobook_91.html#SEC91
9
# https://www.sourceware.org/autobook/autobook/autobook_91.html#SEC91
10
# https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
10
# https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
...
...
20
# - If any interfaces have been removed or changed since the last public
20
# - If any interfaces have been removed or changed since the last public
21
#   release, then set age to 0 AND CHANGE PACKAGE NAME. 
21
#   release, then set age to 0 AND CHANGE PACKAGE NAME. 
22
# libupnpp packages are named libupnppX where X is the .so major number
22
# libupnpp packages are named libupnppX where X is the .so major number
23
# (c-a). This allows packages for multiple incompatible ABIs to be
23
# (c-a). This allows packages for multiple incompatible ABIs to be
24
# installed
24
# installed
25
VERSION_INFO=5:1:3
25
VERSION_INFO=6:0:0
26
26
27
AC_PREREQ([2.53])
27
AC_PREREQ([2.53])
28
AC_CONFIG_SRCDIR([libupnpp/upnpplib.hxx])
28
AC_CONFIG_SRCDIR([libupnpp/upnpplib.hxx])
29
AC_CONFIG_HEADERS([libupnpp/config.h])
29
AC_CONFIG_HEADERS([libupnpp/config.h])
30
AH_BOTTOM([#include "libupnpp/conf_post.h"])
30
AH_BOTTOM([#include "libupnpp/conf_post.h"])
...
...
34
LT_INIT
34
LT_INIT
35
35
36
AC_PROG_CXX
36
AC_PROG_CXX
37
AC_PROG_LIBTOOL
37
AC_PROG_LIBTOOL
38
38
39
# Check for where to find unordered_map etc.
40
AC_LANG_PUSH([C++])
41
AC_CHECK_HEADER(tr1/unordered_map,[AC_DEFINE([HAVE_TR1_UNORDERED],
42
    [],["Have tr1"])],[])
43
CPPFLAGS_=$CPPFLAGS
44
CPPFLAGS=-std=c++0x
45
export CPPFLAGS
46
AC_CHECK_HEADER(unordered_map,[AC_DEFINE([HAVE_CXX0X_UNORDERED],
47
    [],["Have C++0x"])],[])
48
CPPFLAGS=$CPPFLAGS_
49
export CPPFLAGS
50
AC_LANG_POP([C++])
51
52
# libupnp is configured with large file support, and we need to do the same,
39
# libupnp is configured with large file support, and we need to do the same,
53
# else a difference in off_t size impacts struct File_Info and prevents the
40
# else a difference in off_t size impacts struct File_Info and prevents the
54
# vdir to work. This does make a difference, for exemple, for Raspbian
41
# vdir to work. This does make a difference, for exemple, for Raspbian
55
# on the Raspberry PI. Use the same directives as libupnp's configure.ac
42
# on the Raspberry PI. Use the same directives as libupnp's configure.ac
56
AC_TYPE_SIZE_T
43
AC_TYPE_SIZE_T
57
AC_TYPE_OFF_T
44
AC_TYPE_OFF_T
58
AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support])
45
AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support])
59
AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
46
AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
60
AC_DEFINE([HAVE_SHARED_PTR_STD], [1], [Has std::shared_ptr])
61
AC_DEFINE([HAVE_CXX0X_UNORDERED], [1],[Have C++0x])
62
AC_CHECK_LIB([rt], [clock_gettime], [], [])
47
AC_CHECK_LIB([rt], [clock_gettime], [], [])
63
AC_CHECK_LIB([pthread], [pthread_create], [], [])
48
AC_CHECK_LIB([pthread], [pthread_create], [], [])
64
49
65
# The 2 following checks for libthreadutil and libixml are normally
50
# The 2 following checks for libthreadutil and libixml are normally
66
# unnecessary and even problematic. libupnpp does not use them directly,
51
# unnecessary and even problematic. libupnpp does not use them directly,