diff options
| author | Ray Strode <rstrode@redhat.com> | 2011-06-17 13:39:21 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2011-06-17 13:45:01 -0400 |
| commit | 5d4fb658b7c75a0496d3b6f6ff62fa0062b81944 (patch) | |
| tree | 4434e5472a4d7828b6d2a67a1fb786a877dd1de4 /configure.ac | |
| parent | b7d107a0156f3c7e07524175d9d27e2d868b58ff (diff) | |
| download | gdm-5d4fb658b7c75a0496d3b6f6ff62fa0062b81944.tar.gz | |
Revert some commits
I had some inprogress changes in my local tree when when
git bz applying the patches on bug 618047.
Those unfinished changes got interleaved into the commits,
creating a bit of a mess.
Also, bug 618047 has been reopened.
This commit reverts those changes for now until.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index d54f0f9e..78887807 100644 --- a/configure.ac +++ b/configure.ac @@ -194,14 +194,6 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2) AM_GCONF_SOURCE_2 -LIBGDMGREETER_LIBS="$SIMPLE_GREETER_LIBS" -AC_SUBST(LIBGDMGREETER_LIBS) -LIBGDMGREETER_CFLAGS="$SIMPLE_GREETER_CFLAGS" -AC_SUBST(LIBGDMGREETER_CFLAGS) -GOBJECT_INTROSPECTION_CHECK([0.9.12]) -LIBGDMGREETER_GIR_INCLUDES="GLib-2.0 GObject-2.0 DBusGLib-1.0" -AC_SUBST(LIBGDMGREETER_GIR_INCLUDES) - dnl --------------------------------------------------------------------------- dnl - Configuration file stuff dnl --------------------------------------------------------------------------- @@ -276,11 +268,6 @@ AC_ARG_WITH(at-spi-registryd-directory, AT_SPI_REGISTRYD_DIR=$with_at_spi_registryd_directory AC_SUBST(AT_SPI_REGISTRYD_DIR) -AC_ARG_WITH(vt-switch-workaround, - AS_HELP_STRING([--with-vt-switch-workaround], - [Try to workaround missing -novtswitch option for X @<:@default=nor@:>@])],, - [with_vt_switch_workaround="no"]) - # Allow configuration of default PATH # withval="" @@ -928,14 +915,6 @@ AM_CONDITIONAL(WITH_CONSOLE_KIT, test x$use_console_kit = xyes) AC_SUBST(WITH_CONSOLE_KIT) dnl --------------------------------------------------------------------------- -dnl - Check for vt switch support -dnl --------------------------------------------------------------------------- - -if test "x$with_vt_switch_workaround" != "xno" ; then - AC_DEFINE(WITH_VT_SWITCH_WORKAROUND, 1, [Define to enable workaround for missing -novtswitch feature]) -fi - -dnl --------------------------------------------------------------------------- dnl - Check for D-Bus dnl --------------------------------------------------------------------------- @@ -1442,8 +1421,6 @@ Makefile daemon/Makefile docs/Makefile gui/Makefile -gui/libgdmgreeter/Makefile -gui/libgdmgreeter/gdmgreeter.pc gui/simple-greeter/Makefile gui/simple-greeter/libgdmsimplegreeter/Makefile gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc |