import rt 3.6.6

[freeside.git] / rt / configure.ac

diff --git a/rt/configure.ac b/rt/configure.ac
index 1d0b95f..2a3271d 100644 (file)
--- a/rt/configure.ac
+++ b/rt/configure.ac
@@ -3,11 +3,11 @@ dnl
 dnl Process this file with autoconf to produce a configure script
 dnl
 dnl Embed in generated ./configure script the following CVS info:
-AC_REVISION($Revision: 1.1.1.5 $)dnl
+AC_REVISION($Revision: 1.1.1.9 $)dnl
 
 dnl Setup autoconf
 AC_PREREQ(2.53)
-AC_INIT(RT, [3.4.4], [rt-bugs@fsck.com])
+AC_INIT(RT, [3.6.6], [rt-bugs@bestpractical.com])
 AC_CONFIG_SRCDIR([lib/RT.pm.in])
 
 dnl Extract RT version number components
@@ -23,6 +23,7 @@ test "x$rt_version_patch" = 'x' && rt_version_patch=0
 
 dnl Check for programs
 AC_PROG_INSTALL
+AC_PROG_AWK
 AC_ARG_VAR([PERL],[Perl interpreter command])
 AC_PATH_PROG([PERL], [perl], [not found])
 if test "$PERL" = 'not found'; then
@@ -201,6 +202,8 @@ AC_ARG_WITH(rt-group,
 AC_SUBST(RTGROUP)
 
 dnl INSTALL AS ME
+# XXX TODO: The command below to figure out the group brokenly relies on
+# output order (and "id -gn" doesn't work on all platforms).
 my_group=$(groups|cut -f1 -d' ')
 my_user=${USER:-$LOGNAME}
 AC_ARG_WITH(my-user-group,
@@ -213,6 +216,15 @@ AC_ARG_WITH(my-user-group,
             WEB_USER=$my_user
             WEB_GROUP=$my_group)
 
+# Test for valid database names
+AS_IF([ test "$DB_TYPE" == "mysql" ],
+      [ AC_MSG_CHECKING([if database name is valid])
+          AS_IF([ echo $DB_DATABASE | $AWK '/-/ { exit 1 }' ],
+                [ AC_MSG_RESULT([yes]) ],
+                [ AC_MSG_ERROR([no.  database name ($DB_DATABASE) contains '-' which is not valid for mysql]) ]
+               )
+      ]
+     )
 
 
 dnl Set the value of apachectl
@@ -224,6 +236,15 @@ AC_ARG_WITH(apachectl,
             APACHECTL=`which apachectl`)
 AC_SUBST(APACHECTL)
 
+dnl RT's standalone pure perl server
+AC_ARG_WITH(devel-mode,
+            AC_HELP_STRING([--with-standalone],
+                           [Install modules for pure perl standalone server]),
+
+            RT_STANDALONE="1",
+            RT_STANDALONE="0")
+AC_SUBST(RT_STANDALONE)
+
 dnl RT's "maintainer mode"
 AC_ARG_WITH(devel-mode,
             AC_HELP_STRING([--with-devel-mode],