@@ -1,3 +1,8 @@

+Fri Oct 26 19:51:52 CEST 2007 (tk)

+----------------------------------

+  * libclamav, configure: by default don't build and link with libclamunrar;

+			  use --enable-unrar to build with RAR support

+

 Fri Oct 26 17:47:22 CEST 2007 (tk)

 ----------------------------------

   * libclamunrar/Makefile: remove

@@ -153,11 +153,14 @@ ECHO_C = @ECHO_C@

 ECHO_N = @ECHO_N@

 ECHO_T = @ECHO_T@

 EGREP = @EGREP@

+ENABLE_UNRAR_FALSE = @ENABLE_UNRAR_FALSE@

+ENABLE_UNRAR_TRUE = @ENABLE_UNRAR_TRUE@

 EXEEXT = @EXEEXT@

 F77 = @F77@

 FFLAGS = @FFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GETENT = @GETENT@

+GREP = @GREP@

 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@

 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@

 INSTALL_DATA = @INSTALL_DATA@

@@ -192,12 +195,9 @@ STRIP = @STRIP@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

-ac_ct_AR = @ac_ct_AR@

 ac_ct_CC = @ac_ct_CC@

 ac_ct_CXX = @ac_ct_CXX@

 ac_ct_F77 = @ac_ct_F77@

-ac_ct_RANLIB = @ac_ct_RANLIB@

-ac_ct_STRIP = @ac_ct_STRIP@

 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@

 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@

@@ -214,23 +214,30 @@ build_cpu = @build_cpu@

 build_os = @build_os@

 build_vendor = @build_vendor@

 datadir = @datadir@

+datarootdir = @datarootdir@

+docdir = @docdir@

+dvidir = @dvidir@

 exec_prefix = @exec_prefix@

 host = @host@

 host_alias = @host_alias@

 host_cpu = @host_cpu@

 host_os = @host_os@

 host_vendor = @host_vendor@

+htmldir = @htmldir@

 includedir = @includedir@

 infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+localedir = @localedir@

 localstatedir = @localstatedir@

 mandir = @mandir@

 mkdir_p = @mkdir_p@

 oldincludedir = @oldincludedir@

+pdfdir = @pdfdir@

 prefix = @prefix@

 program_transform_name = @program_transform_name@

+psdir = @psdir@

 sbindir = @sbindir@

 sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

@@ -84,6 +84,9 @@

 /* "default FD_SETSIZE value" */

 #undef DEFAULT_FD_SETSIZE

+/* link with libclamunrar (non-GPL, see COPYING.unrar) */

+#undef ENABLE_UNRAR

+

 /* file i/o buffer size */

 #undef FILEBUFF

@@ -381,7 +384,7 @@

 #undef inline

 #endif

-/* Define to `long' if <sys/types.h> does not define. */

+/* Define to `long int' if <sys/types.h> does not define. */

 #undef off_t

 /* Define to "int" if <sys/socket.h> does not define. */

@@ -138,11 +138,14 @@ ECHO_C = @ECHO_C@

 ECHO_N = @ECHO_N@

 ECHO_T = @ECHO_T@

 EGREP = @EGREP@

+ENABLE_UNRAR_FALSE = @ENABLE_UNRAR_FALSE@

+ENABLE_UNRAR_TRUE = @ENABLE_UNRAR_TRUE@

 EXEEXT = @EXEEXT@

 F77 = @F77@

 FFLAGS = @FFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GETENT = @GETENT@

+GREP = @GREP@

 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@

 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@

 INSTALL_DATA = @INSTALL_DATA@

@@ -177,12 +180,9 @@ STRIP = @STRIP@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

-ac_ct_AR = @ac_ct_AR@

 ac_ct_CC = @ac_ct_CC@

 ac_ct_CXX = @ac_ct_CXX@

 ac_ct_F77 = @ac_ct_F77@

-ac_ct_RANLIB = @ac_ct_RANLIB@

-ac_ct_STRIP = @ac_ct_STRIP@

 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@

 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@

@@ -199,23 +199,30 @@ build_cpu = @build_cpu@

 build_os = @build_os@

 build_vendor = @build_vendor@

 datadir = @datadir@

+datarootdir = @datarootdir@

+docdir = @docdir@

+dvidir = @dvidir@

 exec_prefix = @exec_prefix@

 host = @host@

 host_alias = @host_alias@

 host_cpu = @host_cpu@

 host_os = @host_os@

 host_vendor = @host_vendor@

+htmldir = @htmldir@

 includedir = @includedir@

 infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+localedir = @localedir@

 localstatedir = @localstatedir@

 mandir = @mandir@

 mkdir_p = @mkdir_p@

 oldincludedir = @oldincludedir@

+pdfdir = @pdfdir@

 prefix = @prefix@

 program_transform_name = @program_transform_name@

+psdir = @psdir@

 sbindir = @sbindir@

 sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

@@ -123,11 +123,14 @@ ECHO_C = @ECHO_C@

 ECHO_N = @ECHO_N@

 ECHO_T = @ECHO_T@

 EGREP = @EGREP@

+ENABLE_UNRAR_FALSE = @ENABLE_UNRAR_FALSE@

+ENABLE_UNRAR_TRUE = @ENABLE_UNRAR_TRUE@

 EXEEXT = @EXEEXT@

 F77 = @F77@

 FFLAGS = @FFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GETENT = @GETENT@

+GREP = @GREP@

 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@

 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@

 INSTALL_DATA = @INSTALL_DATA@

@@ -162,12 +165,9 @@ STRIP = @STRIP@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

-ac_ct_AR = @ac_ct_AR@

 ac_ct_CC = @ac_ct_CC@

 ac_ct_CXX = @ac_ct_CXX@

 ac_ct_F77 = @ac_ct_F77@

-ac_ct_RANLIB = @ac_ct_RANLIB@

-ac_ct_STRIP = @ac_ct_STRIP@

 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@

 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@

@@ -184,23 +184,30 @@ build_cpu = @build_cpu@

 build_os = @build_os@

 build_vendor = @build_vendor@

 datadir = @datadir@

+datarootdir = @datarootdir@

+docdir = @docdir@

+dvidir = @dvidir@

 exec_prefix = @exec_prefix@

 host = @host@

 host_alias = @host_alias@

 host_cpu = @host_cpu@

 host_os = @host_os@

 host_vendor = @host_vendor@

+htmldir = @htmldir@

 includedir = @includedir@

 infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+localedir = @localedir@

 localstatedir = @localstatedir@

 mandir = @mandir@

 mkdir_p = @mkdir_p@

 oldincludedir = @oldincludedir@

+pdfdir = @pdfdir@

 prefix = @prefix@

 program_transform_name = @program_transform_name@

+psdir = @psdir@

 sbindir = @sbindir@

 sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

@@ -143,11 +143,14 @@ ECHO_C = @ECHO_C@

 ECHO_N = @ECHO_N@

 ECHO_T = @ECHO_T@

 EGREP = @EGREP@

+ENABLE_UNRAR_FALSE = @ENABLE_UNRAR_FALSE@

+ENABLE_UNRAR_TRUE = @ENABLE_UNRAR_TRUE@

 EXEEXT = @EXEEXT@

 F77 = @F77@

 FFLAGS = @FFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GETENT = @GETENT@

+GREP = @GREP@

 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@

 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@

 INSTALL_DATA = @INSTALL_DATA@

@@ -182,12 +185,9 @@ STRIP = @STRIP@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

-ac_ct_AR = @ac_ct_AR@

 ac_ct_CC = @ac_ct_CC@

 ac_ct_CXX = @ac_ct_CXX@

 ac_ct_F77 = @ac_ct_F77@

-ac_ct_RANLIB = @ac_ct_RANLIB@

-ac_ct_STRIP = @ac_ct_STRIP@

 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@

 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@

@@ -204,23 +204,30 @@ build_cpu = @build_cpu@

 build_os = @build_os@

 build_vendor = @build_vendor@

 datadir = @datadir@

+datarootdir = @datarootdir@

+docdir = @docdir@

+dvidir = @dvidir@

 exec_prefix = @exec_prefix@

 host = @host@

 host_alias = @host_alias@

 host_cpu = @host_cpu@

 host_os = @host_os@

 host_vendor = @host_vendor@

+htmldir = @htmldir@

 includedir = @includedir@

 infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+localedir = @localedir@

 localstatedir = @localstatedir@

 mandir = @mandir@

 mkdir_p = @mkdir_p@

 oldincludedir = @oldincludedir@

+pdfdir = @pdfdir@

 prefix = @prefix@

 program_transform_name = @program_transform_name@

+psdir = @psdir@

 sbindir = @sbindir@

 sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

@@ -132,11 +132,14 @@ ECHO_C = @ECHO_C@

 ECHO_N = @ECHO_N@

 ECHO_T = @ECHO_T@

 EGREP = @EGREP@

+ENABLE_UNRAR_FALSE = @ENABLE_UNRAR_FALSE@

+ENABLE_UNRAR_TRUE = @ENABLE_UNRAR_TRUE@

 EXEEXT = @EXEEXT@

 F77 = @F77@

 FFLAGS = @FFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GETENT = @GETENT@

+GREP = @GREP@

 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@

 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@

 INSTALL_DATA = @INSTALL_DATA@

@@ -171,12 +174,9 @@ STRIP = @STRIP@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

-ac_ct_AR = @ac_ct_AR@

 ac_ct_CC = @ac_ct_CC@

 ac_ct_CXX = @ac_ct_CXX@

 ac_ct_F77 = @ac_ct_F77@

-ac_ct_RANLIB = @ac_ct_RANLIB@

-ac_ct_STRIP = @ac_ct_STRIP@

 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@

 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@

@@ -193,23 +193,30 @@ build_cpu = @build_cpu@

 build_os = @build_os@

 build_vendor = @build_vendor@

 datadir = @datadir@

+datarootdir = @datarootdir@

+docdir = @docdir@

+dvidir = @dvidir@

 exec_prefix = @exec_prefix@

 host = @host@

 host_alias = @host_alias@

 host_cpu = @host_cpu@

 host_os = @host_os@

 host_vendor = @host_vendor@

+htmldir = @htmldir@

 includedir = @includedir@

 infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+localedir = @localedir@

 localstatedir = @localstatedir@

 mandir = @mandir@

 mkdir_p = @mkdir_p@

 oldincludedir = @oldincludedir@

+pdfdir = @pdfdir@

 prefix = @prefix@

 program_transform_name = @program_transform_name@

+psdir = @psdir@

 sbindir = @sbindir@

 sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

@@ -41,5 +41,5 @@ clamscan_SOURCES = \

     treewalk.h

 DEFS = @DEFS@ -DCL_NOTHREADS

-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/libclamunrar/libclamunrar.la @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@

 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

@@ -126,11 +126,14 @@ ECHO_C = @ECHO_C@

 ECHO_N = @ECHO_N@

 ECHO_T = @ECHO_T@

 EGREP = @EGREP@

+ENABLE_UNRAR_FALSE = @ENABLE_UNRAR_FALSE@

+ENABLE_UNRAR_TRUE = @ENABLE_UNRAR_TRUE@

 EXEEXT = @EXEEXT@

 F77 = @F77@

 FFLAGS = @FFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GETENT = @GETENT@

+GREP = @GREP@

 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@

 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@

 INSTALL_DATA = @INSTALL_DATA@

@@ -141,7 +144,7 @@ LDFLAGS = @LDFLAGS@

 LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@

 LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBOBJS = @LIBOBJS@

-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/libclamunrar/libclamunrar.la @THREAD_LIBS@

+LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@

 LIBTOOL = @LIBTOOL@

 LN_S = @LN_S@

 LTLIBOBJS = @LTLIBOBJS@

@@ -165,12 +168,9 @@ STRIP = @STRIP@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

-ac_ct_AR = @ac_ct_AR@

 ac_ct_CC = @ac_ct_CC@

 ac_ct_CXX = @ac_ct_CXX@

 ac_ct_F77 = @ac_ct_F77@

-ac_ct_RANLIB = @ac_ct_RANLIB@

-ac_ct_STRIP = @ac_ct_STRIP@

 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@

 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@

@@ -187,23 +187,30 @@ build_cpu = @build_cpu@

 build_os = @build_os@

 build_vendor = @build_vendor@

 datadir = @datadir@

+datarootdir = @datarootdir@

+docdir = @docdir@

+dvidir = @dvidir@

 exec_prefix = @exec_prefix@

 host = @host@

 host_alias = @host_alias@

 host_cpu = @host_cpu@

 host_os = @host_os@

 host_vendor = @host_vendor@

+htmldir = @htmldir@

 includedir = @includedir@

 infodir = @infodir@

 install_sh = @install_sh@

 libdir = @libdir@

 libexecdir = @libexecdir@

+localedir = @localedir@

 localstatedir = @localstatedir@

 mandir = @mandir@

 mkdir_p = @mkdir_p@

 oldincludedir = @oldincludedir@

+pdfdir = @pdfdir@

 prefix = @prefix@

 program_transform_name = @program_transform_name@

+psdir = @psdir@

 sbindir = @sbindir@

 sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

@@ -1,25 +1,54 @@

 #! /bin/sh

 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.59.

+# Generated by GNU Autoconf 2.61.

 #

-# Copyright (C) 2003 Free Software Foundation, Inc.

+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

 # This configure script is free software; the Free Software Foundation

 # gives unlimited permission to copy, distribute and modify it.

 ## --------------------- ##

 ## M4sh Initialization.  ##

 ## --------------------- ##

-# Be Bourne compatible

+# Be more Bourne compatible

+DUALCASE=1; export DUALCASE # for MKS sh

 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

   emulate sh

   NULLCMD=:

   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

   # is contrary to our usage.  Disable this feature.

   alias -g '${1+"$@"}'='"$@"'

-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then

-  set -o posix

+  setopt NO_GLOB_SUBST

+else

+  case `(set -o) 2>/dev/null` in

+  *posix*) set -o posix ;;

+esac

+

+fi

+

+

+

+

+# PATH needs CR

+# Avoid depending upon Character Ranges.

+as_cr_letters='abcdefghijklmnopqrstuvwxyz'

+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

+as_cr_Letters=$as_cr_letters$as_cr_LETTERS

+as_cr_digits='0123456789'

+as_cr_alnum=$as_cr_Letters$as_cr_digits

+

+# The user is always right.

+if test "${PATH_SEPARATOR+set}" != set; then

+  echo "#! /bin/sh" >conf$$.sh

+  echo  "exit 0"   >>conf$$.sh

+  chmod +x conf$$.sh

+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

+    PATH_SEPARATOR=';'

+  else

+    PATH_SEPARATOR=:

+  fi

+  rm -f conf$$.sh

 fi

-DUALCASE=1; export DUALCASE # for MKS sh

 # Support unset when possible.

 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then

@@ -29,8 +58,43 @@ else

 fi

+# IFS

+# We need space, tab and new line, in precisely that order.  Quoting is

+# there to prevent editors from complaining about space-tab.

+# (If _AS_PATH_WALK were called with IFS unset, it would disable word

+# splitting by setting IFS to empty value.)

+as_nl='

+'

+IFS=" ""	$as_nl"

+

+# Find who we are.  Look in the path if we contain no directory separator.

+case $0 in

+  *[\\/]* ) as_myself=$0 ;;

+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

+for as_dir in $PATH

+do

+  IFS=$as_save_IFS

+  test -z "$as_dir" && as_dir=.

+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

+done

+IFS=$as_save_IFS

+

+     ;;

+esac

+# We did not find ourselves, most probably we were run as `sh COMMAND'

+# in which case we are not to be found in the path.

+if test "x$as_myself" = x; then

+  as_myself=$0

+fi

+if test ! -f "$as_myself"; then

+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2

+  { (exit 1); exit 1; }

+fi

+

 # Work around bugs in pre-3.0 UWIN ksh.

-$as_unset ENV MAIL MAILPATH

+for as_var in ENV MAIL MAILPATH

+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

+done

 PS1='$ '

 PS2='> '

 PS4='+ '

@@ -44,18 +108,19 @@ do

   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then

     eval $as_var=C; export $as_var

   else

-    $as_unset $as_var

+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

   fi

 done

 # Required to use basename.

-if expr a : '\(a\)' >/dev/null 2>&1; then

+if expr a : '\(a\)' >/dev/null 2>&1 &&

+   test "X`expr 00001 : '.*\(...\)'`" = X001; then

   as_expr=expr

 else

   as_expr=false

 fi

-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then

+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then

   as_basename=basename

 else

   as_basename=false

@@ -63,157 +128,388 @@ fi

 # Name of the executable.

-as_me=`$as_basename "$0" ||

+as_me=`$as_basename -- "$0" ||

 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \

 	 X"$0" : 'X\(//\)$' \| \

-	 X"$0" : 'X\(/\)$' \| \

-	 .     : '\(.\)' 2>/dev/null ||

+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||

 echo X/"$0" |

-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }

-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }

-  	  /^X\/\(\/\).*/{ s//\1/; q; }

-  	  s/.*/./; q'`

+    sed '/^.*\/\([^/][^/]*\)\/*$/{

+	    s//\1/

+	    q

+	  }

+	  /^X\/\(\/\/\)$/{

+	    s//\1/

+	    q

+	  }

+	  /^X\/\(\/\).*/{

+	    s//\1/

+	    q

+	  }

+	  s/.*/./; q'`

+# CDPATH.

+$as_unset CDPATH

-# PATH needs CR, and LINENO needs CR and PATH.

-# Avoid depending upon Character Ranges.

-as_cr_letters='abcdefghijklmnopqrstuvwxyz'

-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'

-as_cr_Letters=$as_cr_letters$as_cr_LETTERS

-as_cr_digits='0123456789'

-as_cr_alnum=$as_cr_Letters$as_cr_digits

-# The user is always right.

-if test "${PATH_SEPARATOR+set}" != set; then

-  echo "#! /bin/sh" >conf$$.sh

-  echo  "exit 0"   >>conf$$.sh

-  chmod +x conf$$.sh

-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

-    PATH_SEPARATOR=';'

-  else

-    PATH_SEPARATOR=:

-  fi

-  rm -f conf$$.sh

+if test "x$CONFIG_SHELL" = x; then

+  if (eval ":") 2>/dev/null; then

+  as_have_required=yes

+else

+  as_have_required=no

+fi

+

+  if test $as_have_required = yes && 	 (eval ":

+(as_func_return () {

+  (exit \$1)

+}

+as_func_success () {

+  as_func_return 0

+}

+as_func_failure () {

+  as_func_return 1

+}

+as_func_ret_success () {

+  return 0

+}

+as_func_ret_failure () {

+  return 1

+}

+

+exitcode=0

+if as_func_success; then

+  :

+else

+  exitcode=1

+  echo as_func_success failed.

 fi

+if as_func_failure; then

+  exitcode=1

+  echo as_func_failure succeeded.

+fi

-  as_lineno_1=$LINENO

-  as_lineno_2=$LINENO

-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

-  test "x$as_lineno_1" != "x$as_lineno_2" &&

-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {

-  # Find who we are.  Look in the path if we contain no path at all

-  # relative or not.

-  case $0 in

-    *[\\/]* ) as_myself=$0 ;;

-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

-for as_dir in $PATH

-do

-  IFS=$as_save_IFS

-  test -z "$as_dir" && as_dir=.

-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break

-done

+if as_func_ret_success; then

+  :

+else

+  exitcode=1

+  echo as_func_ret_success failed.

+fi

-       ;;

-  esac

-  # We did not find ourselves, most probably we were run as `sh COMMAND'

-  # in which case we are not to be found in the path.

-  if test "x$as_myself" = x; then

-    as_myself=$0

-  fi

-  if test ! -f "$as_myself"; then

-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2

-   { (exit 1); exit 1; }; }

-  fi

-  case $CONFIG_SHELL in

-  '')

+if as_func_ret_failure; then

+  exitcode=1

+  echo as_func_ret_failure succeeded.

+fi

+

+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then

+  :

+else

+  exitcode=1

+  echo positional parameters were not saved.

+fi

+

+test \$exitcode = 0) || { (exit 1); exit 1; }

+

+(

+  as_lineno_1=\$LINENO

+  as_lineno_2=\$LINENO

+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&

+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }

+") 2> /dev/null; then

+  :

+else

+  as_candidate_shells=

     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH

 do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

-  for as_base in sh bash ksh sh5; do

-	 case $as_dir in

+  case $as_dir in

 	 /*)

-	   if ("$as_dir/$as_base" -c '

+	   for as_base in sh bash ksh sh5; do

+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"

+	   done;;

+       esac

+done

+IFS=$as_save_IFS

+

+

+      for as_shell in $as_candidate_shells $SHELL; do

+	 # Try only shells that exist, to save several forks.

+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&

+		{ ("$as_shell") 2> /dev/null <<\_ASEOF

+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

+  emulate sh

+  NULLCMD=:

+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

+  # is contrary to our usage.  Disable this feature.

+  alias -g '${1+"$@"}'='"$@"'

+  setopt NO_GLOB_SUBST

+else

+  case `(set -o) 2>/dev/null` in

+  *posix*) set -o posix ;;

+esac

+

+fi

+

+

+:

+_ASEOF

+}; then

+  CONFIG_SHELL=$as_shell

+	       as_have_required=yes

+	       if { "$as_shell" 2> /dev/null <<\_ASEOF

+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

+  emulate sh

+  NULLCMD=:

+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which

+  # is contrary to our usage.  Disable this feature.

+  alias -g '${1+"$@"}'='"$@"'

+  setopt NO_GLOB_SUBST

+else

+  case `(set -o) 2>/dev/null` in

+  *posix*) set -o posix ;;

+esac

+

+fi

+

+

+:

+(as_func_return () {

+  (exit $1)

+}

+as_func_success () {

+  as_func_return 0

+}

+as_func_failure () {

+  as_func_return 1

+}

+as_func_ret_success () {

+  return 0

+}

+as_func_ret_failure () {

+  return 1

+}

+

+exitcode=0

+if as_func_success; then

+  :

+else

+  exitcode=1

+  echo as_func_success failed.

+fi

+

+if as_func_failure; then

+  exitcode=1

+  echo as_func_failure succeeded.

+fi

+

+if as_func_ret_success; then

+  :

+else

+  exitcode=1

+  echo as_func_ret_success failed.

+fi

+

+if as_func_ret_failure; then

+  exitcode=1

+  echo as_func_ret_failure succeeded.

+fi

+

+if ( set x; as_func_ret_success y && test x = "$1" ); then

+  :

+else

+  exitcode=1

+  echo positional parameters were not saved.

+fi

+

+test $exitcode = 0) || { (exit 1); exit 1; }

+

+(

   as_lineno_1=$LINENO

   as_lineno_2=$LINENO

-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`

   test "x$as_lineno_1" != "x$as_lineno_2" &&

-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then

-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }

-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }

-	     CONFIG_SHELL=$as_dir/$as_base

-	     export CONFIG_SHELL

-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}

-	   fi;;

-	 esac

-       done

-done

-;;

-  esac

+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }

+

+_ASEOF

+}; then

+  break

+fi

+

+fi

+

+      done

+

+      if test "x$CONFIG_SHELL" != x; then

+  for as_var in BASH_ENV ENV

+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var

+        done

+        export CONFIG_SHELL

+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}

+fi

+

+

+    if test $as_have_required = no; then

+  echo This script requires a shell more modern than all the

+      echo shells that I found on your system.  Please install a

+      echo modern shell, or manually run the script under such a

+      echo shell if you do have one.

+      { (exit 1); exit 1; }

+fi

+

+

+fi

+

+fi

+

+

+

+(eval "as_func_return () {

+  (exit \$1)

+}

+as_func_success () {

+  as_func_return 0

+}

+as_func_failure () {

+  as_func_return 1

+}

+as_func_ret_success () {

+  return 0

+}

+as_func_ret_failure () {

+  return 1

+}

+

+exitcode=0

+if as_func_success; then

+  :

+else

+  exitcode=1

+  echo as_func_success failed.

+fi

+

+if as_func_failure; then

+  exitcode=1

+  echo as_func_failure succeeded.

+fi

+

+if as_func_ret_success; then

+  :

+else

+  exitcode=1

+  echo as_func_ret_success failed.

+fi

+