From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 17 Feb 2011 20:01:54 +0000 (+0000)
Subject: Remove unreviewed changes intended to support GTest-based tests
X-Git-Tag: dbus-1.4.6~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2497a91b3f0fd692ab40af8f02227792a9fb9517;p=platform%2Fupstream%2Fdbus.git

Remove unreviewed changes intended to support GTest-based tests

These were committed by mistake. :-(
---

diff --git a/configure.in b/configure.in
index f38a3d3..01fe408 100644
--- a/configure.in
+++ b/configure.in
@@ -154,25 +154,11 @@ AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Di
 
 dnl DBUS_BUILD_TESTS controls unit tests built in to .c files
 dnl and also some stuff in the test/ subdir
-dnl
-dnl In principle we could have separate switches for the embedded
-dnl test code in the libraries (which cause bloat and possible security holes)
-dnl and the standalone GLib regression tests, but not right now.
 AM_CONDITIONAL(DBUS_BUILD_TESTS, test x$enable_tests = xyes)
 if test x$enable_tests = xyes; then
     AC_DEFINE(DBUS_BUILD_TESTS,1,[Build test code])
 fi
 
-AC_ARG_ENABLE([standalone-tests],
-    AS_HELP_STRING([--enable-standalone-tests],
-        [enable standalone regression tests (GLib 2.16 required)]),
-    [], [enable_standalone_tests=yes])
-
-if test x$enable_standalone_tests = xyes; then
-    PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16],
-        [], [AC_MSG_ERROR([The standalone regression tests require GLib])])
-fi
-
 if test x$enable_verbose_mode = xyes; then
     AC_DEFINE(DBUS_ENABLE_VERBOSE_MODE,1,[Support a verbose mode])
 fi