Annotation of /trunk/xine-lib/patches/xine-lib-1.1.1-modplug.patch
Parent Directory
| 
Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
File size: 1659 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
File size: 1659 byte(s)
-import
| 1 | niro | 153 | Index: xine-lib-1.1.1/configure.ac |
| 2 | =================================================================== | ||
| 3 | --- xine-lib-1.1.1.orig/configure.ac | ||
| 4 | +++ xine-lib-1.1.1/configure.ac | ||
| 5 | @@ -1760,20 +1760,15 @@ AM_CONDITIONAL(EXTERNAL_LIBDTS, test x"$ | ||
| 6 | dnl --------------------------------------------- | ||
| 7 | dnl libmodplug support | ||
| 8 | dnl --------------------------------------------- | ||
| 9 | -if test x$PKG_CONFIG = xno ; then | ||
| 10 | - echo "*** pkg-config not found. See http://pkgconfig.sourceforge.net" | ||
| 11 | - echo "*** All of MODPLUG dependent parts will be disabled" | ||
| 12 | -else | ||
| 13 | - LIBMODPLUG_REQUIRED_VERSION=0.7 | ||
| 14 | - if $PKG_CONFIG --atleast-version $LIBMODPLUG_REQUIRED_VERSION libmodplug ; then | ||
| 15 | - LIBMODPLUG_CFLAGS=`$PKG_CONFIG --cflags libmodplug` | ||
| 16 | - LIBMODPLUG_LIBS=`$PKG_CONFIG --libs libmodplug` | ||
| 17 | - AC_DEFINE(HAVE_MODPLUG,1,[define this if you have libmodplug installed]) | ||
| 18 | - have_modplug="yes" | ||
| 19 | - else | ||
| 20 | - AC_MSG_RESULT([*** All of MODPLUG dependent parts will be disabled ***]) | ||
| 21 | - fi | ||
| 22 | +AC_ARG_ENABLE([modplug], | ||
| 23 | + AS_HELP_STRING([--enable-modplug], [Enable modplub support]) ) | ||
| 24 | + | ||
| 25 | +if test "x$enable_modplug" != "xno"; then | ||
| 26 | + PKG_CHECK_MODULES([LIBMODPLUG], [libmodplug >= 0.7], | ||
| 27 | + AC_DEFINE([HAVE_MODPLUG], 1, [define this if you have libmodplug installed]), | ||
| 28 | + [enable_modplug=no]) | ||
| 29 | fi | ||
| 30 | + | ||
| 31 | AC_SUBST(LIBMODPLUG_CFLAGS) | ||
| 32 | AC_SUBST(LIBMODPLUG_LIBS) | ||
| 33 | dnl AM_CONDITIONAL(HAVE_MODPLUG, [test x"$have_modplug" = x"yes"]) | ||
| 34 | @@ -2415,7 +2410,7 @@ fi | ||
| 35 | if test x"$have_libmng" = "xyes"; then | ||
| 36 | echo " - mng" | ||
| 37 | fi | ||
| 38 | -if test x"$have_modplug" = x"yes"; then | ||
| 39 | +if test x"$enable_modplug" != x"no"; then | ||
| 40 | echo " - mod" | ||
| 41 | fi | ||
| 42 | if test x"$enable_a52dec" = "xyes"; then |