X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fconfigure;h=8d79e21c4c8b08f80c4f09b3a3acec26f397c814;hp=395fc0b194525e64effaf4e47d28f9de38a88aa8;hb=ef20b2b6b1feb47ad02b5ff7525f1a0fd11d0fa4;hpb=d4d0590bef31071e8809ec046717444b95b3f30a

diff --git a/rt/configure b/rt/configure
index 395fc0b19..8d79e21c4 100755
--- a/rt/configure
+++ b/rt/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
-# From configure.ac Revision: 3070 .
+# From configure.ac Revision: 6876 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for RT 3.4.4.
+# Generated by GNU Autoconf 2.59 for RT 3.6.4.
 #
-# Report bugs to <rt-bugs@fsck.com>.
+# Report bugs to <rt-bugs@bestpractical.com>.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -270,13 +270,13 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='RT'
 PACKAGE_TARNAME='rt'
-PACKAGE_VERSION='3.4.4'
-PACKAGE_STRING='RT 3.4.4'
-PACKAGE_BUGREPORT='rt-bugs@fsck.com'
+PACKAGE_VERSION='3.6.4'
+PACKAGE_STRING='RT 3.6.4'
+PACKAGE_BUGREPORT='rt-bugs@bestpractical.com'
 
 ac_unique_file="lib/RT.pm.in"
 ac_default_prefix=/opt/rt3
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS rt_version_major rt_version_minor rt_version_patch INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PERL SPEEDY_BIN exp_prefix exp_exec_prefix exp_bindir exp_sbindir exp_sysconfdir exp_mandir exp_libdir exp_datadir htmldir exp_htmldir manualdir exp_manualdir exp_localstatedir logfiledir exp_logfiledir masonstatedir exp_masonstatedir sessionstatedir exp_sessionstatedir customdir exp_customdir custometcdir exp_custometcdir customhtmldir exp_customhtmldir customlexdir exp_customlexdir customlibdir exp_customlibdir rt_layout_name BIN_OWNER LIBS_OWNER LIBS_GROUP DB_TYPE DATABASE_ENV_PREF DB_HOST DB_PORT DB_RT_HOST DB_DBA DB_DATABASE DB_RT_USER DB_RT_PASS WEB_USER WEB_GROUP RTGROUP APACHECTL RT_DEVEL_MODE RT_VERSION_MAJOR RT_VERSION_MINOR RT_VERSION_PATCH RT_PATH RT_DOC_PATH RT_LOCAL_PATH RT_LIB_PATH RT_ETC_PATH CONFIG_FILE_PATH RT_BIN_PATH RT_SBIN_PATH RT_VAR_PATH RT_MAN_PATH MASON_DATA_PATH MASON_SESSION_PATH MASON_HTML_PATH LOCAL_ETC_PATH MASON_LOCAL_HTML_PATH LOCAL_LEXICON_PATH LOCAL_LIB_PATH DESTDIR RT_LOG_PATH LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS rt_version_major rt_version_minor rt_version_patch INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK PERL SPEEDY_BIN exp_prefix exp_exec_prefix exp_bindir exp_sbindir exp_sysconfdir exp_mandir exp_libdir exp_datadir htmldir exp_htmldir manualdir exp_manualdir exp_localstatedir logfiledir exp_logfiledir masonstatedir exp_masonstatedir sessionstatedir exp_sessionstatedir customdir exp_customdir custometcdir exp_custometcdir customhtmldir exp_customhtmldir customlexdir exp_customlexdir customlibdir exp_customlibdir rt_layout_name BIN_OWNER LIBS_OWNER LIBS_GROUP DB_TYPE DATABASE_ENV_PREF DB_HOST DB_PORT DB_RT_HOST DB_DBA DB_DATABASE DB_RT_USER DB_RT_PASS WEB_USER WEB_GROUP RTGROUP APACHECTL RT_STANDALONE RT_DEVEL_MODE RT_VERSION_MAJOR RT_VERSION_MINOR RT_VERSION_PATCH RT_PATH RT_DOC_PATH RT_LOCAL_PATH RT_LIB_PATH RT_ETC_PATH CONFIG_FILE_PATH RT_BIN_PATH RT_SBIN_PATH RT_VAR_PATH RT_MAN_PATH MASON_DATA_PATH MASON_SESSION_PATH MASON_HTML_PATH LOCAL_ETC_PATH MASON_LOCAL_HTML_PATH LOCAL_LEXICON_PATH LOCAL_LIB_PATH DESTDIR RT_LOG_PATH LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -729,7 +729,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.4.4 to adapt to many kinds of systems.
+\`configure' configures RT 3.6.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -786,7 +786,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of RT 3.4.4:";;
+     short | recursive ) echo "Configuration of RT 3.6.4:";;
    esac
   cat <<\_ACEOF
 
@@ -822,6 +822,7 @@ Optional Packages:
   --with-rt-group=GROUP   group to own all files (default: rt)
   --with-my-user-group    set all users and groups to current user/group
   --with-apachectl        instruct RT where to find your apachectl
+  --with-standalone       Install modules for pure perl standalone server
   --with-devel-mode       Turn on development aids that might hurt you in
                           production
 
@@ -831,7 +832,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <rt-bugs@fsck.com>.
+Report bugs to <rt-bugs@bestpractical.com>.
 _ACEOF
 fi
 
@@ -927,7 +928,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-RT configure 3.4.4
+RT configure 3.6.4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -941,7 +942,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.4.4, which was
+It was created by RT $as_me 3.6.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1281,7 +1282,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 rt_version_major=3
 
-rt_version_minor=4
+rt_version_minor=6
 
 rt_version_patch=4
 
@@ -1393,6 +1394,46 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
+for ac_prog in gawk mawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$AWK" && break
+done
+
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
@@ -1478,7 +1519,7 @@ echo "$as_me: WARNING: Layout file $srcdir/config.layout not found" >&2;}
 		s/\s+$/\n/gim;
 		s/\+$/\/rt3/gim;
 		# m4 will not let us just use $srcdir/config.layout, we need $1
-		s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/$1=$2/gim;
+		s/^\s*((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man|html)dir)\s*:\s*(.*)$/$1=$2/gim;
 		s/^\s*(.*?)\s*:\s*(.*)$/\(test "x\$$1" = "xNONE" || test "x\$$1" = "x") && $1=$2/gim;
 		 ' < $srcdir/config.layout > $pldconf
 
@@ -1984,6 +2025,8 @@ fi
 fi;
 
 
+# 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}
 
@@ -1998,6 +2041,24 @@ if test "${with_my_user_group+set}" = set; then
             WEB_GROUP=$my_group
 fi;
 
+# Test for valid database names
+if  test "$DB_TYPE" == "mysql" ; then
+   echo "$as_me:$LINENO: checking if database name is valid" >&5
+echo $ECHO_N "checking if database name is valid... $ECHO_C" >&6
+          if  echo $DB_DATABASE | $AWK '/-/ { exit 1 }' ; then
+   echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+   { { echo "$as_me:$LINENO: error: no.  database name ($DB_DATABASE) contains '-' which is not valid for mysql" >&5
+echo "$as_me: error: no.  database name ($DB_DATABASE) contains '-' which is not valid for mysql" >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+
+
+fi
+
 
 
 
@@ -2014,6 +2075,16 @@ fi;
 # Check whether --with-devel-mode or --without-devel-mode was given.
 if test "${with_devel_mode+set}" = set; then
   withval="$with_devel_mode"
+  RT_STANDALONE="1"
+else
+  RT_STANDALONE="0"
+fi;
+
+
+
+# Check whether --with-devel-mode or --without-devel-mode was given.
+if test "${with_devel_mode+set}" = set; then
+  withval="$with_devel_mode"
   RT_DEVEL_MODE="1"
 else
   RT_DEVEL_MODE="0"
@@ -2465,7 +2536,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by RT $as_me 3.4.4, which was
+This file was extended by RT $as_me 3.6.4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2520,7 +2591,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-RT config.status 3.4.4
+RT config.status 3.6.4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -2726,6 +2797,7 @@ s,@rt_version_patch@,$rt_version_patch,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@AWK@,$AWK,;t t
 s,@PERL@,$PERL,;t t
 s,@SPEEDY_BIN@,$SPEEDY_BIN,;t t
 s,@exp_prefix@,$exp_prefix,;t t
@@ -2774,6 +2846,7 @@ s,@WEB_USER@,$WEB_USER,;t t
 s,@WEB_GROUP@,$WEB_GROUP,;t t
 s,@RTGROUP@,$RTGROUP,;t t
 s,@APACHECTL@,$APACHECTL,;t t
+s,@RT_STANDALONE@,$RT_STANDALONE,;t t
 s,@RT_DEVEL_MODE@,$RT_DEVEL_MODE,;t t
 s,@RT_VERSION_MAJOR@,$RT_VERSION_MAJOR,;t t
 s,@RT_VERSION_MINOR@,$RT_VERSION_MINOR,;t t