Switch to unified view

a/configure.ac b/configure.ac
...
...
33
dnl    AC_MSG_ERROR([libixml (usually installed as part of libupnp) not found]))
33
dnl    AC_MSG_ERROR([libixml (usually installed as part of libupnp) not found]))
34
dnl AC_CHECK_LIB([upnp], [UpnpInit], [], AC_MSG_ERROR([libupnp not found]))
34
dnl AC_CHECK_LIB([upnp], [UpnpInit], [], AC_MSG_ERROR([libupnp not found]))
35
dnl AC_CHECK_LIB([curl], [curl_easy_init], [],AC_MSG_ERROR([libcurl not found]))
35
dnl AC_CHECK_LIB([curl], [curl_easy_init], [],AC_MSG_ERROR([libcurl not found]))
36
dnl AC_CHECK_LIB([expat], [XML_ParserCreate], [],AC_MSG_ERROR([libexpat not found]))
36
dnl AC_CHECK_LIB([expat], [XML_ParserCreate], [],AC_MSG_ERROR([libexpat not found]))
37
37
38
AC_CHECK_LIB([upnpp], [getsyshwaddr], [], [AC_MSG_ERROR([libupnpp])])
38
PKG_CHECK_MODULES([upnpp], [libupnpp], [], [AC_MSG_ERROR([libupnpp])])
39
AC_CHECK_LIB([mpdclient], [mpd_connection_new], [],
39
AC_CHECK_LIB([mpdclient], [mpd_connection_new], [],
40
                          AC_MSG_ERROR([libmpdclient not found]))
40
                          AC_MSG_ERROR([libmpdclient not found]))
41
SCCTL_LIBS=$LIBS
41
SCCTL_LIBS="$LIBS $upnpp_LIBS"
42
42
43
AC_CHECK_LIB([microhttpd], [MHD_queue_response], [], [])
43
AC_CHECK_LIB([microhttpd], [MHD_queue_response], [], [])
44
44
45
AC_LANG_PUSH([C++])
45
AC_LANG_PUSH([C++])
46
46
...
...
54
    #endif]], [Json::Features dummy])],
54
    #endif]], [Json::Features dummy])],
55
    [HAVE_JSONCPP=1],
55
    [HAVE_JSONCPP=1],
56
    [AC_MSG_ERROR([libjsoncpp not found.])])
56
    [AC_MSG_ERROR([libjsoncpp not found.])])
57
AC_LANG_POP
57
AC_LANG_POP
58
58
59
UPMPDCLI_LIBS=$LIBS
59
UPMPDCLI_LIBS="$LIBS $upnpp_LIBS"
60
echo "UPMPDCLI_LIBS=$LIBS"
60
echo "UPMPDCLI_LIBS=$UPMPDCLI_LIBS"
61
61
62
LIBS=""
62
LIBS=""
63
63
64
AC_SUBST(UPMPDCLI_LIBS)
64
AC_SUBST(UPMPDCLI_LIBS)
65
AC_SUBST(SCCTL_LIBS)
65
AC_SUBST(SCCTL_LIBS)