[Rt-commit] r12798 - in rt/branches/3.8-TESTING: .

[alexmv at bestpractical.com]

Author: alexmv
Date: Mon Jun  2 12:25:21 2008
New Revision: 12798

Modified:
   rt/branches/3.8-TESTING/   (props changed)
   rt/branches/3.8-TESTING/configure.ac
   rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in

Log:
 r32360 at kohr-ah:  chmrr | 2008-06-02 12:25:01 -0400
  * Revert mismerge in 12796


Modified: rt/branches/3.8-TESTING/configure.ac
==============================================================================
--- rt/branches/3.8-TESTING/configure.ac	(original)
+++ rt/branches/3.8-TESTING/configure.ac	Mon Jun  2 12:25:21 2008
@@ -293,19 +293,6 @@
 fi
 AC_SUBST(RT_GPG)
 
-dnl RT's forking server support
-AC_CHECK_PROG([RT_FORKING], [forking], "yes", "no")
-AC_ARG_ENABLE(forking,
-            AC_HELP_STRING([--enable-forking],
-                           [Turns on forking-server support]),
-            RT_FORKING=$enableval)
-if test "$RT_FORKING" = yes; then
-        RT_FORKING="1"
-elif test "$RT_FORKING" = no; then
-        RT_FORKING="0"
-fi
-AC_SUBST(RT_FORKING)
-
 dnl This section maps the variable names this script 'natively' generates
 dnl to their existing names. They should be removed from here as the .in
 dnl files are changed to use the new names.

Modified: rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in
==============================================================================
--- rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in	(original)
+++ rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in	Mon Jun  2 12:25:21 2008
@@ -63,7 +63,7 @@
     'with-ORACLE',                        'with-FASTCGI',
     'with-SPEEDYCGI',                     'with-MODPERL1',
     'with-MODPERL2',                      'with-DEV',
-    'with-STANDALONE',                    'with-FORKING',
+    'with-STANDALONE',
 
     'with-GPG',
     'with-ICAL',
@@ -92,7 +92,6 @@
     'with-ICAL' => 1,
     'with-SMTP' => 1,
     'with-GRAPHVIZ' => @RT_GRAPHVIZ@,
-    'with-FORKING' => @RT_FORKING@,
 );
 $args{$_} = $default{$_} foreach grep !exists $args{$_}, keys %default;
 
@@ -258,11 +257,6 @@
 Net::Server::PreFork
 .
 
-$deps{'FORKING'} = [ text_to_hash( << '.') ];
-Net::Server
-Net::Server::PreForking
-.
-
 $deps{'MAILGATE'} = [ text_to_hash( << '.') ];
 HTML::TreeBuilder
 HTML::FormatText