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

[sartak at bestpractical.com]

Author: sartak
Date: Thu Jun  5 19:22:03 2008
New Revision: 12946

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:
 r61744 at onn:  sartak | 2008-06-05 19:19:10 -0400
 Check for GD in configure for use in test-dependencies


Modified: rt/branches/3.8-TESTING/configure.ac
==============================================================================
--- rt/branches/3.8-TESTING/configure.ac	(original)
+++ rt/branches/3.8-TESTING/configure.ac	Thu Jun  5 19:22:03 2008
@@ -280,6 +280,20 @@
 fi
 AC_SUBST(RT_GRAPHVIZ)
 
+dnl RT's GD pie and bar charts
+AC_CHECK_PROG([RT_GD], [gdlib-config], "yes", "no")
+AC_ARG_WITH(gd,[],RT_GD=$withval)
+AC_ARG_ENABLE(gd,
+            AC_HELP_STRING([--enable-gd],
+                           [Turns on support for RT's GD pie and bar charts]),
+            RT_GD=$enableval)
+if test "$RT_GD" = yes; then
+        RT_GD="1"
+elif test "$RT_GD" = no; then
+        RT_GD="0"
+fi
+AC_SUBST(RT_GD)
+
 dnl RT's GPG support
 AC_CHECK_PROG([RT_GPG], [gpg], "yes", "no")
 AC_ARG_ENABLE(gpg,

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	Thu Jun  5 19:22:03 2008
@@ -69,6 +69,7 @@
     'with-ICAL',
     'with-SMTP',
     'with-GRAPHVIZ',
+    'with-GD',
 
     'download=s',
     'repository=s',
@@ -92,6 +93,7 @@
     'with-ICAL' => 1,
     'with-SMTP' => 1,
     'with-GRAPHVIZ' => @RT_GRAPHVIZ@,
+    'with-GD' => @RT_GD@,
 );
 $args{$_} = $default{$_} foreach grep !exists $args{$_}, keys %default;
 
@@ -243,9 +245,6 @@
 Storable 2.08
 Apache::Session 1.53
 XML::RSS 1.05
-GD
-GD::Graph
-GD::Text
 Text::WikiFormat 0.76
 CSS::Squish 0.06
 .
@@ -356,6 +355,12 @@
 IPC::Run::SafeHandles
 .
 
+$deps{'GD'} = [ text_to_hash( << '.') ];
+GD
+GD::Graph
+GD::Text
+.
+
 if ($args{'download'}) {
 
     download_mods();