diff options
| author | Brian Cameron <Brian.Cameron@sun.com> | 2010-05-19 14:41:21 -0500 |
|---|---|---|
| committer | Brian Cameron <Brian.Cameron@sun.com> | 2010-05-19 14:41:21 -0500 |
| commit | 196587065ba6d761179ae71fab8f3d92377e519d (patch) | |
| tree | 86b0df4833f094e447f590eb03aa88645996ce67 /configure.ac | |
| parent | 9b1f02267c01e8f8aed2fc5a40f5f38da9314a72 (diff) | |
| download | gdm-196587065ba6d761179ae71fab8f3d92377e519d.tar.gz | |
Revert fix for bug #594818 since it breaks the build.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 0674a92c..617c05b4 100644 --- a/configure.ac +++ b/configure.ac @@ -44,7 +44,7 @@ GLIB_REQUIRED_VERSION=2.22.0 GTK_REQUIRED_VERSION=2.20.0 PANGO_REQUIRED_VERSION=1.3.0 SCROLLKEEPER_REQUIRED_VERSION=0.1.4 -GCONF_REQUIRED_VERSION=2.31.3 +GCONF_REQUIRED_VERSION=2.6.1 GNOME_PANEL_REQUIRED_VERSION=2.0.0 LIBXKLAVIER_REQUIRED_VERSION=4.0 LIBCANBERRA_GTK_REQUIRED_VERSION=0.4 @@ -103,9 +103,6 @@ PKG_CHECK_MODULES(GCONF, AC_SUBST(GCONF_CFLAGS) AC_SUBST(GCONF_LIBS) -gconf_defaultpath=`pkg-config gconf-2.0 --variable=gconf_defaultpath` -AC_DEFINE_UNQUOTED([GCONF_DEFAULTPATH], "$gconf_defaultpath", [GConf Default Path]) - PKG_CHECK_MODULES(DEVKIT_POWER, devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION, have_devicekit_power=yes, |