Switch to unified view

a/configure.ac b/configure.ac
...
...
68
dnl problematic. libupnpp does not use it directly, Still you may need it to
68
dnl problematic. libupnpp does not use it directly, Still you may need it to
69
dnl add it on some systems.
69
dnl add it on some systems.
70
dnl AC_CHECK_LIB([threadutil], [TimerThreadRemove], [],
70
dnl AC_CHECK_LIB([threadutil], [TimerThreadRemove], [],
71
dnl     AC_MSG_ERROR([libthreadutil (part of libupnp) not found]))
71
dnl     AC_MSG_ERROR([libthreadutil (part of libupnp) not found]))
72
72
73
AC_CHECK_LIB([upnp], [UpnpInit], [], AC_MSG_ERROR([libupnp not found]))
73
PKG_CHECK_MODULES([upnp], [libupnp], [], AC_MSG_ERROR([libupnp not found]))
74
AC_CHECK_LIB([ixml], [ixmlPrintDocument], [], AC_MSG_ERROR([libixml not found]))
75
AC_CHECK_LIB([curl], [curl_easy_init], [], AC_MSG_ERROR([libcurl not found]))
74
PKG_CHECK_MODULES([curl], [libcurl], [], AC_MSG_ERROR([libcurl not found]))
75
PKG_CHECK_MODULES([expat], [expat], [],AC_MSG_ERROR([expat not found]))
76
AC_CHECK_FUNCS([getifaddrs] [UpnpSetLogLevel])
76
AC_CHECK_FUNCS([getifaddrs] [UpnpSetLogLevel])
77
AC_CHECK_LIB([expat], [XML_ParserCreate], [],AC_MSG_ERROR([libexpat not found]))
78
77
79
LIBUPNPP_LIBS="$LIBS"
78
LIBUPNPP_LIBS="$LIBS $upnp_LIBS $curl_LIBS $expat_LIBS"
80
echo "LIBUPNPP_LIBS $LIBUPNPP_LIBS"
79
echo "LIBUPNPP_LIBS $LIBUPNPP_LIBS"
81
80
82
LIBS=""
81
LIBS=""
83
                     
82
                     
84
AC_SUBST(LIBUPNPP_LIBS)
83
AC_SUBST(LIBUPNPP_LIBS)