Switch to unified view

a/configure.ac b/configure.ac
...
...
46
  AC_CONFIG_FILES(cfgui/upmpdcli-config.pro)
46
  AC_CONFIG_FILES(cfgui/upmpdcli-config.pro)
47
  QMAKE=$QMAKEPATH
47
  QMAKE=$QMAKEPATH
48
  AC_SUBST(QMAKE)
48
  AC_SUBST(QMAKE)
49
fi
49
fi
50
50
51
AC_ARG_ENABLE(spotify, AC_HELP_STRING([--enable-spotify],
52
              [Enable spotify streaming module. Needs libspotify]),
53
              enableSpotify=$enableval, enableSpotify="no")
54
AM_CONDITIONAL(ENABLESPOTIFY, [test X$enableSpotify = Xyes])
55
51
# The 3 following checks for libthreadutil libixml and libupnp are normally
56
# The 3 following checks for libthreadutil libixml and libupnp are normally
52
# unnecessary and even problematic. upmpdcli does not use them directly,
57
# unnecessary and even problematic. upmpdcli does not use them directly,
53
# and they should be used automatically because libupnpp is linked with them.
58
# and they should be used automatically because libupnpp is linked with them.
54
# Still you may need them to include them on some systems where the
59
# Still you may need them to include them on some systems where the
55
# automatic link does not work.
60
# automatic link does not work.
...
...
70
    [AC_MSG_ERROR([libmicrohttpd not found])])
75
    [AC_MSG_ERROR([libmicrohttpd not found])])
71
76
72
PKG_CHECK_MODULES([jsoncpp], [jsoncpp], [], [AC_MSG_ERROR([jsoncpp not found])])
77
PKG_CHECK_MODULES([jsoncpp], [jsoncpp], [], [AC_MSG_ERROR([jsoncpp not found])])
73
78
74
UPMPDCLI_LIBS="$LIBS $upnpp_LIBS $libmpdclient_LIBS $libmicrohttpd_LIBS $jsoncpp_LIBS"
79
UPMPDCLI_LIBS="$LIBS $upnpp_LIBS $libmpdclient_LIBS $libmicrohttpd_LIBS $jsoncpp_LIBS"
80
81
if test X$enableSpotify = Xyes; then
82
   UPMPDCLI_LIBS="$UPMPDCLI_LIBS -ldl "
83
fi
84
75
echo "UPMPDCLI_LIBS=$UPMPDCLI_LIBS"
85
echo "UPMPDCLI_LIBS=$UPMPDCLI_LIBS"
76
86
77
LIBS=""
87
LIBS=""
78
88
79
#### Functions
89
#### Functions