← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/bluez/oneiric

« back to all changes in this revision

Viewing changes to .pc/pkg-config-install-paths.patch/acinclude.m4

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-07-28 16:47:35 UTC
  • mfrom: (1.1.34 upstream) (6.3.15 sid)
  • Revision ID: james.westby@ubuntu.com-20110728164735-f34luwrarv52mhlq
Tags: 4.95-0ubuntu1
* New upstream release.
* Resynchronize with Debian unstable, remaining changes:
  - debian/source_bluez.py, debian/bluez.install:
    + apport hook made by Baptiste Mille-Mathias.
  - debian/rules: don't use simple-patchsys.
  - debian/source/format: use source format 3.0.
  - debian/patches/pkg-config-install-paths.patch: install bluez-alsa plugin
    to the multiarch path, now that alsa-lib has transitioned.
* debian/patches/02_disable_hal.patch: refreshed.
* debian/patches/pkg-config-install-paths.patch: refreshed.
* debian/control, debian/rules: run autoreconf when building as required by
  pkg-config-install-paths.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/pkg-config-install-paths.patch/acinclude.m4
108
108
AC_DEFUN([AC_PATH_GLIB], [
109
109
        PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes,
110
110
                                AC_MSG_ERROR(GLib library version 2.16 or later is required))
 
111
        AC_CHECK_LIB(glib-2.0, g_slist_free_full, dummy=yes,
 
112
                AC_DEFINE(NEED_G_SLIST_FREE_FULL, 1,
 
113
                        [Define to 1 if you need g_slist_free_full() function.]))
111
114
        AC_SUBST(GLIB_CFLAGS)
112
115
        AC_SUBST(GLIB_LIBS)
113
116
])
205
208
        pcmcia_enable=no
206
209
        hid2hci_enable=no
207
210
        dfutool_enable=no
208
 
        udevrules_enable=yes
209
 
        configfiles_enable=yes
 
211
        datafiles_enable=yes
210
212
        telephony_driver=dummy
211
213
        maemo6_enable=no
212
214
        sap_driver=dummy
321
323
                test_enable=${enableval}
322
324
        ])
323
325
 
324
 
        AC_ARG_ENABLE(udevrules, AC_HELP_STRING([--enable-udevrules], [install Bluetooth udev rules]), [
325
 
                udevrules_enable=${enableval}
326
 
        ])
327
 
 
328
 
        AC_ARG_ENABLE(configfiles, AC_HELP_STRING([--enable-configfiles], [install Bluetooth configuration files]), [
329
 
                configfiles_enable=${enableval}
 
326
        AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--enable-datafiles], [install Bluetooth configuration and data files]), [
 
327
                datafiles_enable=${enableval}
330
328
        ])
331
329
 
332
330
        AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [enable compiling with debugging information]), [
400
398
        AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes")
401
399
        AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes")
402
400
        AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes")
403
 
        AM_CONDITIONAL(HID2HCI, test "${hid2hci_enable}" = "yes" && test "${usb_found}" = "yes")
 
401
        AM_CONDITIONAL(HID2HCI, test "${hid2hci_enable}" = "yes" && test "${usb_found}" = "yes" && test "${udev_found}" = "yes")
404
402
        AM_CONDITIONAL(DFUTOOL, test "${dfutool_enable}" = "yes" && test "${usb_found}" = "yes")
405
 
        AM_CONDITIONAL(UDEVRULES, test "${udevrules_enable}" = "yes")
406
 
        AM_CONDITIONAL(CONFIGFILES, test "${configfiles_enable}" = "yes")
 
403
        AM_CONDITIONAL(DATAFILES, test "${datafiles_enable}" = "yes")
407
404
        AM_CONDITIONAL(MAEMO6PLUGIN, test "${maemo6_enable}" = "yes")
408
405
        AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes")
409
406
])