[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdemultimedia
From:       Michael Pyne <michael.pyne () kdemail ! net>
Date:       2006-09-23 22:41:29
Message-ID: 1159051289.393630.13176.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 587757 by mpyne:

Fix bug 134355 (configure script fails when using --without-akode option) by using \
the patches provided by Rex Dieter and Juuso Alasuutari.

The AM_CONDITIONAL checks for whether to install the aKode .mcopclass files must \
always be run it seems, even if aKode is configured to not install, otherwise a \
autoconf sanity check will fail when running configure.

I've also taken the liberty of moving the aKode stuff to akode_artsplugin since that \
is the Makefile.am that uses these particular AM_CONDITIONALS().  (This was the Rex \
Dieter patch).

P.S. Bug 116958 wasn't really a duplicate of 134355, 134355 was caused by the fix for
116958. ;)

BUG:134355


 M  +13 -1     akode_artsplugin/configure.in.in  
 M  +0 -12     configure.in.in  


--- branches/KDE/3.5/kdemultimedia/akode_artsplugin/configure.in.in #587756:587757
@@ -1,4 +1,16 @@
 if test x$build_arts != xyes || test x$have_akode != xyes
 then
-DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"
+  DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"
+else
+  KDE_CHECK_LIB(akode_mpeg_decoder,   mpeg_decoder,   have_akode_mpeg=yes,   \
have_akode_mpeg=no,   -lakode) +  KDE_CHECK_LIB(akode_mpc_decoder,    mpc_decoder,    \
have_akode_mpc=yes,    have_akode_mpc=no,    -lakode) +  \
KDE_CHECK_LIB(akode_xiph_decoder,   xiph_decoder,   have_akode_xiph=yes,   \
have_akode_xiph=no,   -lakode) +  KDE_CHECK_LIB(akode_ffmpeg_decoder, ffmpeg_decoder, \
have_akode_ffmpeg=yes, have_akode_ffmpeg=no, -lakode)  fi
+
+# This must always be called to handle the --without-akode case, as autoconf
+# will check these conditionals values it seems.
+AM_CONDITIONAL(include_akode_mpeg,   test x$have_akode_mpeg = xyes)
+AM_CONDITIONAL(include_akode_mpc,    test x$have_akode_mpc = xyes)
+AM_CONDITIONAL(include_akode_xiph,   test x$have_akode_xiph = xyes)
+AM_CONDITIONAL(include_akode_ffmpeg, test x$have_akode_ffmpeg = xyes)
--- branches/KDE/3.5/kdemultimedia/configure.in.in #587756:587757
@@ -367,20 +367,8 @@
 
   AC_SUBST(akode_includes)
   AC_SUBST(akode_libs)
-
-  KDE_CHECK_LIB(akode_mpeg_decoder,   mpeg_decoder,   have_akode_mpeg=yes,   \
                have_akode_mpeg=no,   -lakode)
-  KDE_CHECK_LIB(akode_mpc_decoder,    mpc_decoder,    have_akode_mpc=yes,    \
                have_akode_mpc=no,    -lakode)
-  KDE_CHECK_LIB(akode_xiph_decoder,   xiph_decoder,   have_akode_xiph=yes,   \
                have_akode_xiph=no,   -lakode)
-  KDE_CHECK_LIB(akode_ffmpeg_decoder, ffmpeg_decoder, have_akode_ffmpeg=yes, \
                have_akode_ffmpeg=no, -lakode)
-
-  AM_CONDITIONAL(include_akode_mpeg,   test x$have_akode_mpeg = xyes)
-  AM_CONDITIONAL(include_akode_mpc,    test x$have_akode_mpc = xyes)
-  AM_CONDITIONAL(include_akode_xiph,   test x$have_akode_xiph = xyes)
-  AM_CONDITIONAL(include_akode_ffmpeg, test x$have_akode_ffmpeg = xyes)
-
 ])
 
-
 AC_DEFUN([KDE_CHECK_MPEGLIB_ARTS],
 [
   MPEGLIB_ARTS_MAJOR_VERSION=0


[prev in list] [next in list] [prev in thread] [next in thread]