--- configure.Dist 2010-03-24 13:10:36.000000000 -0700 +++ configure 2010-12-23 00:24:22.000000000 -0800 @@ -848,7 +848,6 @@ DBDIR FILTERDIR HTTPDIR -LIBPERLDIR LOGDIR RUNDIR SPOOLDIR @@ -869,13 +868,6 @@ LOG_COMPRESSEXT SENDMAIL DO_DBZ_TAGGED_HASH -PERL -PERL_CPPFLAGS -PERL_LIBS -PERL_WARNINGS -PYTHON -PYTHON_CPPFLAGS -PYTHON_LIBS HOSTNAME LEX LEX_OUTPUT_ROOT @@ -933,8 +925,6 @@ CPPFLAGS CPP SENDMAIL -PERL -PYTHON YACC YFLAGS AWK @@ -12538,13 +12528,6 @@ -# Check whether --with-libperl-dir was given. -if test "${with_libperl_dir+set}" = set; then - withval=$with_libperl_dir; LIBPERLDIR=$with_libperl_dir -else - LIBPERLDIR='${libdir}/perl' -fi - # Check whether --with-log-dir was given. @@ -12803,161 +12786,6 @@ -# Check whether --with-perl was given. -if test "${with_perl+set}" = set; then - withval=$with_perl; case $withval in - yes) DO_PERL=DO - -cat >>confdefs.h <<\_ACEOF -#define DO_PERL 1 -_ACEOF - - ;; - no) DO_PERL=DONT ;; - *) { { echo "$as_me:$LINENO: error: invalid argument to --with-perl" >&5 -echo "$as_me: error: invalid argument to --with-perl" >&2;} - { (exit 1); exit 1; }; } ;; - esac -else - DO_PERL=DONT -fi - - -if test x"${PERL}" = x ; then - # Extract the first word of "perl", so it can be a program name with args. -set dummy perl; 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_path_PERL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -PERL=$ac_cv_path_PERL -if test -n "$PERL"; then - { echo "$as_me:$LINENO: result: $PERL" >&5 -echo "${ECHO_T}$PERL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test x"${PERL}" = x ; then - { { echo "$as_me:$LINENO: error: perl was not found in path and is required" >&5 -echo "$as_me: error: perl was not found in path and is required" >&2;} - { (exit 1); exit 1; }; } -fi -{ echo "$as_me:$LINENO: checking for Perl version" >&5 -echo $ECHO_N "checking for Perl version... $ECHO_C" >&6; } -if test "${inn_cv_perl_version+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if $PERL -e 'require 5.004_03;' > /dev/null 2>&1 ; then - inn_cv_perl_version=`$PERL -e 'print $]'` - else - { { echo "$as_me:$LINENO: error: Perl 5.004_03 or greater is required" >&5 -echo "$as_me: error: Perl 5.004_03 or greater is required" >&2;} - { (exit 1); exit 1; }; } - fi -fi -{ echo "$as_me:$LINENO: result: $inn_cv_perl_version" >&5 -echo "${ECHO_T}$inn_cv_perl_version" >&6; } -{ echo "$as_me:$LINENO: checking for Encode" >&5 -echo $ECHO_N "checking for Encode... $ECHO_C" >&6; } - if $PERL -e 'require Encode;' > /dev/null 2>&1 ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: WARNING: Encode Perl module is required by controlchan" >&5 -echo "$as_me: WARNING: Encode Perl module is required by controlchan" >&2;} - inn_perl_module_warning="$inn_perl_module_warning Encode (for controlchan)" - fi -{ echo "$as_me:$LINENO: checking for GD" >&5 -echo $ECHO_N "checking for GD... $ECHO_C" >&6; } - if $PERL -e 'require GD;' > /dev/null 2>&1 ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: WARNING: GD Perl module is required by innreport's HTML output" >&5 -echo "$as_me: WARNING: GD Perl module is required by innreport's HTML output" >&2;} - inn_perl_module_warning="$inn_perl_module_warning GD (for innreport's HTML output)" - fi -{ echo "$as_me:$LINENO: checking for MIME::Parser" >&5 -echo $ECHO_N "checking for MIME::Parser... $ECHO_C" >&6; } - if $PERL -e 'require MIME::Parser;' > /dev/null 2>&1 ; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: WARNING: MIME::Parser Perl module is required by controlchan" >&5 -echo "$as_me: WARNING: MIME::Parser Perl module is required by controlchan" >&2;} - inn_perl_module_warning="$inn_perl_module_warning MIME::Parser (for controlchan)" - fi - -if test x"$DO_PERL" = xDO ; then - { echo "$as_me:$LINENO: checking for Perl linkage" >&5 -echo $ECHO_N "checking for Perl linkage... $ECHO_C" >&6; } - inn_perl_core_path=`$PERL -MConfig -e 'print $Config{archlibexp}'` - inn_perl_core_flags=`$PERL -MExtUtils::Embed -e ccopts` - inn_perl_core_libs=`$PERL -MExtUtils::Embed -e ldopts 2>&1 | tail -n 1` - inn_perl_core_libs=" $inn_perl_core_libs " - inn_perl_core_libs=`echo "$inn_perl_core_libs" | sed 's/ -lc / /'` - for i in $LIBS ; do - inn_perl_core_libs=`echo "$inn_perl_core_libs" | sed "s/ $i / /"` - done - case $host in - *-linux*) - inn_perl_core_libs=`echo "$inn_perl_core_libs" | sed 's/ -lgdbm / /'` - ;; - *-cygwin*) - inn_perl_libname=`$PERL -MConfig -e 'print $Config{libperl}'` - inn_perl_libname=`echo "$inn_perl_libname" | sed 's/^lib//; s/\.a$//'` - inn_perl_core_libs="${inn_perl_core_libs}-l$inn_perl_libname" - ;; - esac - inn_perl_core_libs=`echo "$inn_perl_core_libs" | sed 's/^ *//'` - inn_perl_core_libs=`echo "$inn_perl_core_libs" | sed 's/ *$//'` - inn_perl_core_flags=" $inn_perl_core_flags " - if test x"$inn_enable_largefiles" != xyes ; then - for f in -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES ; do - inn_perl_core_flags=`echo "$inn_perl_core_flags" | sed "s/ $f / /"` - done - fi - inn_perl_core_flags=`echo "$inn_perl_core_flags" | sed 's/^ *//'` - inn_perl_core_flags=`echo "$inn_perl_core_flags" | sed 's/ *$//'` - PERL_CPPFLAGS="$inn_perl_core_flags" - PERL_LIBS="$inn_perl_core_libs" - { echo "$as_me:$LINENO: result: $inn_perl_core_path" >&5 -echo "${ECHO_T}$inn_perl_core_path" >&6; } - { echo "$as_me:$LINENO: checking if $CC supports -Wno-extra" >&5 echo $ECHO_N "checking if $CC supports -Wno-extra... $ECHO_C" >&6; } if test "${inn_cv_compiler_c__Wno_extra+set}" = set; then @@ -13009,114 +12837,6 @@ CFLAGS=$save_CFLAGS fi -{ echo "$as_me:$LINENO: result: $inn_cv_compiler_c__Wno_extra" >&5 -echo "${ECHO_T}$inn_cv_compiler_c__Wno_extra" >&6; } - if test x"$inn_cv_compiler_c__Wno_extra" = xyes ; then - PERL_WARNINGS=-Wno-extra - else - PERL_WARNINGS='' - fi -else - PERL_CPPFLAGS='' - PERL_LIBS='' - PERL_WARNINGS='' -fi - - - - - -# Check whether --with-python was given. -if test "${with_python+set}" = set; then - withval=$with_python; case $withval in - yes) DO_PYTHON=DO - -cat >>confdefs.h <<\_ACEOF -#define DO_PYTHON 1 -_ACEOF - - ;; - no) DO_PYTHON=DONT ;; - *) { { echo "$as_me:$LINENO: error: invalid argument to --with-python" >&5 -echo "$as_me: error: invalid argument to --with-python" >&2;} - { (exit 1); exit 1; }; } ;; - esac -else - DO_PYTHON=DONT -fi - - -if test x"$DO_PYTHON" = xDO ; then - if test x"${PYTHON}" = x ; then - # Extract the first word of "python", so it can be a program name with args. -set dummy python; 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_path_PYTHON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PYTHON in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. - ;; - *) - 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -PYTHON=$ac_cv_path_PYTHON -if test -n "$PYTHON"; then - { echo "$as_me:$LINENO: result: $PYTHON" >&5 -echo "${ECHO_T}$PYTHON" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test x"${PYTHON}" = x ; then - { { echo "$as_me:$LINENO: error: python was not found in path and is required" >&5 -echo "$as_me: error: python was not found in path and is required" >&2;} - { (exit 1); exit 1; }; } -fi - { echo "$as_me:$LINENO: checking for Python linkage" >&5 -echo $ECHO_N "checking for Python linkage... $ECHO_C" >&6; } - py_prefix=`$PYTHON -c 'import sys; print sys.prefix'` - py_ver=`$PYTHON -c 'import sys; print sys.version[:3]'` - py_libdir="$py_prefix/lib/python$py_ver" - PYTHON_CPPFLAGS="-I$py_prefix/include/python$py_ver" - py_linkage="" - for py_linkpart in LIBS LIBC LIBM LOCALMODLIBS BASEMODLIBS \ - LINKFORSHARED LDFLAGS ; do - py_linkage="$py_linkage "`grep "^${py_linkpart}=" \ - $py_libdir/config/Makefile \ - | sed -e 's/^.*=//'` - done - PYTHON_LIBS="-L$py_libdir/config -lpython$py_ver $py_linkage" - PYTHON_LIBS=`echo $PYTHON_LIBS | sed -e 's/ \\t*/ /g'` - { echo "$as_me:$LINENO: result: $py_libdir" >&5 -echo "${ECHO_T}$py_libdir" >&6; } -else - PYTHON_CPPFLAGS= - PYTHON_LIBS= -fi - - HOSTNAME=`hostname 2> /dev/null || uname -n` @@ -23728,8 +23448,6 @@ ac_config_files="$ac_config_files scripts/innshellvars scripts/innshellvars.tcl" -ac_config_files="$ac_config_files perl/INN/Config.pm scripts/innshellvars.pl" - ac_config_files="$ac_config_files support/fixconfig" ac_config_files="$ac_config_files support/fixscript" @@ -24562,7 +24280,6 @@ "include/inn/paths.h") CONFIG_FILES="$CONFIG_FILES include/inn/paths.h" ;; "scripts/innshellvars") CONFIG_FILES="$CONFIG_FILES scripts/innshellvars" ;; "scripts/innshellvars.tcl") CONFIG_FILES="$CONFIG_FILES scripts/innshellvars.tcl" ;; - "perl/INN/Config.pm") CONFIG_FILES="$CONFIG_FILES perl/INN/Config.pm" ;; "scripts/innshellvars.pl") CONFIG_FILES="$CONFIG_FILES scripts/innshellvars.pl" ;; "support/fixconfig") CONFIG_FILES="$CONFIG_FILES support/fixconfig" ;; "support/fixscript") CONFIG_FILES="$CONFIG_FILES support/fixscript" ;; @@ -25915,32 +25632,3 @@ innfeed/innfeed.h EOM - -if test x"$inn_perl_module_warning" != x ; then - echo "Missing Perl modules: $inn_perl_module_warning." - echo "You should install them for these programs to work fine." -fi - -if $PERL -e "exit((stat('$PATH_TMP'))[2] & 2)" > /dev/null ; then - : -else - cat <