diff options
| author | topfs2 <topfs2@svn> | 2010-02-14 13:16:20 +0000 |
|---|---|---|
| committer | topfs2 <topfs2@svn> | 2010-02-14 13:16:20 +0000 |
| commit | c6771db8b2fa54d139d808dcf22d1c4b2096d1c7 (patch) | |
| tree | 68b39517dc0b333d6ddaa3db0fbb2b6329eef343 /configure.in | |
| parent | b755c0bcb9cec1597e25f241dd21be46d71dd062 (diff) | |
Merge commit 'origin/jsonrpc' into trunk
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27770 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 8100fa10f5..7c3f2baba5 100644 --- a/configure.in +++ b/configure.in @@ -188,6 +188,11 @@ AC_ARG_ENABLE([asap-codec], [enable ASAP ADPCM support])], [use_asap=$enableval], [use_asap=no]) +AC_ARG_ENABLE([webserver], + [AS_HELP_STRING([--disable-webserver], + [disable webserver])], + [use_webserver=$enableval], + [use_webserver=yes]) AC_ARG_ENABLE([libdts], [AS_HELP_STRING([--enable-libdts], [enable deprecated libdts support])], @@ -306,6 +311,12 @@ else AC_CHECK_LIB([SDL_gfx], [main]) fi +if test "$host_vendor" != "apple" ; then + if test "$use_webserver" = "yes"; then + AC_CHECK_LIB([microhttpd], [main],, AC_MSG_ERROR($missing_library)) + fi +fi + # platform independent libraries AC_CHECK_HEADER([mad.h],, AC_MSG_ERROR($missing_library)) @@ -937,6 +948,15 @@ else final_message="$final_message\n ASAP Codec:\tNo" fi +if test "$use_webserver" = "yes"; then + final_message="$final_message\n Webserver:\tYes" + HAVE_XBMC_NONFREE=1 + AC_DEFINE([HAS_WEB_SERVER], [1], [Define to 1 to enable webserver.]) +else + HAS_WEB_SERVER=0 + final_message="$final_message\n Webserver:\tNo" +fi + if test "$use_libdts" = "yes"; then USE_LIBDTS_DECODER=1 AC_DEFINE([USE_LIBDTS_DECODER], [1], [Define to 1 to enable deprecated libdts support]) @@ -1021,7 +1041,9 @@ OUTPUT_FILES="Makefile \ xbmc/lib/libexif/Makefile \ xbmc/lib/libXDAAP/Makefile \ xbmc/lib/libhdhomerun/Makefile \ - xbmc/lib/libGoAhead/Makefile \ + xbmc/lib/libhttpapi/Makefile \ + lib/jsoncpp/jsoncpp/src/lib_json/Makefile \ + xbmc/lib/libjsonrpc/Makefile \ xbmc/lib/libshout/Makefile \ xbmc/lib/libsquish/Makefile \ xbmc/lib/libid3tag/Makefile \ |