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.11.0], [jfd@lesbonscomptes.com],
5
AC_INIT([libupnpp], [0.12.1], [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
...
...
19
#   increment age.
19
#   increment age.
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 c number above. This
22
# libupnpp packages are named libupnppX where X is the c number above. This
23
# allows packages for multiple incompatible ABIs to be installed
23
# allows packages for multiple incompatible ABIs to be installed
24
VERSION_INFO=2:0:0
24
VERSION_INFO=3:0:1
25
25
26
AC_PREREQ([2.53])
26
AC_PREREQ([2.53])
27
AC_CONFIG_SRCDIR([libupnpp/upnpplib.hxx])
27
AC_CONFIG_SRCDIR([libupnpp/upnpplib.hxx])
28
AC_CONFIG_HEADERS([libupnpp/config.h])
28
AC_CONFIG_HEADERS([libupnpp/config.h])
29
AH_BOTTOM([#include "libupnpp/conf_post.h"])
29
AH_BOTTOM([#include "libupnpp/conf_post.h"])
...
...
57
AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support])
57
AC_DEFINE([_LARGE_FILE_SOURCE], [], [Large files support])
58
AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
58
AC_DEFINE([_FILE_OFFSET_BITS], [64], [File Offset size])
59
59
60
AC_CHECK_LIB([rt], [clock_gettime], [], [])
60
AC_CHECK_LIB([rt], [clock_gettime], [], [])
61
AC_CHECK_LIB([pthread], [pthread_create], [], [])
61
AC_CHECK_LIB([pthread], [pthread_create], [], [])
62
63
# The 2 following checks for libthreadutil and libixml are normally
64
# unnecessary and even problematic. libupnpp does not use them directly,
65
# and they should be used automatically because libupnpp is linked with them.
66
# Still you may need them to include them on some systems where the
67
# automatic link does not work.
68
dnl AC_CHECK_LIB([threadutil], [TimerThreadRemove], [],
69
dnl     AC_MSG_ERROR([libthreadutil (part of libupnp) not found]))
70
dnl AC_CHECK_LIB([ixml], [ixmlDocument_getElementsByTagName], [], 
71
dnl     AC_MSG_ERROR([libixml (part of libupnp) not found]))
72
62
AC_CHECK_LIB([upnp], [UpnpInit], [], AC_MSG_ERROR([libupnp not found]))
73
AC_CHECK_LIB([upnp], [UpnpInit], [], AC_MSG_ERROR([libupnp not found]))
63
AC_CHECK_LIB([curl], [curl_easy_init], [], AC_MSG_ERROR([libcurl not found]))
74
AC_CHECK_LIB([curl], [curl_easy_init], [], AC_MSG_ERROR([libcurl not found]))
64
AC_CHECK_LIB([ixml], [ixmlDocument_getElementsByTagName], [], 
65
           AC_MSG_ERROR([libixml (usually installed as part of libupnp) not found]))
66
AC_CHECK_FUNCS([getifaddrs] [UpnpSetLogLevel])
75
AC_CHECK_FUNCS([getifaddrs] [UpnpSetLogLevel])
67
AC_CHECK_LIB([expat], [XML_ParserCreate], [], 
76
AC_CHECK_LIB([expat], [XML_ParserCreate], [], 
68
              AC_MSG_ERROR([libexpat not found]))
77
              AC_MSG_ERROR([libexpat not found]))
69
LIBUPNPP_LIBS="$LIBS"
78
LIBUPNPP_LIBS="$LIBS"
79
80
echo "LIBUPNPP_LIBS $LIBUPNPP_LIBS"
70
81
71
LIBS=""
82
LIBS=""
72
                     
83
                     
73
AC_SUBST(LIBUPNPP_LIBS)
84
AC_SUBST(LIBUPNPP_LIBS)
74
AC_SUBST(VERSION_INFO)
85
AC_SUBST(VERSION_INFO)