← Back to branch summary

~ubuntu-branches/ubuntu/maverick/brasero/maverick

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-09-14 10:23:22 UTC
  • mfrom: (1.1.44 upstream)
  • Revision ID: james.westby@ubuntu.com-20100914102322-7eigq8pge5wqfol1
Tags: 2.31.92-0ubuntu1
* New upstream release:
  - Revert to libunique from GApplication (Luis Medinas)
  - Remove dbus-glib requires from pkgconfig file (Luis Medinas)
  - Some more debugging to find out about problems with encrypted DVDs
    (Philippe Rouquier)
  - Fix minor issues in gdbus conversion. (Luis Medinas)
  - Remove dbus-glib check from configure (Luis Medinas)
  - Replace last part of dbus-glib by GDBus (Luis Medinas)
  - Fix Inhibit() d-bus parameters (Robert Ancell)
  - Remove dbus libraries from the Makefile. (Luis Medinas)
  - Use --with-gtk switch for gtk 2/3 selection (Christian Persch)
  - Fix image checksuming that did not occur when GConf or GSetting returned 0
    as a value for the checksum type key (Philippe Rouquier)
  - Don't hardcode gconf gsettings backend (Robert Ancell)
  - Fix brasero plugin directory (Robert Ancell)
* debian/control:
  - build-dep on libunique
* debian/patches/010_lpi.patch,31_link_libice.patch:
  - adapt to latest code
* debian/patches/013_gsettings_backend.patch,014_plugin_directory.patch,
  015_inhibit_params.patch:
  - removed, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
1
1
dnl Process this file with autoconf to produce a configure script.
2
 
AC_INIT([brasero],[2.31.91])
 
2
AC_INIT([brasero],[2.31.92])
3
3
AC_CONFIG_SRCDIR(src/main.c)
4
4
 
5
5
BRASERO_MAJOR_VERSION=2
6
6
BRASERO_MINOR_VERSION=31
7
 
BRASERO_SUB=91
 
7
BRASERO_SUB=92
8
8
BRASERO_VERSION=$BRASERO_MAJOR_VERSION.$BRASERO_MINOR_VERSION.$BRASERO_SUB
9
9
 
10
10
AC_SUBST(BRASERO_MAJOR_VERSION)
147
147
GSTREAMER_REQUIRED=0.10.15
148
148
GSTREAMER_BASE_REQUIRED=0.10.0
149
149
LIBXML2_REQUIRED=2.6.0
150
 
DBUS_REQUIRED=0.7.2
 
150
LIBUNIQUE_REQUIRED=1.0.0
151
151
 
152
152
dnl ** used by brasero and one plugin
153
153
PKG_CHECK_MODULES(BRASERO_GSTREAMER,                    \
174
174
AC_SUBST(BRASERO_LIBXML_CFLAGS)
175
175
AC_SUBST(BRASERO_LIBXML_LIBS)
176
176
 
 
177
dnl ** used by brasero
 
178
PKG_CHECK_MODULES([BRASERO_LIBUNIQUE],[unique-1.0 >= $LIBUNIQUE_REQUIRED])
 
179
AC_SUBST([BRASERO_LIBUNIQUE_CFLAGS])
 
180
AC_SUBST([BRASERO_LIBUNIQUE_LIBS])
 
181
 
177
182
dnl ** used by brasero and both libraries
178
183
PKG_CHECK_MODULES(BRASERO_GTHREAD,              \
179
184
        gthread-2.0 >= $GTHREAD_REQUIRED)
207
212
AC_SUBST(BRASERO_GMODULE_EXPORT_CFLAGS)
208
213
AC_SUBST(BRASERO_GMODULE_EXPORT_LIBS)
209
214
 
210
 
PKG_CHECK_MODULES(BRASERO_DBUS,                 \
211
 
        dbus-glib-1 >= $DBUS_REQUIRED)
212
 
 
213
 
AC_SUBST(BRASERO_DBUS_CFLAGS)
214
 
AC_SUBST(BRASERO_DBUS_LIBS)
215
 
 
216
215
PKG_CHECK_MODULES(BRASERO_SM,                   \
217
216
        ice sm)
218
217
 
222
221
#
223
222
# GTK+ stuff (taken and adapted from empathy)
224
223
#
225
 
GDK2_REQUIRED=2.6.0
226
 
GTK2_REQUIRED=2.19.7
227
 
 
228
 
GDK3_REQUIRED=2.90.2
229
 
GTK3_REQUIRED=2.90.2
230
 
 
231
 
CANBERRA_REQUIRED=0.1
232
 
 
233
 
AC_ARG_ENABLE(gtk3,
234
 
 AS_HELP_STRING([--enable-gtk3=@<:@no/yes/auto@:>@],
235
 
 [build with GTK+3]), ,
236
 
 enable_gtk3=auto)
237
 
 
238
 
# Try to use GTK+3 if available
239
 
if test "x$enable_gtk3" != "xno"; then
240
 
 PKG_CHECK_MODULES(BRASERO_GTK,                 \
241
 
        gdk-3.0 >= $GDK3_REQUIRED               \
242
 
        gtk+-3.0 >= $GTK3_REQUIRED \
243
 
        launchpad-integration,
244
 
        enable_gtk3="yes", enable_gtk3="no")
245
 
 
246
 
 GTK_API_VERSION=3
247
 
 BRASERO_LIBRARY_SUFFIX=3
248
 
fi
249
 
 
250
 
# ...if not use GTK+2
251
 
if test "x$enable_gtk3" == "xno"; then
252
 
 PKG_CHECK_MODULES(BRASERO_GTK,                 \
253
 
        gdk-2.0 >= $GDK2_REQUIRED               \
254
 
        gtk+-2.0 >= $GTK2_REQUIRED \
255
 
        launchpad-integration)    
256
 
 
257
 
 GTK_API_VERSION=2
258
 
 BRASERO_LIBRARY_SUFFIX=
259
 
fi
 
224
 
 
225
AC_MSG_CHECKING([which gtk+ version to compile against])
 
226
AC_ARG_WITH([gtk],
 
227
  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
 
228
  [case "$with_gtk" in
 
229
     2.0|3.0) ;;
 
230
     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
 
231
   esac],
 
232
  [with_gtk=2.0])
 
233
AC_MSG_RESULT([$with_gtk])
 
234
 
 
235
case "$with_gtk" in
 
236
  2.0) GTK_API_VERSION=2.0
 
237
       GTK_REQUIRED=2.20.0
 
238
       BRASERO_LIBRARY_SUFFIX=
 
239
       ;;
 
240
  3.0) GTK_API_VERSION=3.0
 
241
       GTK_REQUIRED=2.90.2
 
242
       BRASERO_LIBRARY_SUFFIX=3
 
243
       ;;
 
244
esac
 
245
 
 
246
PKG_CHECK_MODULES([BRASERO_GTK],[gtk+-$GTK_API_VERSION >= $GTK_REQUIRED])
260
247
 
261
248
AC_SUBST(GTK_API_VERSION)
262
249
AC_SUBST(BRASERO_LIBRARY_SUFFIX)
264
251
AC_SUBST(BRASERO_GTK_CFLAGS)
265
252
AC_SUBST(BRASERO_GTK_LIBS)
266
253
 
267
 
 
268
 
if test "x$enable_gtk3" = "xyes"; then
269
 
 PKG_CHECK_MODULES(BRASERO_CANBERRA,            \
270
 
        libcanberra >= $CANBERRA_REQUIRED       \
271
 
        libcanberra-gtk3 >= $CANBERRA_REQUIRED)
272
 
else
273
 
 PKG_CHECK_MODULES(BRASERO_CANBERRA,            \
274
 
        libcanberra >= $CANBERRA_REQUIRED       \
275
 
        libcanberra-gtk >= $CANBERRA_REQUIRED)
276
 
fi
 
254
#
 
255
# Canberra
 
256
#
 
257
 
 
258
CANBERRA_REQUIRED=0.1
 
259
 
 
260
case "$with_gtk" in
 
261
  2.0) PKG_CHECK_MODULES(BRASERO_CANBERRA,
 
262
         libcanberra >= $CANBERRA_REQUIRED
 
263
         libcanberra-gtk >= $CANBERRA_REQUIRED
 
264
         launchpad-integration) ;;
 
265
  3.0) PKG_CHECK_MODULES(BRASERO_CANBERRA,
 
266
              libcanberra >= $CANBERRA_REQUIRED
 
267
              libcanberra-gtk3 >= $CANBERRA_REQUIRED
 
268
          launchpad-integration) ;;
 
269
esac
277
270
 
278
271
AC_SUBST(BRASERO_CANBERRA_CFLAGS)
279
272
AC_SUBST(BRASERO_CANBERRA_LIBS)
689
682
dnl     Build libnotify support : ${build_libnotify}
690
683
 
691
684
echo "Version: $BRASERO_VERSION
692
 
        Use GTK+3 : ${enable_gtk3}
 
685
        Using GTK+ ${GTK_API_VERSION}
693
686
        Update caches: ${enable_caches}
694
687
        Build Nautilus extension : ${build_nautilus}
695
688
        Build inotify: ${enable_inotify}