← Back to branch summary

~ubuntu-branches/ubuntu/wily/mutter/wily

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Rico Tzschichholz
  • Date: 2011-04-10 22:27:59 UTC
  • mfrom: (0.7.1 upstream) (0.3.20 experimental)
  • Revision ID: james.westby@ubuntu.com-20110410222759-o6n1i5p0unsti44n
Tags: 3.0.0-0ubuntu1
https://launchpad.net/bugs/742458
* New upstream release

* Merge with debian experimental (LP: #742458), remaining changes:
  + debian/patches/03_link_gles2.patch: Link to clutter-glx-1.0
    explicitily at the end of link flags, to bring in libGLESv2 on armel.
* debian/control.in:
  + rename gir package to gir1.2-mutter-3.0
* debian/libmutter0.symbols:
  + updated
* debian/patches:
  + fix 03_link_gles2.patch 

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
1
1
AC_PREREQ(2.50)
2
2
 
3
 
m4_define([mutter_major_version], [2])
4
 
m4_define([mutter_minor_version], [91])
5
 
m4_define([mutter_micro_version], [90])
 
3
m4_define([mutter_major_version], [3])
 
4
m4_define([mutter_minor_version], [0])
 
5
m4_define([mutter_micro_version], [0])
6
6
 
7
7
m4_define([mutter_version],
8
8
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
96
96
                 [disable mutter's startup notification support, for embedded/size-sensitive custom non-GNOME builds]),,
97
97
  enable_startup_notification=auto)
98
98
 
99
 
AC_ARG_WITH(introspection,
100
 
  AC_HELP_STRING([--without-introspection],
101
 
                 [disable the use of GObject introspection]),,
102
 
  with_introspection=auto)
103
 
 
104
99
AC_ARG_WITH(libcanberra,
105
100
  AC_HELP_STRING([--without-libcanberra],
106
101
                 [disable the use of libcanberra for playing sounds]),,
214
209
  AC_MSG_ERROR([no. Mutter requires Clutter version $CLUTTER_VERSION.])
215
210
fi
216
211
 
217
 
if test x$with_introspection != xno; then
218
 
  PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0 >= 0.9.5, have_introspection=yes, have_introspection=no)
219
 
  if test x$have_introspection=xyes; then
220
 
    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gobject-introspection-1.0"
221
 
    AC_DEFINE(HAVE_INTROSPECTION, 1, [Define if GObject introspection is available])
222
 
    G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
223
 
    AC_SUBST(G_IR_SCANNER)
224
 
    G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
225
 
    AC_SUBST(G_IR_COMPILER)
226
 
    G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
227
 
    AC_SUBST(G_IR_GENERATE)
228
 
    GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
229
 
    AC_SUBST(GIRDIR)
230
 
    TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
231
 
    AC_SUBST(TYPELIBDIR)
232
 
  fi
 
212
INTROSPECTION_VERSION=0.9.5
 
213
GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_VERSION])
 
214
 
 
215
if test x$found_introspection != xno; then
 
216
  AC_DEFINE(HAVE_INTROSPECTION, 1, [Define if GObject introspection is available])
 
217
  MUTTER_PC_MODULES="$MUTTER_PC_MODULES gobject-introspection-1.0"
 
218
  META_GIR=[Meta_]mutter_major_version[_]mutter_minor_version[_gir]
 
219
  AC_SUBST(META_GIR)
233
220
fi
234
 
AM_CONDITIONAL(WITH_INTROSPECTION, test "$have_introspection" = "yes")
235
221
 
236
222
AC_MSG_CHECKING([Xcursor])
237
223
if $PKG_CONFIG xcursor; then
519
505
doc/man/Makefile
520
506
src/Makefile
521
507
src/wm-tester/Makefile
522
 
src/libmutter-private.pc
 
508
src/libmutter.pc
523
509
src/mutter-plugins.pc
524
510
src/tools/Makefile
525
511
src/compositor/plugins/Makefile
556
542
        Solaris Xinerama:         ${use_solaris_xinerama}
557
543
        Startup notification:     ${have_startup_notification}
558
544
        libcanberra:              ${have_libcanberra}
559
 
        Introspection:            ${have_introspection}
 
545
        Introspection:            ${found_introspection}
560
546
        Session management:       ${found_sm}
561
547
        Shape extension:          ${found_shape}
562
548
        Xsync:                    ${found_xsync}