This commit was generated by cvs2svn to compensate for changes in r3241,

which included commits to RCS files with non-trunk default branches.

2 files changed, 75 insertions, 49 deletions

diff --git a/rt/autom4te.cache/output.0 b/rt/autom4te.cache/output.0
index 51a8aaf63..3d27db94f 100644
--- a/rt/autom4te.cache/output.0
+++ b/rt/autom4te.cache/output.0
@@ -1,7 +1,7 @@
 @%:@! /bin/sh
 @%:@ From configure.ac Revision: 1.1 .
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.53 for RT 3.0.4.
+@%:@ Generated by GNU Autoconf 2.53 for RT 3.0.9.
 @%:@
 @%:@ Report bugs to <rt-3.0-bugs@fsck.com>.
 @%:@ 
@@ -257,8 +257,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='RT'
 PACKAGE_TARNAME='rt'
-PACKAGE_VERSION='3.0.4'
-PACKAGE_STRING='RT 3.0.4'
+PACKAGE_VERSION='3.0.9'
+PACKAGE_STRING='RT 3.0.9'
 PACKAGE_BUGREPORT='rt-3.0-bugs@fsck.com'
 
 ac_unique_file="lib/RT.pm.in"
@@ -711,7 +711,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures RT 3.0.4 to adapt to many kinds of systems.
+\`configure' configures RT 3.0.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -768,7 +768,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of RT 3.0.4:";;
+     short | recursive ) echo "Configuration of RT 3.0.9:";;
    esac
   cat <<\_ACEOF
 
@@ -786,8 +786,8 @@ Optional Packages:
   --with-bin-owner=OWNER  user that will own rt binaries (default root)
   --with-libs-owner=OWNER user that will own RT libraries (default root)
   --with-libs-group=GROUP group that will own rt binaries (default bin)
-  --with-db-type=TYPE     sort of database RT will use (default: mysql) (mysql
-                          and Pg are valid)
+  --with-db-type=TYPE     sort of database RT will use (default: mysql)
+                          (mysql, Pg, Oracle and Informix are valid)
   --with-db-host=HOSTNAME FQDN of database server (default: localhost)
   --with-db-port=PORT     port on which the database listens on
   --with-db-rt-host=HOSTNAME 
@@ -802,6 +802,7 @@ Optional Packages:
                           password for database user (default: rt_pass)
   --with-web-user=USER    user the web server runs as (default: www)
   --with-web-group=GROUP  group the web server runs as (default: www)
+  --with-my-user-group    set all users and groups to current user/group
 
 Some influential environment variables:
   PERL        Perl interpreter command
@@ -872,7 +873,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-RT configure 3.0.4
+RT configure 3.0.9
 generated by GNU Autoconf 2.53
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -887,7 +888,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by RT $as_me 3.0.4, which was
+It was created by RT $as_me 3.0.9, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   $ $0 $@
@@ -1171,7 +1172,7 @@ rt_version_major=3
 
 rt_version_minor=0
 
-rt_version_patch=4
+rt_version_patch=9
 
 test "x$rt_version_major" = 'x' && rt_version_major=0
 test "x$rt_version_minor" = 'x' && rt_version_minor=0
@@ -1703,13 +1704,21 @@ if test "${with_db_type+set}" = set; then
 else
   DB_TYPE=mysql
 fi; 
-if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite'; then
-	{ { echo "$as_me:$LINENO: error: Only Pg and mysql are valid db types" >&5
-echo "$as_me: error: Only Pg and mysql are valid db types" >&2;}
+if test "$DB_TYPE" != 'mysql' -a "$DB_TYPE" != 'Pg' -a "$DB_TYPE" != 'SQLite' -a "$DB_TYPE" != 'Oracle' -a "$DB_TYPE" != 'Informix' ; then
+	{ { echo "$as_me:$LINENO: error: Only Oracle, Informix, Pg and mysql are valid db types" >&5
+echo "$as_me: error: Only Oracle, Informix, Pg and mysql are valid db types" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
+if test "$DB_TYPE" = 'Oracle'; then
+	test "x$ORACLE_HOME" = 'x' && { { echo "$as_me:$LINENO: error: Please declare the ORACLE_HOME environment variable" >&5
+echo "$as_me: error: Please declare the ORACLE_HOME environment variable" >&2;}
+   { (exit 1); exit 1; }; }
+	ORACLE_ENV_PREF="\$ENV{'ORACLE_HOME'} = '$ORACLE_HOME';"
+fi
+
+
 
 # Check whether --with-db-host or --without-db-host was given.
 if test "${with_db_host+set}" = set; then
@@ -1800,6 +1809,19 @@ else
 fi; 
 
 
+my_group=$(groups|cut -f1 -d' ')
+
+# Check whether --with-my-user-group or --without-my-user-group was given.
+if test "${with_my_user_group+set}" = set; then
+  withval="$with_my_user_group"
+  RTGROUP=$my_group
+            BIN_OWNER=$USER
+            LIBS_OWNER=$USER
+            LIBS_GROUP=$my_group
+            WEB_USER=$USER
+            WEB_GROUP=$my_group
+fi; 
+
 
 RT_VERSION_MAJOR=${rt_version_major}
 
@@ -1848,7 +1870,7 @@ RT_LOG_PATH=${exp_logfiledir}
 
 
 
-ac_config_files="$ac_config_files sbin/rt-setup-database sbin/rt-test-dependencies Makefile etc/RT_Config.pm lib/RT.pm lib/t/00smoke.t lib/t/01harness.t lib/t/02regression.t lib/t/03web.pl lib/t/04_send_email.pl bin/mason_handler.fcgi bin/mason_handler.scgi bin/mason_handler.svc bin/rt-commit-handler bin/rt-crontool bin/rt-mailgate bin/webmux.pl"
+ac_config_files="$ac_config_files sbin/rt-setup-database sbin/rt-test-dependencies Makefile etc/RT_Config.pm lib/RT.pm lib/t/00smoke.t lib/t/01harness.t lib/t/02regression.t lib/t/03web.pl lib/t/04_send_email.pl bin/mason_handler.fcgi bin/mason_handler.scgi bin/mason_handler.svc bin/rt-commit-handler bin/rt-crontool bin/rt-mailgate bin/rt bin/webmux.pl"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -2206,7 +2228,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by RT $as_me 3.0.4, which was
+This file was extended by RT $as_me 3.0.9, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2260,7 +2282,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-RT config.status 3.0.4
+RT config.status 3.0.9
 configured by $0, generated by GNU Autoconf 2.53,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -2363,6 +2385,7 @@ do
   "bin/rt-commit-handler" ) CONFIG_FILES="$CONFIG_FILES bin/rt-commit-handler" ;;
   "bin/rt-crontool" ) CONFIG_FILES="$CONFIG_FILES bin/rt-crontool" ;;
   "bin/rt-mailgate" ) CONFIG_FILES="$CONFIG_FILES bin/rt-mailgate" ;;
+  "bin/rt" ) CONFIG_FILES="$CONFIG_FILES bin/rt" ;;
   "bin/webmux.pl" ) CONFIG_FILES="$CONFIG_FILES bin/webmux.pl" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -2487,6 +2510,7 @@ s,@BIN_OWNER@,$BIN_OWNER,;t t
 s,@LIBS_OWNER@,$LIBS_OWNER,;t t
 s,@LIBS_GROUP@,$LIBS_GROUP,;t t
 s,@DB_TYPE@,$DB_TYPE,;t t
+s,@ORACLE_ENV_PREF@,$ORACLE_ENV_PREF,;t t
 s,@DB_HOST@,$DB_HOST,;t t
 s,@DB_PORT@,$DB_PORT,;t t
 s,@DB_RT_HOST@,$DB_RT_HOST,;t t
diff --git a/rt/autom4te.cache/traces.0 b/rt/autom4te.cache/traces.0
index 962f400e7..f13276211 100644
--- a/rt/autom4te.cache/traces.0
+++ b/rt/autom4te.cache/traces.0
@@ -52,7 +52,7 @@ m4trace:configure.ac:9: -1- AC_SUBST([ECHO_T])
 m4trace:configure.ac:9: -1- AC_SUBST([LIBS])
 m4trace:configure.ac:14: -1- AC_SUBST([rt_version_major], [3])
 m4trace:configure.ac:16: -1- AC_SUBST([rt_version_minor], [0])
-m4trace:configure.ac:18: -1- AC_SUBST([rt_version_patch], [4])
+m4trace:configure.ac:18: -1- AC_SUBST([rt_version_patch], [9])
 m4trace:configure.ac:24: -1- AC_PROG_INSTALL
 m4trace:configure.ac:24: -1- AC_SUBST([INSTALL_PROGRAM])
 m4trace:configure.ac:24: -1- AC_SUBST([INSTALL_SCRIPT])
@@ -104,38 +104,39 @@ m4trace:configure.ac:57: -1- AC_SUBST([BIN_OWNER])
 m4trace:configure.ac:65: -1- AC_SUBST([LIBS_OWNER])
 m4trace:configure.ac:73: -1- AC_SUBST([LIBS_GROUP])
 m4trace:configure.ac:84: -1- AC_SUBST([DB_TYPE])
-m4trace:configure.ac:92: -1- AC_SUBST([DB_HOST])
-m4trace:configure.ac:100: -1- AC_SUBST([DB_PORT])
-m4trace:configure.ac:108: -1- AC_SUBST([DB_RT_HOST])
-m4trace:configure.ac:116: -1- AC_SUBST([DB_DBA])
-m4trace:configure.ac:124: -1- AC_SUBST([DB_DATABASE])
-m4trace:configure.ac:132: -1- AC_SUBST([DB_RT_USER])
-m4trace:configure.ac:140: -1- AC_SUBST([DB_RT_PASS])
-m4trace:configure.ac:148: -1- AC_SUBST([WEB_USER])
-m4trace:configure.ac:156: -1- AC_SUBST([WEB_GROUP])
-m4trace:configure.ac:163: -1- AC_SUBST([RT_VERSION_MAJOR], [${rt_version_major}])
-m4trace:configure.ac:164: -1- AC_SUBST([RT_VERSION_MINOR], [${rt_version_minor}])
-m4trace:configure.ac:165: -1- AC_SUBST([RT_VERSION_PATCH], [${rt_version_patch}])
-m4trace:configure.ac:168: -1- AC_SUBST([RT_PATH], [${exp_prefix}])
-m4trace:configure.ac:169: -1- AC_SUBST([RT_DOC_PATH], [${exp_manualdir}])
-m4trace:configure.ac:170: -1- AC_SUBST([RT_LOCAL_PATH], [${exp_customdir}])
-m4trace:configure.ac:171: -1- AC_SUBST([RT_LIB_PATH], [${exp_libdir}])
-m4trace:configure.ac:172: -1- AC_SUBST([RT_ETC_PATH], [${exp_sysconfdir}])
-m4trace:configure.ac:173: -1- AC_SUBST([CONFIG_FILE_PATH], [${exp_sysconfdir}])
-m4trace:configure.ac:174: -1- AC_SUBST([RT_BIN_PATH], [${exp_bindir}])
-m4trace:configure.ac:175: -1- AC_SUBST([RT_SBIN_PATH], [${exp_sbindir}])
-m4trace:configure.ac:176: -1- AC_SUBST([RT_VAR_PATH], [${exp_localstatedir}])
-m4trace:configure.ac:177: -1- AC_SUBST([RT_MAN_PATH], [${exp_mandir}])
-m4trace:configure.ac:178: -1- AC_SUBST([MASON_DATA_PATH], [${exp_masonstatedir}])
-m4trace:configure.ac:179: -1- AC_SUBST([MASON_SESSION_PATH], [${exp_sessionstatedir}])
-m4trace:configure.ac:180: -1- AC_SUBST([MASON_HTML_PATH], [${exp_htmldir}])
-m4trace:configure.ac:181: -1- AC_SUBST([LOCAL_ETC_PATH], [${exp_custometcdir}])
-m4trace:configure.ac:182: -1- AC_SUBST([MASON_LOCAL_HTML_PATH], [${exp_customhtmldir}])
-m4trace:configure.ac:183: -1- AC_SUBST([LOCAL_LEXICON_PATH], [${exp_customlexdir}])
-m4trace:configure.ac:184: -1- AC_SUBST([LOCAL_LIB_PATH], [${exp_customlibdir}])
-m4trace:configure.ac:185: -1- AC_SUBST([DESTDIR], [${exp_prefix}])
-m4trace:configure.ac:186: -1- AC_SUBST([RT_LOG_PATH], [${exp_logfiledir}])
-m4trace:configure.ac:208: -1- AC_CONFIG_FILES([
+m4trace:configure.ac:91: -1- AC_SUBST([ORACLE_ENV_PREF])
+m4trace:configure.ac:99: -1- AC_SUBST([DB_HOST])
+m4trace:configure.ac:107: -1- AC_SUBST([DB_PORT])
+m4trace:configure.ac:115: -1- AC_SUBST([DB_RT_HOST])
+m4trace:configure.ac:123: -1- AC_SUBST([DB_DBA])
+m4trace:configure.ac:131: -1- AC_SUBST([DB_DATABASE])
+m4trace:configure.ac:139: -1- AC_SUBST([DB_RT_USER])
+m4trace:configure.ac:147: -1- AC_SUBST([DB_RT_PASS])
+m4trace:configure.ac:155: -1- AC_SUBST([WEB_USER])
+m4trace:configure.ac:163: -1- AC_SUBST([WEB_GROUP])
+m4trace:configure.ac:182: -1- AC_SUBST([RT_VERSION_MAJOR], [${rt_version_major}])
+m4trace:configure.ac:183: -1- AC_SUBST([RT_VERSION_MINOR], [${rt_version_minor}])
+m4trace:configure.ac:184: -1- AC_SUBST([RT_VERSION_PATCH], [${rt_version_patch}])
+m4trace:configure.ac:187: -1- AC_SUBST([RT_PATH], [${exp_prefix}])
+m4trace:configure.ac:188: -1- AC_SUBST([RT_DOC_PATH], [${exp_manualdir}])
+m4trace:configure.ac:189: -1- AC_SUBST([RT_LOCAL_PATH], [${exp_customdir}])
+m4trace:configure.ac:190: -1- AC_SUBST([RT_LIB_PATH], [${exp_libdir}])
+m4trace:configure.ac:191: -1- AC_SUBST([RT_ETC_PATH], [${exp_sysconfdir}])
+m4trace:configure.ac:192: -1- AC_SUBST([CONFIG_FILE_PATH], [${exp_sysconfdir}])
+m4trace:configure.ac:193: -1- AC_SUBST([RT_BIN_PATH], [${exp_bindir}])
+m4trace:configure.ac:194: -1- AC_SUBST([RT_SBIN_PATH], [${exp_sbindir}])
+m4trace:configure.ac:195: -1- AC_SUBST([RT_VAR_PATH], [${exp_localstatedir}])
+m4trace:configure.ac:196: -1- AC_SUBST([RT_MAN_PATH], [${exp_mandir}])
+m4trace:configure.ac:197: -1- AC_SUBST([MASON_DATA_PATH], [${exp_masonstatedir}])
+m4trace:configure.ac:198: -1- AC_SUBST([MASON_SESSION_PATH], [${exp_sessionstatedir}])
+m4trace:configure.ac:199: -1- AC_SUBST([MASON_HTML_PATH], [${exp_htmldir}])
+m4trace:configure.ac:200: -1- AC_SUBST([LOCAL_ETC_PATH], [${exp_custometcdir}])
+m4trace:configure.ac:201: -1- AC_SUBST([MASON_LOCAL_HTML_PATH], [${exp_customhtmldir}])
+m4trace:configure.ac:202: -1- AC_SUBST([LOCAL_LEXICON_PATH], [${exp_customlexdir}])
+m4trace:configure.ac:203: -1- AC_SUBST([LOCAL_LIB_PATH], [${exp_customlibdir}])
+m4trace:configure.ac:204: -1- AC_SUBST([DESTDIR], [${exp_prefix}])
+m4trace:configure.ac:205: -1- AC_SUBST([RT_LOG_PATH], [${exp_logfiledir}])
+m4trace:configure.ac:228: -1- AC_CONFIG_FILES([
 		 sbin/rt-setup-database
                  sbin/rt-test-dependencies
                  Makefile
@@ -152,5 +153,6 @@ m4trace:configure.ac:208: -1- AC_CONFIG_FILES([
  		 bin/rt-commit-handler
  		 bin/rt-crontool
  		 bin/rt-mailgate
+		 bin/rt
  		 bin/webmux.pl
                 ])