← Back to branch summary

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

« back to all changes in this revision

Viewing changes to acinclude.m4

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2011-03-24 10:27:09 UTC
  • mfrom: (1.1.30 upstream)
  • Revision ID: james.westby@ubuntu.com-20110324102709-2hfis29dcozwxxo0
Tags: 4.90-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
acinclude.m4
15
15
                CFLAGS="-Wall -O2"
16
16
        fi
17
17
        if (test "$USE_MAINTAINER_MODE" = "yes"); then
18
 
                CFLAGS+=" -Werror -Wextra"
19
 
                CFLAGS+=" -Wno-unused-parameter"
20
 
                CFLAGS+=" -Wno-missing-field-initializers"
21
 
                CFLAGS+=" -Wdeclaration-after-statement"
22
 
                CFLAGS+=" -Wmissing-declarations"
23
 
                CFLAGS+=" -Wredundant-decls"
24
 
                CFLAGS+=" -Wcast-align"
25
 
                CFLAGS+=" -DG_DISABLE_DEPRECATED"
 
18
                CFLAGS="$CFLAGS -Werror -Wextra"
 
19
                CFLAGS="$CFLAGS -Wno-unused-parameter"
 
20
                CFLAGS="$CFLAGS -Wno-missing-field-initializers"
 
21
                CFLAGS="$CFLAGS -Wdeclaration-after-statement"
 
22
                CFLAGS="$CFLAGS -Wmissing-declarations"
 
23
                CFLAGS="$CFLAGS -Wredundant-decls"
 
24
                CFLAGS="$CFLAGS -Wcast-align"
 
25
                CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
26
26
        fi
27
27
])
28
28
 
115
115
])
116
116
 
117
117
AC_DEFUN([AC_PATH_GSTREAMER], [
118
 
        PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 gstreamer-plugins-base-0.10, gstreamer_found=yes, gstreamer_found=no)
 
118
        PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 >= 0.10.30 gstreamer-plugins-base-0.10, gstreamer_found=yes,
 
119
                                AC_MSG_WARN(GStreamer library version 0.10.30 or later is required);gstreamer_found=no)
119
120
        AC_SUBST(GSTREAMER_CFLAGS)
120
121
        AC_SUBST(GSTREAMER_LIBS)
121
122
        GSTREAMER_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir gstreamer-0.10`
184
185
        input_enable=yes
185
186
        serial_enable=yes
186
187
        network_enable=yes
 
188
        sap_enable=no
187
189
        service_enable=yes
188
190
        health_enable=no
189
191
        pnat_enable=no
220
222
                network_enable=${enableval}
221
223
        ])
222
224
 
 
225
        AC_ARG_ENABLE(sap, AC_HELP_STRING([--enable-sap], [enable sap plugin]), [
 
226
                sap_enable=${enableval}
 
227
        ])
 
228
 
223
229
        AC_ARG_ENABLE(serial, AC_HELP_STRING([--disable-serial], [disable serial plugin]), [
224
230
                serial_enable=${enableval}
225
231
        ])
361
367
        AM_CONDITIONAL(INPUTPLUGIN, test "${input_enable}" = "yes")
362
368
        AM_CONDITIONAL(SERIALPLUGIN, test "${serial_enable}" = "yes")
363
369
        AM_CONDITIONAL(NETWORKPLUGIN, test "${network_enable}" = "yes")
 
370
        AM_CONDITIONAL(SAPPLUGIN, test "${sap_enable}" = "yes")
364
371
        AM_CONDITIONAL(SERVICEPLUGIN, test "${service_enable}" = "yes")
365
372
        AM_CONDITIONAL(HEALTHPLUGIN, test "${health_enable}" = "yes")
366
373
        AM_CONDITIONAL(MCAP, test "${health_enable}" = "yes")