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

List:       kde-commits
Subject:    Re: KDE/kdemultimedia
From:       Gregorio Guidi <greg_g () gentoo ! org>
Date:       2005-07-12 16:28:37
Message-ID: 200507121828.37685.greg_g () gentoo ! org
[Download RAW message or body]

On Tuesday 12 July 2005 17:30, Caleb Tennis wrote:
> On Tuesday 12 July 2005 08:59 am, Thiago Macieira wrote:
> > I see several Makefile.ams modified, with variables that should contain
> > pathnames removed. Are you sure they compile for non-standard (non
> > $prefix, non /usr, non /usr/local) installations?

This refers to three cases: vorbis, cdparanoia and lame, which in fact are 
port of the more "extreme" patch, which changes quite a lot of things inside 
kdemultimedia and that I agree to back out if it causes any trouble.

For all vorbis, cdparanoia and lame there were duplicated checks spread over 
the kdemultimedia modules, and in the case of vorbis some of these checks 
supported specific code for non-standard locations while some did not (so 
passing a non-standard location for libvorbis resulted in some part of 
kdemultimedia compiled with vorbis support and some without).

In the simplified code I wrote to replace all the duplicated checks, there is 
no longer specific support for non-standard dirs (hence the Makefile.am 
changes), however, as for any other lib, non-standard dirs support is always 
present at global level, actually in two ways: the standard autotools way of 
passing CPPFLAGS and LDFLAGS to configure, and the KDE way of passing 
--with-extra-includes and --with-extra-libs.

(...I just made a test, the second method needs the simple fix below to work, 
but after that it works fine.)

> It was brought up a while back (few months ago) by another Gentoo
> developer. The implementation took a little while to work out.  We talked
> about opening a bug for comments, but I seriously doubted we'd get any one
> to comment.  If it turns out to be problematic, I'll revert.

Btw, the old thread is here:
http://lists.kde.org/?l=kde-devel&m=110661001924653&w=2

["kdemultimedia-extra-libs.patch" (text/x-diff)]

Index: configure.in.in
===================================================================
--- configure.in.in	(revision 434009)
+++ configure.in.in	(working copy)
@@ -92,22 +92,22 @@
 [
   have_oggvorbis=yes
 
-  AC_CHECK_LIB(ogg, ogg_page_version,
+  KDE_CHECK_LIB(ogg, ogg_page_version,
     [:], [have_oggvorbis=no])
 
   KDE_CHECK_HEADER(vorbis/vorbisfile.h,
     [:], [have_oggvorbis=no])
 
-  AC_CHECK_LIB(vorbis, vorbis_info_init,
+  KDE_CHECK_LIB(vorbis, vorbis_info_init,
     [:], [have_oggvorbis=no])
 
-  AC_CHECK_LIB(vorbisfile, ov_open,
+  KDE_CHECK_LIB(vorbisfile, ov_open,
     [:], [have_oggvorbis=no], -lvorbis -logg)
 
-  AC_CHECK_LIB(vorbisenc, vorbis_info_clear,
+  KDE_CHECK_LIB(vorbisenc, vorbis_info_clear,
     [:], [have_oggvorbis=no])
 
-  AC_CHECK_LIB(vorbisenc, vorbis_bitrate_addblock,
+  KDE_CHECK_LIB(vorbisenc, vorbis_bitrate_addblock,
     [have_vorbis_value=2], [have_vorbis_value=1])
 
   if test "x$have_oggvorbis" = xyes; then
@@ -251,7 +251,7 @@
   KDE_CHECK_HEADER(cdda_interface.h,
     [:], [have_cdparanoia=no])
 
-  AC_CHECK_LIB(cdda_paranoia, paranoia_init,
+  KDE_CHECK_LIB(cdda_paranoia, paranoia_init,
     [:], [have_cdparanoia=no], [-lcdda_interface -lm])
 
   # because of the horrible hack we need shared cdparanoia
@@ -296,7 +296,7 @@
   KDE_CHECK_HEADER(lame/lame.h,
     [:], [have_lame=no])
 
-  AC_CHECK_LIB(mp3lame, lame_init,
+  KDE_CHECK_LIB(mp3lame, lame_init,
     [:], [have_lame=no], [-lm])
 
   if test "x$have_lame" = xyes; then


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