X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fconfigure;h=2e736ff1b5b72b00a85ceb897d106c37bf6b8340;hp=616017fb161149b4f7f6edfa15976f8d39cdbe59;hb=681a340f6be4184b1472a8e1fa9cd5d074f6f325;hpb=c71b2dc296da6207c525a064d322f7153c284d4e diff --git a/rt/configure b/rt/configure index 616017fb1..2e736ff1b 100755 --- a/rt/configure +++ b/rt/configure @@ -1,14 +1,12 @@ #! /bin/sh # From configure.ac Revision. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for RT rt-4.0.21. +# Generated by GNU Autoconf 2.69 for RT rt-4.2.13. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -137,6 +135,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -170,7 +193,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -214,21 +238,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -331,6 +359,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -452,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -486,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -507,28 +547,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -560,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='RT' PACKAGE_TARNAME='rt' -PACKAGE_VERSION='rt-4.0.21' -PACKAGE_STRING='RT rt-4.0.21' +PACKAGE_VERSION='rt-4.2.13' +PACKAGE_STRING='RT rt-4.2.13' PACKAGE_BUGREPORT='rt-bugs@bestpractical.com' PACKAGE_URL='' @@ -572,6 +592,7 @@ LIBOBJS RT_LOG_PATH_R LOCAL_PLUGIN_PATH_R LOCAL_LIB_PATH_R +LOCAL_STATIC_PATH_R LOCAL_LEXICON_PATH_R MASON_LOCAL_HTML_PATH_R LOCAL_ETC_PATH_R @@ -579,6 +600,7 @@ MASON_HTML_PATH_R MASON_SESSION_PATH_R MASON_DATA_PATH_R RT_PLUGIN_PATH_R +RT_STATIC_PATH_R RT_LEXICON_PATH_R RT_FONT_PATH_R RT_MAN_PATH_R @@ -594,6 +616,7 @@ RT_PATH_R RT_LOG_PATH LOCAL_PLUGIN_PATH LOCAL_LIB_PATH +LOCAL_STATIC_PATH LOCAL_LEXICON_PATH MASON_LOCAL_HTML_PATH LOCAL_ETC_PATH @@ -608,6 +631,7 @@ RT_SBIN_PATH RT_BIN_PATH CONFIG_FILE_PATH RT_ETC_PATH +RT_STATIC_PATH RT_LEXICON_PATH RT_LIB_PATH RT_LOCAL_PATH @@ -616,12 +640,13 @@ RT_PATH RT_VERSION_PATCH RT_VERSION_MINOR RT_VERSION_MAJOR -RT_SSL_MAILGATE +RT_SMIME +RT_SMIME_DEPS RT_GPG +RT_GPG_DEPS RT_GD RT_GRAPHVIZ -RT_DEVEL_MODE -APACHECTL +RT_DEVELOPER RTGROUP WEB_GROUP WEB_USER @@ -641,6 +666,8 @@ COMMENT_INPLACE_LAYOUT rt_layout_name exp_customlibdir customlibdir +exp_customstaticdir +customstaticdir exp_customlexdir customlexdir exp_customhtmldir @@ -666,6 +693,8 @@ exp_fontdir fontdir exp_htmldir exp_datadir +exp_staticdir +staticdir exp_lexdir lexdir exp_libdir @@ -676,6 +705,7 @@ exp_bindir exp_exec_prefix exp_prefix WEB_HANDLER +FINDPERM PERL INSTALL_DATA INSTALL_SCRIPT @@ -742,16 +772,14 @@ with_web_user with_web_group with_rt_group with_my_user_group -with_apachectl -with_devel_mode -enable_devel_mode +with_developer +enable_developer with_graphviz enable_graphviz with_gd enable_gd enable_gpg -with_ssl_mailgate -enable_ssl_mailgate +enable_smime ' ac_precious_vars='build_alias host_alias @@ -1212,8 +1240,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1299,7 +1325,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 rt-4.0.21 to adapt to many kinds of systems. +\`configure' configures RT rt-4.2.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1360,7 +1386,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of RT rt-4.0.21:";; + short | recursive ) echo "Configuration of RT rt-4.2.13:";; esac cat <<\_ACEOF @@ -1369,12 +1395,12 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-layout=LAYOUT Use a specific directory layout (Default: relative) - --enable-devel-mode Turn on development aids that might hurt you in - production + --enable-developer Add dependencies needed for testing and developing + RT --enable-graphviz Turns on support for RT's GraphViz dependency charts --enable-gd Turns on support for RT's GD pie and bar charts --enable-gpg Turns on GNU Privacy Guard (GPG) support - --enable-ssl-mailgate Turns on support for HTTPS in rt-mailgate + --enable-smime Turns on Secure MIME (SMIME) support Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1405,7 +1431,6 @@ Optional Packages: --with-web-group=GROUP group the web server runs as (default: www) --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 Some influential environment variables: @@ -1477,10 +1502,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -RT configure rt-4.0.21 -generated by GNU Autoconf 2.68 +RT configure rt-4.2.13 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1494,8 +1519,8 @@ cat >config.log <<_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 rt-4.0.21, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by RT $as_me rt-4.2.13, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1849,9 +1874,9 @@ CONFIGURE_INCANT="$0 $@" rt_version_major=4 -rt_version_minor=0 +rt_version_minor=2 -rt_version_patch=21 +rt_version_patch=13 test "x$rt_version_major" = 'x' && rt_version_major=0 test "x$rt_version_minor" = 'x' && rt_version_minor=0 @@ -1923,7 +1948,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1998,7 +2023,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2025,6 +2050,19 @@ if test "$PERL" = 'not found'; then as_fn_error $? "cannot use $PACKAGE_NAME without perl" "$LINENO" 5 fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking checking version of find" >&5 +$as_echo_n "checking checking version of find... " >&6; } +if find --version 2>&1 | grep 'GNU'; then : + FINDPERM="/" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: configuring for GNU find" >&5 +$as_echo "configuring for GNU find" >&6; } +else + FINDPERM="+" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: configuring for BSD find" >&5 +$as_echo "configuring for BSD find" >&6; } +fi + + # Check whether --with-web-handler was given. @@ -2076,9 +2114,9 @@ $as_echo "$as_me: WARNING: Layout file $srcdir/config.layout not found" >&2;} for var in prefix exec_prefix bindir sbindir \ sysconfdir mandir libdir datadir htmldir fontdir\ - lexdir localstatedir logfiledir masonstatedir \ + lexdir staticdir localstatedir logfiledir masonstatedir \ sessionstatedir customdir custometcdir customhtmldir \ - customlexdir customplugindir customlibdir manualdir; do + customlexdir customstaticdir customplugindir customlibdir manualdir; do eval "val=\"\$$var\"" val=`echo $val | sed -e 's:\(.\)/*$:\1:'` val=`echo $val | @@ -2198,6 +2236,19 @@ $as_echo "$as_me: WARNING: Layout file $srcdir/config.layout not found" >&2;} ap_last='' + ap_cur='$staticdir' + while test "x${ap_cur}" != "x${ap_last}"; do + ap_last="${ap_cur}" + ap_cur=`eval "echo ${ap_cur}"` + done + exp_staticdir="${ap_cur}" + + + + + + + ap_last='' ap_cur='$datadir' while test "x${ap_cur}" != "x${ap_last}"; do ap_last="${ap_cur}" @@ -2380,6 +2431,19 @@ $as_echo "$as_me: WARNING: Layout file $srcdir/config.layout not found" >&2;} ap_last='' + ap_cur='$customstaticdir' + while test "x${ap_cur}" != "x${ap_last}"; do + ap_last="${ap_cur}" + ap_cur=`eval "echo ${ap_cur}"` + done + exp_customstaticdir="${ap_cur}" + + + + + + + ap_last='' ap_cur='$customlibdir' while test "x${ap_cur}" != "x${ap_last}"; do ap_last="${ap_cur}" @@ -2621,9 +2685,7 @@ 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_group=$($PERL -MPOSIX=getgid -le 'print scalar getgrgid getgid') my_user=${USER:-$LOGNAME} # Check whether --with-my-user-group was given. @@ -2648,50 +2710,25 @@ else fi -if test "$DB_TYPE" = "mysql" ; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if database name is valid" >&5 -$as_echo_n "checking if database name is valid... " >&6; } - if echo $DB_DATABASE | $PERL -e 'exit(1) if <> =~ /-/'; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - as_fn_error $? "no. database name ($DB_DATABASE) contains '-' which is not valid for mysql" "$LINENO" 5 - -fi - - -fi - - - -# Check whether --with-apachectl was given. -if test "${with_apachectl+set}" = set; then : - withval=$with_apachectl; APACHECTL=$withval -else - APACHECTL=`which apachectl` -fi - - - -# Check whether --with-devel-mode was given. -if test "${with_devel_mode+set}" = set; then : - withval=$with_devel_mode; RT_DEVEL_MODE=$withval +# Check whether --with-developer was given. +if test "${with_developer+set}" = set; then : + withval=$with_developer; RT_DEVELOPER=$withval else - RT_DEVEL_MODE="0" + RT_DEVELOPER="0" fi -# Check whether --enable-devel-mode was given. -if test "${enable_devel_mode+set}" = set; then : - enableval=$enable_devel_mode; RT_DEVEL_MODE=$enableval +# Check whether --enable-developer was given. +if test "${enable_developer+set}" = set; then : + enableval=$enable_developer; RT_DEVELOPER=$enableval else - RT_DEVEL_MODE=$RT_DEVEL_MODE + RT_DEVELOPER=$RT_DEVELOPER fi -if test "$RT_DEVEL_MODE" = yes; then - RT_DEVEL_MODE="1" +if test "$RT_DEVELOPER" = yes; then + RT_DEVELOPER="1" else - RT_DEVEL_MODE="0" + RT_DEVELOPER="0" fi @@ -2711,7 +2748,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RT_GRAPHVIZ=""yes"" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2767,7 +2804,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RT_GD=""yes"" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2811,11 +2848,11 @@ fi set dummy gpg; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RT_GPG+:} false; then : +if ${ac_cv_prog_RT_GPG_DEPS+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$RT_GPG"; then - ac_cv_prog_RT_GPG="$RT_GPG" # Let the user override the test. + if test -n "$RT_GPG_DEPS"; then + ac_cv_prog_RT_GPG_DEPS="$RT_GPG_DEPS" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2823,8 +2860,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RT_GPG=""yes"" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RT_GPG_DEPS=""yes"" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -2832,19 +2869,24 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_prog_RT_GPG" && ac_cv_prog_RT_GPG=""no"" + test -z "$ac_cv_prog_RT_GPG_DEPS" && ac_cv_prog_RT_GPG_DEPS=""no"" fi fi -RT_GPG=$ac_cv_prog_RT_GPG -if test -n "$RT_GPG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RT_GPG" >&5 -$as_echo "$RT_GPG" >&6; } +RT_GPG_DEPS=$ac_cv_prog_RT_GPG_DEPS +if test -n "$RT_GPG_DEPS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RT_GPG_DEPS" >&5 +$as_echo "$RT_GPG_DEPS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi +if test "$RT_GPG_DEPS" = yes; then + RT_GPG_DEPS="1" +else + RT_GPG_DEPS="0" +fi # Check whether --enable-gpg was given. if test "${enable_gpg+set}" = set; then : enableval=$enable_gpg; RT_GPG=$enableval @@ -2852,35 +2894,83 @@ fi if test "$RT_GPG" = yes; then RT_GPG="1" + RT_GPG_DEPS="1" else - RT_GPG="0" + if test "$RT_GPG" = no; then + RT_GPG="0" + RT_GPG_DEPS="0" + else + RT_GPG="0" + fi fi -# Check whether --with-ssl-mailgate was given. -if test "${with_ssl_mailgate+set}" = set; then : - withval=$with_ssl_mailgate; RT_SSL_MAILGATE=$withval + +# Extract the first word of "openssl", so it can be a program name with args. +set dummy openssl; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RT_SMIME_DEPS+:} false; then : + $as_echo_n "(cached) " >&6 else - RT_SSL_MAILGATE="0" + if test -n "$RT_SMIME_DEPS"; then + ac_cv_prog_RT_SMIME_DEPS="$RT_SMIME_DEPS" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RT_SMIME_DEPS=""yes"" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_RT_SMIME_DEPS" && ac_cv_prog_RT_SMIME_DEPS=""no"" fi +fi +RT_SMIME_DEPS=$ac_cv_prog_RT_SMIME_DEPS +if test -n "$RT_SMIME_DEPS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RT_SMIME_DEPS" >&5 +$as_echo "$RT_SMIME_DEPS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + -# Check whether --enable-ssl-mailgate was given. -if test "${enable_ssl_mailgate+set}" = set; then : - enableval=$enable_ssl_mailgate; RT_SSL_MAILGATE=$enableval +if test "$RT_SMIME_DEPS" = yes; then + RT_SMIME_DEPS="1" else - RT_SSL_MAILGATE=$RT_SSL_MAILGATE + RT_SMIME_DEPS="0" +fi +# Check whether --enable-smime was given. +if test "${enable_smime+set}" = set; then : + enableval=$enable_smime; RT_SMIME=$enableval fi -if test "$RT_SSL_MAILGATE" = yes; then - RT_SSL_MAILGATE="1" +if test "$RT_SMIME" = yes; then + RT_SMIME="1" + RT_SMIME_DEPS="1" else - RT_SSL_MAILGATE="0" + if test "$RT_SMIME" = no; then + RT_SMIME="0" + RT_SMIME_DEPS="0" + else + RT_SMIME="0" + fi fi + RT_VERSION_MAJOR=${rt_version_major} RT_VERSION_MINOR=${rt_version_minor} @@ -2898,6 +2988,8 @@ RT_LIB_PATH=${exp_libdir} RT_LEXICON_PATH=${exp_lexdir} +RT_STATIC_PATH=${exp_staticdir} + RT_ETC_PATH=${exp_sysconfdir} CONFIG_FILE_PATH=${exp_sysconfdir} @@ -2926,6 +3018,8 @@ MASON_LOCAL_HTML_PATH=${exp_customhtmldir} LOCAL_LEXICON_PATH=${exp_customlexdir} +LOCAL_STATIC_PATH=${exp_customstaticdir} + LOCAL_LIB_PATH=${exp_customlibdir} LOCAL_PLUGIN_PATH=${exp_customplugindir} @@ -2958,6 +3052,8 @@ RT_FONT_PATH_R=${exp_prefix}/${exp_fontdir} RT_LEXICON_PATH_R=${exp_prefix}/${exp_lexdir} +RT_STATIC_PATH_R=${exp_prefix}/${exp_staticdir} + RT_PLUGIN_PATH_R=${exp_prefix}/${exp_plugindir} MASON_DATA_PATH_R=${exp_prefix}/${exp_masonstatedir} @@ -2972,6 +3068,8 @@ MASON_LOCAL_HTML_PATH_R=${exp_prefix}/${exp_customhtmldir} LOCAL_LEXICON_PATH_R=${exp_prefix}/${exp_customlexdir} +LOCAL_STATIC_PATH_R=${exp_prefix}/${exp_customstaticdir} + LOCAL_LIB_PATH_R=${exp_prefix}/${exp_customlibdir} LOCAL_PLUGIN_PATH_R=${exp_prefix}/${exp_customplugindir} @@ -2989,6 +3087,8 @@ RT_LIB_PATH_R=${exp_libdir} RT_LEXICON_PATH_R=${exp_lexdir} +RT_STATIC_PATH_R=${exp_staticdir} + RT_ETC_PATH_R=${exp_sysconfdir} RT_PLUGIN_PATH_R=${exp_plugindir} @@ -3017,6 +3117,8 @@ MASON_LOCAL_HTML_PATH_R=${exp_customhtmldir} LOCAL_LEXICON_PATH_R=${exp_customlexdir} +LOCAL_STATIC_PATH_R=${exp_customstaticdir} + LOCAL_PLUGIN_PATH_R=${exp_customplugindir} LOCAL_LIB_PATH_R=${exp_customlibdir} @@ -3027,10 +3129,10 @@ RT_LOG_PATH_R=${exp_logfiledir} fi -ac_config_files="$ac_config_files etc/upgrade/3.8-ical-extension etc/upgrade/4.0-customfield-checkbox-extension etc/upgrade/split-out-cf-categories etc/upgrade/generate-rtaddressregexp etc/upgrade/upgrade-articles etc/upgrade/vulnerable-passwords sbin/rt-attributes-viewer sbin/rt-preferences-viewer sbin/rt-session-viewer sbin/rt-dump-metadata sbin/rt-setup-database sbin/rt-test-dependencies sbin/rt-email-digest sbin/rt-email-dashboards sbin/rt-clean-sessions sbin/rt-shredder sbin/rt-validator sbin/rt-validate-aliases sbin/rt-email-group-admin sbin/rt-server sbin/rt-server.fcgi sbin/standalone_httpd sbin/rt-setup-fulltext-index sbin/rt-fulltext-indexer bin/rt-crontool bin/rt-mailgate bin/rt" +ac_config_files="$ac_config_files etc/upgrade/3.8-ical-extension etc/upgrade/4.0-customfield-checkbox-extension etc/upgrade/generate-rtaddressregexp etc/upgrade/sanity-check-stylesheets etc/upgrade/shrink-cgm-table etc/upgrade/shrink-transactions-table etc/upgrade/split-out-cf-categories etc/upgrade/switch-templates-to etc/upgrade/time-worked-history etc/upgrade/upgrade-articles etc/upgrade/vulnerable-passwords sbin/rt-attributes-viewer sbin/rt-preferences-viewer sbin/rt-session-viewer sbin/rt-dump-metadata sbin/rt-setup-database sbin/rt-test-dependencies sbin/rt-email-digest sbin/rt-email-dashboards sbin/rt-clean-sessions sbin/rt-shredder sbin/rt-validator sbin/rt-validate-aliases sbin/rt-email-group-admin sbin/rt-server sbin/rt-server.fcgi sbin/standalone_httpd sbin/rt-setup-fulltext-index sbin/rt-fulltext-indexer sbin/rt-serializer sbin/rt-importer bin/rt-crontool bin/rt-mailgate bin/rt" -ac_config_files="$ac_config_files Makefile etc/RT_Config.pm lib/RT/Generated.pm t/data/configs/apache2.2+mod_perl.conf t/data/configs/apache2.2+fastcgi.conf" +ac_config_files="$ac_config_files Makefile etc/RT_Config.pm lib/RT/Generated.pm t/data/configs/apache2.2+mod_perl.conf t/data/configs/apache2.2+fastcgi.conf t/data/configs/apache2.4+mod_perl.conf t/data/configs/apache2.4+fastcgi.conf" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3475,16 +3577,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -3544,28 +3646,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -3586,8 +3676,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by RT $as_me rt-4.0.21, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by RT $as_me rt-4.2.13, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -3639,11 +3729,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -RT config.status rt-4.0.21 -configured by $0, generated by GNU Autoconf 2.68, +RT config.status rt-4.2.13 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -3721,7 +3811,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -3752,8 +3842,13 @@ do case $ac_config_target in "etc/upgrade/3.8-ical-extension") CONFIG_FILES="$CONFIG_FILES etc/upgrade/3.8-ical-extension" ;; "etc/upgrade/4.0-customfield-checkbox-extension") CONFIG_FILES="$CONFIG_FILES etc/upgrade/4.0-customfield-checkbox-extension" ;; - "etc/upgrade/split-out-cf-categories") CONFIG_FILES="$CONFIG_FILES etc/upgrade/split-out-cf-categories" ;; "etc/upgrade/generate-rtaddressregexp") CONFIG_FILES="$CONFIG_FILES etc/upgrade/generate-rtaddressregexp" ;; + "etc/upgrade/sanity-check-stylesheets") CONFIG_FILES="$CONFIG_FILES etc/upgrade/sanity-check-stylesheets" ;; + "etc/upgrade/shrink-cgm-table") CONFIG_FILES="$CONFIG_FILES etc/upgrade/shrink-cgm-table" ;; + "etc/upgrade/shrink-transactions-table") CONFIG_FILES="$CONFIG_FILES etc/upgrade/shrink-transactions-table" ;; + "etc/upgrade/split-out-cf-categories") CONFIG_FILES="$CONFIG_FILES etc/upgrade/split-out-cf-categories" ;; + "etc/upgrade/switch-templates-to") CONFIG_FILES="$CONFIG_FILES etc/upgrade/switch-templates-to" ;; + "etc/upgrade/time-worked-history") CONFIG_FILES="$CONFIG_FILES etc/upgrade/time-worked-history" ;; "etc/upgrade/upgrade-articles") CONFIG_FILES="$CONFIG_FILES etc/upgrade/upgrade-articles" ;; "etc/upgrade/vulnerable-passwords") CONFIG_FILES="$CONFIG_FILES etc/upgrade/vulnerable-passwords" ;; "sbin/rt-attributes-viewer") CONFIG_FILES="$CONFIG_FILES sbin/rt-attributes-viewer" ;; @@ -3774,6 +3869,8 @@ do "sbin/standalone_httpd") CONFIG_FILES="$CONFIG_FILES sbin/standalone_httpd" ;; "sbin/rt-setup-fulltext-index") CONFIG_FILES="$CONFIG_FILES sbin/rt-setup-fulltext-index" ;; "sbin/rt-fulltext-indexer") CONFIG_FILES="$CONFIG_FILES sbin/rt-fulltext-indexer" ;; + "sbin/rt-serializer") CONFIG_FILES="$CONFIG_FILES sbin/rt-serializer" ;; + "sbin/rt-importer") CONFIG_FILES="$CONFIG_FILES sbin/rt-importer" ;; "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" ;; @@ -3782,6 +3879,8 @@ do "lib/RT/Generated.pm") CONFIG_FILES="$CONFIG_FILES lib/RT/Generated.pm" ;; "t/data/configs/apache2.2+mod_perl.conf") CONFIG_FILES="$CONFIG_FILES t/data/configs/apache2.2+mod_perl.conf" ;; "t/data/configs/apache2.2+fastcgi.conf") CONFIG_FILES="$CONFIG_FILES t/data/configs/apache2.2+fastcgi.conf" ;; + "t/data/configs/apache2.4+mod_perl.conf") CONFIG_FILES="$CONFIG_FILES t/data/configs/apache2.4+mod_perl.conf" ;; + "t/data/configs/apache2.4+fastcgi.conf") CONFIG_FILES="$CONFIG_FILES t/data/configs/apache2.4+fastcgi.conf" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -4206,9 +4305,19 @@ which seems to be undefined. Please make sure it is defined" >&2;} ;; "etc/upgrade/4.0-customfield-checkbox-extension":F) chmod ug+x $ac_file ;; + "etc/upgrade/generate-rtaddressregexp":F) chmod ug+x $ac_file + ;; + "etc/upgrade/sanity-check-stylesheets":F) chmod ug+x $ac_file + ;; + "etc/upgrade/shrink-cgm-table":F) chmod ug+x $ac_file + ;; + "etc/upgrade/shrink-transactions-table":F) chmod ug+x $ac_file + ;; "etc/upgrade/split-out-cf-categories":F) chmod ug+x $ac_file ;; - "etc/upgrade/generate-rtaddressregexp":F) chmod ug+x $ac_file + "etc/upgrade/switch-templates-to":F) chmod ug+x $ac_file + ;; + "etc/upgrade/time-worked-history":F) chmod ug+x $ac_file ;; "etc/upgrade/upgrade-articles":F) chmod ug+x $ac_file ;; @@ -4250,6 +4359,10 @@ which seems to be undefined. Please make sure it is defined" >&2;} ;; "sbin/rt-fulltext-indexer":F) chmod ug+x $ac_file ;; + "sbin/rt-serializer":F) chmod ug+x $ac_file + ;; + "sbin/rt-importer":F) chmod ug+x $ac_file + ;; "bin/rt-crontool":F) chmod ug+x $ac_file ;; "bin/rt-mailgate":F) chmod ug+x $ac_file