← Back to branch summary

~ubuntu-branches/ubuntu/natty/mythtv/natty

« back to all changes in this revision

Viewing changes to .pc/40_libudev.patch/configure

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello, Mario Limonciello, Thomas Mashos
  • Date: 2010-06-20 00:11:00 UTC
  • mfrom: (1.1.53 upstream)
  • Revision ID: james.westby@ubuntu.com-20100620001100-yulpns6qg4ksmay6
Tags: 0.23.0+fixes25138-0ubuntu1
https://launchpad.net/bugs/581283
https://launchpad.net/bugs/556204
https://launchpad.net/bugs/574877
[ Mario Limonciello ]
* new upstream checkout (25138)

[ Thomas Mashos ]
* Added missingok for mirobridge log in logrotate (LP: #581283)
* Backend now waits for udev to finish (LP: #556204)
* Added patch to properly detect dbus during compile (LP: #574877)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/40_libudev.patch/configure
1563
1563
libfaac_encoder_deps="libfaac"
1564
1564
libfaad_decoder_deps="libfaad"
1565
1565
libfaad_latm_decoder_deps="libfaad"
1566
 
libfaadbin_decoder_extralibs='$ldl'
 
1566
libfaadbin_extralibs='$ldl'
1567
1567
libgsm_decoder_deps="libgsm"
1568
1568
libgsm_encoder_deps="libgsm"
1569
1569
libgsm_ms_decoder_deps="libgsm"
3199
3199
        check_cflags -maltivec -mabi=altivec &&
3200
3200
        { check_header altivec.h && inc_altivec_h="#include <altivec.h>" ; } ||
3201
3201
        check_cflags -faltivec
 
3202
        check_cxxflags -maltivec -mabi=altivec &&
 
3203
        { check_header altivec.h && inc_altivec_h="#include <altivec.h>" ; } ||
 
3204
        check_cxxflags -faltivec
3202
3205
 
3203
3206
        # check if our compiler supports Motorola AltiVec C API
3204
3207
        check_cc <<EOF || disable altivec
3765
3768
enabled lamemp3 && check_lib2 lame/lame.h lame_init -lmp3lame -lm ||
3766
3769
    die "ERROR! You must have the Lame MP3 encoding library installed to compile MythTV."
3767
3770
 
 
3771
# Qt dependency checks
 
3772
qt_inc="-I${sysroot}/$(${qmake} -query QT_INSTALL_HEADERS)"
 
3773
qt_libs="-L${sysroot}/$(${qmake} -query QT_INSTALL_LIBS)"
 
3774
 
3768
3775
if $(pkg-config --atleast-version 4.4.0 QtWebKit) ; then
3769
3776
    enable qtwebkit
3770
3777
else
3771
 
    # For environments that don't have pkg-config, we do a compile test.
3772
 
    qt_inc="-I${sysroot}/$(${qmake} -query QT_INSTALL_HEADERS)"
3773
 
 
3774
3778
    check_cxx ${qt_inc} ${qt_inc}/QtCore <<EOF && enable qtwebkit
3775
3779
#include <QtWebKit/QtWebKit>
3776
3780
#if QT_VERSION < 0x040400
3782
3786
enabled qtwebkit || die "Error! QtWebkit headers not found"
3783
3787
 
3784
3788
# Check if Qt was built with DBus support:
3785
 
qt_inc="-I${sysroot}/$(${qmake} -query QT_INSTALL_HEADERS)"
3786
 
check_cxx ${qt_inc} ${qt_inc}/QtDBus <<EOF && enable qtdbus
 
3789
check_ld_cxx ${qt_inc} ${qt_inc}/QtDBus ${qt_libs} -lQtDBus <<EOF && enable qtdbus
3787
3790
#include <QtDBus>
 
3791
int main(void){
 
3792
    return (long) QDBusConnection::disconnectFromBus;
 
3793
}
3788
3794
EOF
3789
3795
 
3790
3796
if enabled firewire; then
3846
3852
    VENDOR_XVMC_LIBS="-l"$xvmc_lib
3847
3853
    disable xvmcw
3848
3854
elif enabled xvmcw; then
3849
 
    VENDOR_XVMC_LIBS="-lXvMCW $ldl"
 
3855
    VENDOR_XVMC_LIBS="-lXvMCW"
3850
3856
elif enabled xvmc_pro; then
3851
3857
    if has_library libviaXvMCPro ; then
3852
3858
        VENDOR_XVMC_LIBS="-lviaXvMCPro"
4317
4323
SDL_CFLAGS=$sdl_cflags
4318
4324
LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
4319
4325
EXTRALIBS=$extralibs
 
4326
EXTRA_LIBS=$ldl
4320
4327
EOF
4321
4328
 
4322
4329
get_version(){