← Back to branch summary

~ubuntu-branches/ubuntu/quantal/rhythmbox/quantal-proposed

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Rico Tzschichholz
  • Date: 2011-12-05 19:31:23 UTC
  • mfrom: (1.1.60)
  • Revision ID: package-import@ubuntu.com-20111205193123-89047p8yplb0w1vx
Tags: 2.90.1~20111126.89c872b0-0ubuntu1
https://launchpad.net/bugs/875064
https://launchpad.net/bugs/894153
https://launchpad.net/bugs/859195
https://launchpad.net/bugs/814614
https://launchpad.net/bugs/874973
* Upload the new version to Ubuntu, should solve those issues:
  - the lack of rhythmbox-client command (lp: #875064)
  - the music sharing preferences dialog (lp: #894153)
  - several segfaults (lp: #859195, #814614)
* debian/control.in:
  - let the rhythmbox gir depends on gir1.2-peas-1.0 (lp: #874973)

[ Rico Tzschichholz ]
* New upstream git snapshot

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
9
9
 
10
10
AC_SUBST(ACLOCAL_AMFLAGS, "-I macros")
11
11
 
12
 
AM_MAINTAINER_MODE
 
12
AM_MAINTAINER_MODE([enable])
13
13
GNOME_MAINTAINER_MODE_DEFINES
14
14
 
15
15
# plugin API versioning
45
45
 
46
46
GTK_REQS=2.91.4
47
47
 
48
 
DBUS_MIN_REQS=0.35
49
48
GST_0_10_REQS=0.10.32
50
49
GDK_PIXBUF_REQS=2.18.0
51
50
GLIB_REQS=2.26.0
58
57
GUDEV_REQS=143
59
58
LIBMTP_REQS=0.3.0
60
59
LIBPEAS_REQS=0.7.3
 
60
GRILO_REQS=0.1.17
61
61
 
62
62
LIBNOTIFY_REQS=0.7.0
63
63
BRASERO_MIN_REQS=2.31.5
64
64
WEBKIT_MIN_REQS=1.3.9
65
 
PYGOBJECT_REQUIRED=2.28
 
65
PYGOBJECT_REQUIRED=2.90.2
66
66
 
67
67
GLIB_GSETTINGS
68
68
 
144
144
              AC_HELP_STRING([--without-hal],
145
145
                             [Disable HAL support]))
146
146
if test "x$with_hal" != "xno"; then
147
 
  PKG_CHECK_MODULES(HAL, hal >= 0.5 hal < 0.6, enable_hal=yes, enable_hal=no)
 
147
  PKG_CHECK_MODULES(HAL, hal >= 0.5 hal < 0.6 dbus-glib-1, enable_hal=yes, enable_hal=no)
148
148
  if test "x$enable_hal" != "xyes" -a "x$with_hal" = "xyes"; then
149
149
      AC_MSG_ERROR([HAL support explicitly requested but HAL couldn't be found])
150
150
  fi
151
151
 
152
152
  if test "x$enable_hal" = "xyes"; then
153
 
        AC_DEFINE(HAVE_HAL, 1, [Define if you have HAL support])
154
 
        AC_SUBST(HAL_CFLAGS)
 
153
    AC_DEFINE(HAVE_HAL, 1, [Define if you have HAL support])
 
154
    AC_SUBST(HAL_CFLAGS)
155
155
    AC_SUBST(HAL_LIBS)
156
156
  fi    
157
157
fi
471
471
fi
472
472
AC_SUBST(MKINSTALLDIRS)
473
473
 
474
 
dnl DBUS
475
 
PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_MIN_REQS)
476
 
 
477
 
DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_API_SUBJECT_TO_CHANGE"
478
 
DBUS_GLIB_BIN="`$PKG_CONFIG --variable=exec_prefix dbus-glib-1`/bin"
479
 
AC_SUBST(DBUS_GLIB_BIN)
480
 
 
481
474
AM_GCONF_SOURCE_2
482
475
 
483
476
dnl LIRC
640
633
              [enable_python="auto"])
641
634
 
642
635
if test "x$enable_python" = "xauto"; then
643
 
        PKG_CHECK_EXISTS([pygobject-2.0 >= $PYGOBJECT_REQUIRED],
 
636
        PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
644
637
                         [enable_python=yes],[enable_python=no])
645
638
fi
646
639
 
647
640
if test "x$enable_python" = "xyes"; then
648
 
        PKG_CHECK_MODULES(PYTHON, [pygobject-2.0 >= $PYGOBJECT_REQUIRED])
 
641
        PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED])
649
642
 
650
 
        pyoverridesdir=`$PKG_CONFIG --variable=overridesdir pygobject-2.0`
 
643
        pyoverridesdir=`$PKG_CONFIG --variable=overridesdir pygobject-3.0`
651
644
        AC_SUBST(pyoverridesdir)
652
645
fi
653
646
 
735
728
AC_SUBST(DMAPSHARING_LIBS)
736
729
 
737
730
dnl ================================================================
 
731
dnl clutter for visualizer plugin
 
732
dnl ================================================================
 
733
AC_ARG_ENABLE(visualizer,
 
734
              AC_HELP_STRING([--disable-visualizer],
 
735
                             [Disable visualizer plugin support]),,
 
736
              enable_visualizer=auto)
 
737
if test "x$enable_visualizer" != "xno"; then
 
738
        PKG_CHECK_MODULES(CLUTTER,
 
739
                          clutter-1.0 >= 1.2                    \
 
740
                          clutter-x11-1.0 >= 1.2                \
 
741
                          clutter-gst-1.0 >= 1.0                \
 
742
                          clutter-gtk-1.0 >= 1.0                \
 
743
                          mx-1.0 >= 1.0.1,
 
744
                          have_clutter=yes,
 
745
                          have_clutter=no)
 
746
        if test "x$have_clutter" = "xno" -a "x$enable_visualizer" = "xyes"; then
 
747
                AC_MSG_ERROR([Visualizer support explicitly requested, but clutter couldn't be found])
 
748
        fi
 
749
fi
 
750
 
 
751
AM_CONDITIONAL(USE_CLUTTER, test x"$have_clutter" = "xyes")
 
752
 
 
753
AC_SUBST(CLUTTER_CFLAGS)
 
754
AC_SUBST(CLUTTER_LIBS)
 
755
 
 
756
dnl ================================================================
738
757
dnl Dependencies for Last.fm plugin
739
758
dnl ================================================================
740
759
AC_ARG_ENABLE(lastfm,
759
778
AC_SUBST(JSON_GLIB_LIBS)
760
779
 
761
780
dnl ================================================================
 
781
dnl grilo plugin
 
782
dnl ================================================================
 
783
AC_ARG_ENABLE(grilo,
 
784
              AC_HELP_STRING([--disable-grilo],
 
785
                             [Disable Grilo support]),,
 
786
              enable_grilo=auto)
 
787
if test "x$enable_grilo" != "xno"; then
 
788
        PKG_CHECK_MODULES(GRILO, grilo-0.1 >= $GRILO_REQS, have_grilo=yes, have_grilo=no)
 
789
        if test "x$have_grilo" = "xno" -a "x$enable_grilo" = "xyes"; then
 
790
                AC_MSG_ERROR([Grilo support explicitly requested, but grilo couldn not be found])
 
791
        fi
 
792
        if test "x$have_grilo" = "xyes"; then
 
793
                AC_DEFINE(HAVE_GRILO, 1, [Define if Grilo support is enabled])
 
794
        fi
 
795
fi
 
796
 
 
797
AM_CONDITIONAL(ENABLE_GRILO, test x"$have_grilo" = "xyes")
 
798
AC_SUBST(GRILO_CFLAGS)
 
799
AC_SUBST(GRILO_LIBS)
 
800
 
 
801
dnl ================================================================
762
802
dnl end-game
763
803
dnl ================================================================
764
804
 
824
864
plugins/pythonconsole/Makefile
825
865
plugins/artdisplay/Makefile
826
866
plugins/magnatune/Makefile
827
 
plugins/jamendo/Makefile
828
867
plugins/generic-player/Makefile
829
868
plugins/rb/Makefile
830
869
plugins/power-manager/Makefile
836
875
plugins/dbus-media-server/Makefile
837
876
plugins/rbzeitgeist/Makefile
838
877
plugins/notification/Makefile
 
878
plugins/visualizer/Makefile
 
879
plugins/grilo/Makefile
839
880
bindings/Makefile
840
881
bindings/vala/Makefile
841
882
bindings/gi/Makefile