← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gconf/oneiric-proposed

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-09-01 18:47:35 UTC
  • mto: (7.3.5 sid) (1.2.1)
  • mto: This revision was merged to the branch mainline in revision 53.
  • Revision ID: james.westby@ubuntu.com-20100901184735-eujhkrmxvlcgz6ex
Tags: upstream-2.31.91
Import upstream version 2.31.91

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
1
1
AC_PREREQ(2.60)
2
2
AC_INIT([GConf],
3
 
  [2.31.7],
 
3
  [2.31.91],
4
4
  [http://bugzilla.gnome.org/enter_bug.cgi?product=GConf],
5
5
  [GConf])
6
6
 
144
144
    [Enable GTK+ support (for gconf-sanity-check) @<:@default=auto@:>@]),
145
145
  , enable_gtk=auto)
146
146
 
147
 
PKGCONFIG_MODULES='glib-2.0 > 2.14.0 gthread-2.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0 ORBit-2.0 >= 2.4.0 dbus-1 >= 1.0.0 dbus-glib-1 >= 0.74 gio-2.0 >= 2.25.9'
 
147
PKGCONFIG_MODULES='glib-2.0 > 2.14.0 gio-2.0 >= 2.25.9 gthread-2.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0 ORBit-2.0 >= 2.4.0'
148
148
PKGCONFIG_MODULES_WITH_XML="$PKGCONFIG_MODULES libxml-2.0"
149
149
PKGCONFIG_MODULES_WITH_GTK=" $PKGCONFIG_MODULES gtk+-2.0 >= 2.14.0"
150
150
PKGCONFIG_MODULES_WITH_XML_AND_GTK=" $PKGCONFIG_MODULES gtk+-2.0 libxml-2.0"
 
151
PKGCONFIG_MODULES_DBUS=" dbus-1 >= 1.0.0 dbus-glib-1 >= 0.74"
151
152
 
152
153
PKG_CHECK_MODULES(DEPENDENT, $PKGCONFIG_MODULES)
153
154
PKG_CHECK_MODULES(DEPENDENT_WITH_XML, $PKGCONFIG_MODULES_WITH_XML)
167
168
  DEPENDENT_WITH_XML_AND_GTK_LIBS=$DEPENDENT_WITH_XML_LIBS
168
169
fi
169
170
 
 
171
PKG_CHECK_MODULES([DEPENDENT_DBUS],[$PKGCONFIG_MODULES_DBUS])
 
172
 
170
173
AM_CONDITIONAL(GTK, [test "x$HAVE_GTK" != "xno"])
171
174
 
172
175
AC_SUBST(DEPENDENT_LIBS)
177
180
AC_SUBST(DEPENDENT_WITH_GTK_CFLAGS)
178
181
AC_SUBST(DEPENDENT_WITH_XML_AND_GTK_LIBS)
179
182
AC_SUBST(DEPENDENT_WITH_XML_AND_GTK_CFLAGS)
 
183
AC_SUBST([DEPENDENT_DBUS_CFLAGS])
 
184
AC_SUBST([DEPENDENT_DBUS_LIBS])
180
185
 
181
186
HAVE_POLKIT=no
182
187
AC_ARG_ENABLE(defaults_service,