← Back to branch summary

~ubuntu-branches/ubuntu/maverick/rhythmbox/maverick

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-08-24 17:19:03 UTC
  • mfrom: (1.1.53 upstream)
  • Revision ID: james.westby@ubuntu.com-20100824171903-3ez8k8eexllnhurw
Tags: 0.13.0git20100819-0ubuntu1
https://launchpad.net/bugs/609081
https://launchpad.net/bugs/613617
https://launchpad.net/bugs/620326
* New git version, renamed patches specifics to ubuntu for easier review
* debian/patches/06_build_vala.patch,
  debian/patches/90_git_correct_playback_status.patch,
  debian/patches/91_git_new_mpris.patch:
  - dropped, those changes are in the new version
* debian/control.in:
  - build-depends on libdmapsharing-dev (lp: #609081)
* debian/rhythmbox-plugins.install:
  - install the daap code there (lp: #613617)
* debian/patches/20_pause_button.patch:
  - update by Bilal Akhtar to remove the play pause button label (lp: #620326)

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
59
59
LIBMTP_REQS=0.3.0
60
60
PYGOBJECT_REQUIRED=2.15.4
61
61
WEBKIT_MIN_REQS=1.1.17
62
 
GLIB_GDBUS_REQS=2.25.6
 
62
GLIB_GDBUS_REQS=2.25.12
63
63
 
64
64
AC_MSG_CHECKING([for GNU extension fwrite_unlocked])
65
65
AC_LINK_IFELSE(
593
593
 
594
594
        dnl enable GSEAL if gtk is new enough
595
595
        PKG_CHECK_EXISTS(gtk+-2.0 >= 2.20.0, [CFLAGS="$CFLAGS -DGSEAL_ENABLE"], [])
 
596
 
 
597
        dnl disable deprecated stuff
 
598
        CFLAGS="$CFLAGS $DISABLE_DEPRECATED"
596
599
else
597
600
        AC_MSG_RESULT(no)
598
601
fi
738
741
        [enable_vala=autodetect have_vala=yes])
739
742
AC_MSG_RESULT([$enable_vala])
740
743
if test "x$enable_vala" = "xyes"; then
741
 
        PKG_CHECK_MODULES(VALA, vala-1.0 >= $VALA_REQS, with_vala=yes,
 
744
        PKG_CHECK_MODULES(VALA, vala-0.10 >= $VALA_REQS, with_vala=yes,
742
745
                          with_vala=no)
743
746
        if test "x$with_vala" = "xyes"; then
744
 
                VALAC="`pkg-config --variable=prefix vala-1.0`/bin/valac"
745
 
                VAPIDIR="`pkg-config --variable=vapidir vala-1.0`"
 
747
                VALAC="`pkg-config --variable=prefix vala-0.10`/bin/valac"
 
748
                VAPIDIR="`pkg-config --variable=vapidir vala-0.10`"
746
749
                AC_SUBST([VALAC])
747
750
                AC_SUBST([VAPIDIR])
748
751
        elif test "x$enable_vala" = "xyes"; then
790
793
                             [Disable DAAP support]),,
791
794
              enable_daap=auto)
792
795
if test "x$enable_daap" != "xno"; then
793
 
        PKG_CHECK_MODULES(DMAPSHARING, libdmapsharing-1.9 >= 1.9.0.21,
 
796
        PKG_CHECK_MODULES(DMAPSHARING, libdmapsharing-2.0,
794
797
                          have_libdmapsharing=yes,
795
798
                          have_libdmapsharing=no)
 
799
        if test "x$have_libdmapsharing" = "xno"; then
 
800
                PKG_CHECK_MODULES(DMAPSHARING, libdmapsharing-1.9 >= 1.9.0.21,
 
801
                                  have_libdmapsharing=yes,
 
802
                                  have_libdmapsharing=no)
 
803
        fi
 
804
 
796
805
        if test "x$have_libdmapsharing" = "xno" -a "x$enable_daap" = "xyes"; then
797
806
                AC_MSG_ERROR([DAAP support explicitly requested, but libdmapsharing couldn't be found])
798
807
        fi
823
832
shell/Makefile
824
833
data/Makefile
825
834
data/rhythmbox.desktop.in
 
835
data/rhythmbox-device.desktop.in
826
836
data/ui/Makefile
827
837
data/icons/Makefile
828
838
data/icons/hicolor/Makefile
835
845
data/icons/hicolor/22x22/actions/Makefile
836
846
data/icons/hicolor/22x22/apps/Makefile
837
847
data/icons/hicolor/22x22/places/Makefile
838
 
data/icons/hicolor/22x22/status/Makefile
839
848
data/icons/hicolor/24x24/Makefile
840
849
data/icons/hicolor/24x24/apps/Makefile
841
850
data/icons/hicolor/24x24/places/Makefile
843
852
data/icons/hicolor/32x32/actions/Makefile
844
853
data/icons/hicolor/32x32/apps/Makefile
845
854
data/icons/hicolor/32x32/places/Makefile
846
 
data/icons/hicolor/32x32/status/Makefile
847
855
data/icons/hicolor/48x48/Makefile
848
856
data/icons/hicolor/48x48/apps/Makefile
849
857
data/icons/hicolor/256x256/Makefile
852
860
data/icons/hicolor/scalable/actions/Makefile
853
861
data/icons/hicolor/scalable/apps/Makefile
854
862
data/icons/hicolor/scalable/places/Makefile
855
 
data/icons/hicolor/scalable/status/Makefile
856
863
data/icons/src/Makefile
857
864
sources/Makefile
858
865
sources/sync/Makefile