Switch to unified view

a/configure.ac b/configure.ac
...
...
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)