diff options
Diffstat (limited to '')
| -rw-r--r-- | configure.ac | 79 |
1 files changed, 45 insertions, 34 deletions
diff --git a/configure.ac b/configure.ac index 9edf357fa..c8a2152ba 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.14~beta1, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.15~git, musicpd-dev-team@lists.sourceforge.net) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2]) AM_CONFIG_HEADER(config.h) @@ -94,8 +94,8 @@ AC_ARG_ENABLE(tcp, [enable_tcp=yes]) AC_ARG_ENABLE(un, - AS_HELP_STRING([--enable-un], - [enable support for clients connecting via unix domain sockets (default: disable)]), + AS_HELP_STRING([--disable-un], + [disable support for clients connecting via unix domain sockets (default: enable)]), [enable_un=$enableval], [enable_un=yes]) @@ -121,14 +121,14 @@ AC_ARG_ENABLE(ao, enable_ao=$enableval, enable_ao=no) -AC_ARG_ENABLE(shout_ogg, - AS_HELP_STRING([--disable-shout_ogg], +AC_ARG_ENABLE(shout-ogg, + AS_HELP_STRING([--disable-shout-ogg], [disable support for ogg streaming through shout (default: enable)]), [enable_shout_ogg=$enableval], [enable_shout_ogg=yes]) -AC_ARG_ENABLE(shout_mp3, - AS_HELP_STRING([--disable-shout_mp3], +AC_ARG_ENABLE(shout-mp3, + AS_HELP_STRING([--disable-shout-mp3], [disable support for mp3 streaming through shout (default: enable)]), [enable_shout_mp3=$enableval], [enable_shout_mp3=yes]) @@ -266,7 +266,7 @@ AC_ARG_ENABLE(mod, AS_HELP_STRING([--enable-mod], [enable MOD support (default: disable)]), enable_mod=$enableval, - enable_mod=yes) + enable_mod=no) AC_ARG_ENABLE(mpc, AS_HELP_STRING([--disable-mpc], @@ -318,6 +318,9 @@ AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",) AC_CHECK_LIB(m,exp,MPD_LIBS="$MPD_LIBS -lm",) AC_CHECK_FUNCS(setenv) +# Check for pkg-config before using it +PKG_PROG_PKG_CONFIG + PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4 gthread-2.0],, [AC_MSG_ERROR([glib-2.4 is required])]) @@ -381,10 +384,9 @@ fi AM_CONDITIONAL(HAVE_CURL, test x$enable_curl = xyes) if test x$enable_shout_ogg = xyes || test x$enable_shout_mp3 = xyes; then - enable_shout=yes - PKG_CHECK_MODULES([SHOUT], [shout], - AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]), - enable_shout=no) + PKG_CHECK_MODULES([SHOUT], [shout],, + [enable_shout_ogg=no; enable_shout_mp3=no; + AC_MSG_WARN([disabling shout streaming support because libshout is not available])]) fi if test x$enable_shout_ogg = xyes; then @@ -396,10 +398,6 @@ if test x$enable_shout_ogg = xyes; then AC_MSG_WARN([disabling ogg shout streaming support because tremor does not support vorbis encoding]) enable_shout_ogg=no fi - if test x$enable_shout = xno; then - AC_MSG_WARN([disabling ogg shout streaming support because libshout is not found]) - enable_shout_ogg=no - fi if test x$enable_shout_ogg = xyes; then PKG_CHECK_MODULES(VORBISENC, [vorbisenc], AC_DEFINE(HAVE_SHOUT_OGG, 1, [Define to enable ogg streaming support]), @@ -407,20 +405,28 @@ if test x$enable_shout_ogg = xyes; then fi fi +if test x$enable_lame = xyes; then + AM_PATH_LAME([MPD_LIBS="$MPD_LIBS $LAME_LIBS" MPD_CFLAGS="$MPD_CFLAGS $LAME_CFLAGS"], + [enable_lame=no; AC_MSG_WARN(You need lame -- disabling lame support)]) +fi + if test x$enable_shout_mp3 = xyes; then if test x$enable_lame = xno; then AC_MSG_WARN([disabling mp3 shout streaming support because lame is not enabled]) enable_shout_mp3=no fi - if test x$enable_shout = xno; then - AC_MSG_WARN([disabling mp3 shout streaming support because libshout is not found]) - enable_shout_mp3=no - fi if test x$enable_shout_mp3 = xyes; then AC_DEFINE(HAVE_SHOUT_MP3, 1, [Define to enable mp3 streaming support]) fi fi +if test x$enable_shout_ogg = xyes || test x$enable_shout_mp3 = xyes; then + enable_shout=yes + AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]) +else + enable_shout=no +fi + AM_CONDITIONAL(HAVE_SHOUT, test x$enable_shout = xyes) AM_CONDITIONAL(HAVE_SHOUT_OGG, test x$enable_shout_ogg = xyes) AM_CONDITIONAL(HAVE_SHOUT_MP3, test x$enable_shout_mp3 = xyes) @@ -508,11 +514,6 @@ fi AM_CONDITIONAL(HAVE_MAD, test x$enable_mp3 = xyes) -if test x$enable_lame = xyes; then - AM_PATH_LAME([MPD_LIBS="$MPD_LIBS $LAME_LIBS" MPD_CFLAGS="$MPD_CFLAGS $LAME_CFLAGS"], - [enable_lame=no;AC_MSG_WARN(You need lame -- disabling lame support)]) -fi - if test x$enable_mpc = xyes; then if test "x$mpcdec_libraries" != "x" ; then @@ -951,15 +952,6 @@ then MPD_CHECK_FLAG([-pedantic]) fi - -dnl -dnl generate files -dnl - - -AC_OUTPUT(doc/Makefile src/Makefile Makefile) - - dnl dnl pretty-print result dnl @@ -1192,6 +1184,13 @@ else echo " Zeroconf support ..............disabled" fi + +if test x$enable_curl != xno; then + echo " HTTP streaming (libcurl) ......enabled" +else + echo " HTTP streaming (libcurl) ......disabled" +fi + if test x$enable_bz2 = xyes; then echo " BZ2 archives support ..........enabled" else @@ -1213,5 +1212,17 @@ fi echo "" echo "##########################################" echo "" + +echo "Generating needed files for compilation" +echo "" + +dnl +dnl generate files +dnl + +AC_OUTPUT(doc/Makefile src/Makefile Makefile) + +echo "" + echo "You are now ready to compile MPD" echo "Type \"make\" to compile MPD" |