diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-03-16 01:53:27 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-03-16 01:53:27 +0000 |
| commit | a4f953a60a8784d99c3a4865527d93d2e8376e3b (patch) | |
| tree | 2c9309f7c7fb2dfcf55def2442ff3da99cb63780 | |
| parent | 83ffe8a16e264c85cb140d32d74a0170fb0673e3 (diff) | |
| download | xine-lib-a4f953a60a8784d99c3a4865527d93d2e8376e3b.tar.gz xine-lib-a4f953a60a8784d99c3a4865527d93d2e8376e3b.tar.bz2 | |
Stop libstk checks from being automagic, by providing a --with/--without switch for it. Default for it to be disabled, as the libstk site is no more available, and at least on Debian, libstk is a totally different package.
CVS patchset: 8670
CVS date: 2007/03/16 01:53:27
| -rw-r--r-- | configure.ac | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index b81e15597..056f230aa 100644 --- a/configure.ac +++ b/configure.ac @@ -1100,27 +1100,17 @@ dnl --------------------------------------------- dnl check for Libstk dnl --------------------------------------------- -AC_MSG_CHECKING(for Libstk) -dnl do some actual testing here -if test "x$PKG_CONFIG" = xno ; then - AC_MSG_RESULT(no) - echo "*** pkg-config not found. See http://pkgconfig.sourceforge.net" - echo "*** All of LIBSTK dependent parts will be disabled" -else - LIBSTK_REQUIRED_VERSION=0.2.0 - if $PKG_CONFIG --atleast-version $LIBSTK_REQUIRED_VERSION libstk ; then - LIBSTK_CFLAGS=`$PKG_CONFIG --cflags libstk` - LIBSTK_LIBS=`$PKG_CONFIG --libs libstk` - have_stk="yes" - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - AC_MSG_RESULT([*** All of Libstk dependent parts will be disabled ***]) - fi +AC_ARG_WITH([libstk], + AS_HELP_STRING([--with-libstk], [Build with STK surface video driver])) + +if test "x$with_libstk" != "xno"; then + PKG_CHECK_MODULES([LIBSTK], [libstk >= 0.2.0], [have_libstk=yes], [have_libstk=no]) + if test "x$with_libstk" = "xyes" && test "x$have_libstk" = "xno"; then + AC_MSG_ERROR([libstk support requested, but libstk not found]) + fi fi -AC_SUBST(LIBSTK_CFLAGS) -AC_SUBST(LIBSTK_LIBS) -AM_CONDITIONAL(HAVE_STK, [test "x$have_stk" = x"yes"]) + +AM_CONDITIONAL([HAVE_STK], [test "x$have_libstk" = "xyes"]) dnl --------------------------------------------- dnl check for pulseaudio @@ -3037,7 +3027,7 @@ fi if test "x$have_sdl" = "xyes"; then echo " - sdl (Simple DirectMedia Layer)" fi -if test "x$have_stk" = "xyes"; then +if test "x$have_libstk" = "xyes"; then echo " - stk (Libstk Set-top Toolkit)" fi if test "x$have_directfb" = "xyes"; then |