Browse code

merge backport fixes for 0.88.3

git-svn-id: file:///var/lib/svn/clamav-devel/branches/0.88-stable@2798 77e5149b-7576-45b1-b177-96237e5ba77b

Sven Strickroth authored on 2007/02/18 23:45:02
Showing 194 changed files
... ...
@@ -1,7 +1,19 @@
1
+Sat Jul  1 13:37:18 CEST 2006
2
+-----------------------------
3
+  V 0.88.3
4
+  * Bugfixes:
5
+    - libclamav/matcher-ac.c: fix possible false matches of alternatives
6
+      Problem reported by Nicolas Riendeau <knightr*istop.com>
7
+    - libclamav: Large binhex files were not being handled gracefully. Tidied
8
+      the handling code. Note that large binhex are not currently decoded.
9
+      Bug reported by Luca
10
+    - libclamav/scanners.c: fix zero allocation warning reported by Sergey
11
+      Svishchev
12
+
1 13
 Sat Apr 29 21:30:47 CEST 2006
2 14
 -----------------------------
3 15
   V 0.88.2
4
-  Bugfixes:
16
+  * Bugfixes:
5 17
     - freshclam/manager.c: fix possible buffer overflow
6 18
       Reported by Ulf Harnhammar <metaur*telia.com> and Peter <remllov_*gmx.de>
7 19
       See http://www.clamav.net/security/0.88.2.html for details.
... ...
@@ -143,6 +143,7 @@ EGREP = @EGREP@
143 143
 EXEEXT = @EXEEXT@
144 144
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
145 145
 GETENT = @GETENT@
146
+GREP = @GREP@
146 147
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
147 148
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
148 149
 INSTALL_DATA = @INSTALL_DATA@
... ...
@@ -176,8 +177,6 @@ STRIP = @STRIP@
176 176
 TH_SAFE = @TH_SAFE@
177 177
 VERSION = @VERSION@
178 178
 ac_ct_CC = @ac_ct_CC@
179
-ac_ct_RANLIB = @ac_ct_RANLIB@
180
-ac_ct_STRIP = @ac_ct_STRIP@
181 179
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
182 180
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
183 181
 am__include = @am__include@
... ...
@@ -192,23 +191,30 @@ build_cpu = @build_cpu@
192 192
 build_os = @build_os@
193 193
 build_vendor = @build_vendor@
194 194
 datadir = @datadir@
195
+datarootdir = @datarootdir@
196
+docdir = @docdir@
197
+dvidir = @dvidir@
195 198
 exec_prefix = @exec_prefix@
196 199
 host = @host@
197 200
 host_alias = @host_alias@
198 201
 host_cpu = @host_cpu@
199 202
 host_os = @host_os@
200 203
 host_vendor = @host_vendor@
204
+htmldir = @htmldir@
201 205
 includedir = @includedir@
202 206
 infodir = @infodir@
203 207
 install_sh = @install_sh@
204 208
 libdir = @libdir@
205 209
 libexecdir = @libexecdir@
210
+localedir = @localedir@
206 211
 localstatedir = @localstatedir@
207 212
 mandir = @mandir@
208 213
 mkdir_p = @mkdir_p@
209 214
 oldincludedir = @oldincludedir@
215
+pdfdir = @pdfdir@
210 216
 prefix = @prefix@
211 217
 program_transform_name = @program_transform_name@
218
+psdir = @psdir@
212 219
 sbindir = @sbindir@
213 220
 sendmailprog = @sendmailprog@
214 221
 sharedstatedir = @sharedstatedir@
... ...
@@ -1,16 +1,8 @@
1
-0.88.2
1
+0.88.3
2 2
 ------
3 3
 
4
-This release improves virus detection, fixes zip handling on 64-bit
5
-architectures and possible security problem in freshclam.
6
-
7
-Following the 0.88.1 release some portals and security related websites
8
-published incorrect information on security problems of 0.88. To avoid
9
-such incidents in the future, every new ClamAV package will be released
10
-together with detailed information about security bugs it fixes. Details
11
-for this version can be found here:
12
-
13
-    http://www.clamav.net/security/0.88.2.html
4
+This version fixes handling of large binhex files and multiple alternatives in
5
+virus signatures.
14 6
 
15 7
 --
16 8
 The ClamAV team (http://www.clamav.net/team.html)
... ...
@@ -2,6 +2,15 @@ Note: This README/NEWS file refers to the source tarball. Some things described
2 2
 here may not be available in binary packages.
3 3
 --
4 4
 
5
+0.88.3
6
+------
7
+
8
+This version fixes handling of large binhex files and multiple alternatives in
9
+virus signatures.
10
+
11
+--
12
+The ClamAV team (http://www.clamav.net/team.html)
13
+
5 14
 
6 15
 0.88.2
7 16
 ------
... ...
@@ -354,5 +354,5 @@
354 354
 #undef inline
355 355
 #endif
356 356
 
357
-/* Define to `long' if <sys/types.h> does not define. */
357
+/* Define to `long int' if <sys/types.h> does not define. */
358 358
 #undef off_t
... ...
@@ -134,6 +134,7 @@ EGREP = @EGREP@
134 134
 EXEEXT = @EXEEXT@
135 135
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
136 136
 GETENT = @GETENT@
137
+GREP = @GREP@
137 138
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
138 139
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
139 140
 INSTALL_DATA = @INSTALL_DATA@
... ...
@@ -167,8 +168,6 @@ STRIP = @STRIP@
167 167
 TH_SAFE = @TH_SAFE@
168 168
 VERSION = @VERSION@
169 169
 ac_ct_CC = @ac_ct_CC@
170
-ac_ct_RANLIB = @ac_ct_RANLIB@
171
-ac_ct_STRIP = @ac_ct_STRIP@
172 170
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
173 171
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
174 172
 am__include = @am__include@
... ...
@@ -183,23 +182,30 @@ build_cpu = @build_cpu@
183 183
 build_os = @build_os@
184 184
 build_vendor = @build_vendor@
185 185
 datadir = @datadir@
186
+datarootdir = @datarootdir@
187
+docdir = @docdir@
188
+dvidir = @dvidir@
186 189
 exec_prefix = @exec_prefix@
187 190
 host = @host@
188 191
 host_alias = @host_alias@
189 192
 host_cpu = @host_cpu@
190 193
 host_os = @host_os@
191 194
 host_vendor = @host_vendor@
195
+htmldir = @htmldir@
192 196
 includedir = @includedir@
193 197
 infodir = @infodir@
194 198
 install_sh = @install_sh@
195 199
 libdir = @libdir@
196 200
 libexecdir = @libexecdir@
201
+localedir = @localedir@
197 202
 localstatedir = @localstatedir@
198 203
 mandir = @mandir@
199 204
 mkdir_p = @mkdir_p@
200 205
 oldincludedir = @oldincludedir@
206
+pdfdir = @pdfdir@
201 207
 prefix = @prefix@
202 208
 program_transform_name = @program_transform_name@
209
+psdir = @psdir@
203 210
 sbindir = @sbindir@
204 211
 sendmailprog = @sendmailprog@
205 212
 sharedstatedir = @sharedstatedir@
... ...
@@ -140,6 +140,7 @@ EGREP = @EGREP@
140 140
 EXEEXT = @EXEEXT@
141 141
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
142 142
 GETENT = @GETENT@
143
+GREP = @GREP@
143 144
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
144 145
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
145 146
 INSTALL_DATA = @INSTALL_DATA@
... ...
@@ -173,8 +174,6 @@ STRIP = @STRIP@
173 173
 TH_SAFE = @TH_SAFE@
174 174
 VERSION = @VERSION@
175 175
 ac_ct_CC = @ac_ct_CC@
176
-ac_ct_RANLIB = @ac_ct_RANLIB@
177
-ac_ct_STRIP = @ac_ct_STRIP@
178 176
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
179 177
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
180 178
 am__include = @am__include@
... ...
@@ -189,23 +188,30 @@ build_cpu = @build_cpu@
189 189
 build_os = @build_os@
190 190
 build_vendor = @build_vendor@
191 191
 datadir = @datadir@
192
+datarootdir = @datarootdir@
193
+docdir = @docdir@
194
+dvidir = @dvidir@
192 195
 exec_prefix = @exec_prefix@
193 196
 host = @host@
194 197
 host_alias = @host_alias@
195 198
 host_cpu = @host_cpu@
196 199
 host_os = @host_os@
197 200
 host_vendor = @host_vendor@
201
+htmldir = @htmldir@
198 202
 includedir = @includedir@
199 203
 infodir = @infodir@
200 204
 install_sh = @install_sh@
201 205
 libdir = @libdir@
202 206
 libexecdir = @libexecdir@
207
+localedir = @localedir@
203 208
 localstatedir = @localstatedir@
204 209
 mandir = @mandir@
205 210
 mkdir_p = @mkdir_p@
206 211
 oldincludedir = @oldincludedir@
212
+pdfdir = @pdfdir@
207 213
 prefix = @prefix@
208 214
 program_transform_name = @program_transform_name@
215
+psdir = @psdir@
209 216
 sbindir = @sbindir@
210 217
 sendmailprog = @sendmailprog@
211 218
 sharedstatedir = @sharedstatedir@
... ...
@@ -131,6 +131,7 @@ EGREP = @EGREP@
131 131
 EXEEXT = @EXEEXT@
132 132
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
133 133
 GETENT = @GETENT@
134
+GREP = @GREP@
134 135
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
135 136
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
136 137
 INSTALL_DATA = @INSTALL_DATA@
... ...
@@ -164,8 +165,6 @@ STRIP = @STRIP@
164 164
 TH_SAFE = @TH_SAFE@
165 165
 VERSION = @VERSION@
166 166
 ac_ct_CC = @ac_ct_CC@
167
-ac_ct_RANLIB = @ac_ct_RANLIB@
168
-ac_ct_STRIP = @ac_ct_STRIP@
169 167
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
170 168
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
171 169
 am__include = @am__include@
... ...
@@ -180,23 +179,30 @@ build_cpu = @build_cpu@
180 180
 build_os = @build_os@
181 181
 build_vendor = @build_vendor@
182 182
 datadir = @datadir@
183
+datarootdir = @datarootdir@
184
+docdir = @docdir@
185
+dvidir = @dvidir@
183 186
 exec_prefix = @exec_prefix@
184 187
 host = @host@
185 188
 host_alias = @host_alias@
186 189
 host_cpu = @host_cpu@
187 190
 host_os = @host_os@
188 191
 host_vendor = @host_vendor@
192
+htmldir = @htmldir@
189 193
 includedir = @includedir@
190 194
 infodir = @infodir@
191 195
 install_sh = @install_sh@
192 196
 libdir = @libdir@
193 197
 libexecdir = @libexecdir@
198
+localedir = @localedir@
194 199
 localstatedir = @localstatedir@
195 200
 mandir = @mandir@
196 201
 mkdir_p = @mkdir_p@
197 202
 oldincludedir = @oldincludedir@
203
+pdfdir = @pdfdir@
198 204
 prefix = @prefix@
199 205
 program_transform_name = @program_transform_name@
206
+psdir = @psdir@
200 207
 sbindir = @sbindir@
201 208
 sendmailprog = @sendmailprog@
202 209
 sharedstatedir = @sharedstatedir@
... ...
@@ -141,6 +141,7 @@ void help(void)
141 141
     mprintf("    --remove                           Remove infected files. Be careful!\n");
142 142
     mprintf("    --move=DIRECTORY                   Move infected files into DIRECTORY\n");
143 143
     mprintf("    --config-file=FILE                 Read configuration from FILE.\n");
144
+    mprintf("    --infected            -i           Only print infected files\n");
144 145
     mprintf("    --no-summary                       Disable summary at end of scanning\n");
145 146
     mprintf("\n");
146 147
 
... ...
@@ -124,6 +124,7 @@ EGREP = @EGREP@
124 124
 EXEEXT = @EXEEXT@
125 125
 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
126 126
 GETENT = @GETENT@
127
+GREP = @GREP@
127 128
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
128 129
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
129 130
 INSTALL_DATA = @INSTALL_DATA@
... ...
@@ -157,8 +158,6 @@ STRIP = @STRIP@
157 157
 TH_SAFE = @TH_SAFE@
158 158
 VERSION = @VERSION@
159 159
 ac_ct_CC = @ac_ct_CC@
160
-ac_ct_RANLIB = @ac_ct_RANLIB@
161
-ac_ct_STRIP = @ac_ct_STRIP@
162 160
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
163 161
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
164 162
 am__include = @am__include@
... ...
@@ -173,23 +172,30 @@ build_cpu = @build_cpu@
173 173
 build_os = @build_os@
174 174
 build_vendor = @build_vendor@
175 175
 datadir = @datadir@
176
+datarootdir = @datarootdir@
177
+docdir = @docdir@
178
+dvidir = @dvidir@
176 179
 exec_prefix = @exec_prefix@
177 180
 host = @host@
178 181
 host_alias = @host_alias@
179 182
 host_cpu = @host_cpu@
180 183
 host_os = @host_os@
181 184
 host_vendor = @host_vendor@
185
+htmldir = @htmldir@
182 186
 includedir = @includedir@
183 187
 infodir = @infodir@
184 188
 install_sh = @install_sh@
185 189
 libdir = @libdir@
186 190
 libexecdir = @libexecdir@
191
+localedir = @localedir@
187 192
 localstatedir = @localstatedir@
188 193
 mandir = @mandir@
189 194
 mkdir_p = @mkdir_p@
190 195
 oldincludedir = @oldincludedir@
196
+pdfdir = @pdfdir@
191 197
 prefix = @prefix@
192 198
 program_transform_name = @program_transform_name@
199
+psdir = @psdir@
193 200
 sbindir = @sbindir@
194 201
 sendmailprog = @sendmailprog@
195 202
 sharedstatedir = @sharedstatedir@
... ...
@@ -1,8 +1,9 @@
1 1
 #! /bin/sh
2 2
 # Guess values for system-dependent variables and create Makefiles.
3
-# Generated by GNU Autoconf 2.59.
3
+# Generated by GNU Autoconf 2.59e.
4 4
 #
5
-# Copyright (C) 2003 Free Software Foundation, Inc.
5
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
6
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
6 7
 # This configure script is free software; the Free Software Foundation
7 8
 # gives unlimited permission to copy, distribute and modify it.
8 9
 ## --------------------- ##
... ...
@@ -16,11 +17,35 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
16 16
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
17 17
   # is contrary to our usage.  Disable this feature.
18 18
   alias -g '${1+"$@"}'='"$@"'
19
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
20
-  set -o posix
19
+  setopt NO_GLOB_SUBST
20
+else
21
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
21 22
 fi
23
+BIN_SH=xpg4; export BIN_SH # for Tru64
22 24
 DUALCASE=1; export DUALCASE # for MKS sh
23 25
 
26
+
27
+# PATH needs CR
28
+# Avoid depending upon Character Ranges.
29
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
30
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
31
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
32
+as_cr_digits='0123456789'
33
+as_cr_alnum=$as_cr_Letters$as_cr_digits
34
+
35
+# The user is always right.
36
+if test "${PATH_SEPARATOR+set}" != set; then
37
+  echo "#! /bin/sh" >conf$$.sh
38
+  echo  "exit 0"   >>conf$$.sh
39
+  chmod +x conf$$.sh
40
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
41
+    PATH_SEPARATOR=';'
42
+  else
43
+    PATH_SEPARATOR=:
44
+  fi
45
+  rm -f conf$$.sh
46
+fi
47
+
24 48
 # Support unset when possible.
25 49
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
26 50
   as_unset=unset
... ...
@@ -29,8 +54,43 @@ else
29 29
 fi
30 30
 
31 31
 
32
+# IFS
33
+# We need space, tab and new line, in precisely that order.  Quoting is
34
+# there to prevent editors from complaining about space-tab.
35
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
36
+# splitting by setting IFS to empty value.)
37
+as_nl='
38
+'
39
+IFS=" ""	$as_nl"
40
+
41
+# Find who we are.  Look in the path if we contain no directory separator.
42
+case $0 in
43
+  *[\\/]* ) as_myself=$0 ;;
44
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
45
+for as_dir in $PATH
46
+do
47
+  IFS=$as_save_IFS
48
+  test -z "$as_dir" && as_dir=.
49
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
50
+done
51
+IFS=$as_save_IFS
52
+
53
+     ;;
54
+esac
55
+# We did not find ourselves, most probably we were run as `sh COMMAND'
56
+# in which case we are not to be found in the path.
57
+if test "x$as_myself" = x; then
58
+  as_myself=$0
59
+fi
60
+if test ! -f "$as_myself"; then
61
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
62
+  { (exit 1); exit 1; }
63
+fi
64
+
32 65
 # Work around bugs in pre-3.0 UWIN ksh.
33
-$as_unset ENV MAIL MAILPATH
66
+for as_var in ENV MAIL MAILPATH
67
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
68
+done
34 69
 PS1='$ '
35 70
 PS2='> '
36 71
 PS4='+ '
... ...
@@ -44,18 +104,19 @@ do
44 44
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
45 45
     eval $as_var=C; export $as_var
46 46
   else
47
-    $as_unset $as_var
47
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
48 48
   fi
49 49
 done
50 50
 
51 51
 # Required to use basename.
52
-if expr a : '\(a\)' >/dev/null 2>&1; then
52
+if expr a : '\(a\)' >/dev/null 2>&1 &&
53
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
53 54
   as_expr=expr
54 55
 else
55 56
   as_expr=false
56 57
 fi
57 58
 
58
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
59
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
59 60
   as_basename=basename
60 61
 else
61 62
   as_basename=false
... ...
@@ -63,157 +124,386 @@ fi
63 63
 
64 64
 
65 65
 # Name of the executable.
66
-as_me=`$as_basename "$0" ||
66
+as_me=`$as_basename -- "$0" ||
67 67
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
68 68
 	 X"$0" : 'X\(//\)$' \| \
69
-	 X"$0" : 'X\(/\)$' \| \
70
-	 .     : '\(.\)' 2>/dev/null ||
69
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
71 70
 echo X/"$0" |
72
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
73
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
74
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
75
-  	  s/.*/./; q'`
71
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
72
+	    s//\1/
73
+	    q
74
+	  }
75
+	  /^X\/\(\/\/\)$/{
76
+	    s//\1/
77
+	    q
78
+	  }
79
+	  /^X\/\(\/\).*/{
80
+	    s//\1/
81
+	    q
82
+	  }
83
+	  s/.*/./; q'`
76 84
 
85
+# CDPATH.
86
+$as_unset CDPATH
77 87
 
78
-# PATH needs CR, and LINENO needs CR and PATH.
79
-# Avoid depending upon Character Ranges.
80
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
81
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
82
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
83
-as_cr_digits='0123456789'
84
-as_cr_alnum=$as_cr_Letters$as_cr_digits
85 88
 
86
-# The user is always right.
87
-if test "${PATH_SEPARATOR+set}" != set; then
88
-  echo "#! /bin/sh" >conf$$.sh
89
-  echo  "exit 0"   >>conf$$.sh
90
-  chmod +x conf$$.sh
91
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
92
-    PATH_SEPARATOR=';'
93
-  else
94
-    PATH_SEPARATOR=:
95
-  fi
96
-  rm -f conf$$.sh
89
+if test "x$CONFIG_SHELL" = x; then
90
+  if (eval ":") 2>/dev/null; then
91
+  as_have_required=yes
92
+else
93
+  as_have_required=no
97 94
 fi
98 95
 
96
+  if test $as_have_required = yes && 	 (eval ":
97
+(as_func_return () {
98
+  (exit \$1)
99
+}
100
+as_func_success () {
101
+  as_func_return 0
102
+}
103
+as_func_failure () {
104
+  as_func_return 1
105
+}
106
+as_func_ret_success () {
107
+  return 0
108
+}
109
+as_func_ret_failure () {
110
+  return 1
111
+}
99 112
 
100
-  as_lineno_1=$LINENO
101
-  as_lineno_2=$LINENO
102
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
103
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
104
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
105
-  # Find who we are.  Look in the path if we contain no path at all
106
-  # relative or not.
107
-  case $0 in
108
-    *[\\/]* ) as_myself=$0 ;;
109
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
110
-for as_dir in $PATH
111
-do
112
-  IFS=$as_save_IFS
113
-  test -z "$as_dir" && as_dir=.
114
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
115
-done
113
+exitcode=0
114
+if as_func_success; then
115
+  :
116
+else
117
+  exitcode=1
118
+  echo as_func_success failed.
119
+fi
116 120
 
117
-       ;;
118
-  esac
119
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
120
-  # in which case we are not to be found in the path.
121
-  if test "x$as_myself" = x; then
122
-    as_myself=$0
123
-  fi
124
-  if test ! -f "$as_myself"; then
125
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
126
-   { (exit 1); exit 1; }; }
127
-  fi
128
-  case $CONFIG_SHELL in
129
-  '')
121
+if as_func_failure; then
122
+  exitcode=1
123
+  echo as_func_failure succeeded.
124
+fi
125
+
126
+if as_func_ret_success; then
127
+  :
128
+else
129
+  exitcode=1
130
+  echo as_func_ret_success failed.
131
+fi
132
+
133
+if as_func_ret_failure; then
134
+  exitcode=1
135
+  echo as_func_ret_failure succeeded.
136
+fi
137
+
138
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
139
+  :
140
+else
141
+  exitcode=1
142
+  echo positional parameters were not saved.
143
+fi
144
+
145
+test \$exitcode = 0) || { (exit 1); exit 1; }
146
+
147
+(
148
+  as_lineno_1=\$LINENO
149
+  as_lineno_2=\$LINENO
150
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
151
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
152
+") 2> /dev/null; then
153
+  :
154
+else
155
+  as_candidate_shells=
130 156
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
131
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
157
+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
132 158
 do
133 159
   IFS=$as_save_IFS
134 160
   test -z "$as_dir" && as_dir=.
135
-  for as_base in sh bash ksh sh5; do
136
-	 case $as_dir in
161
+  case $as_dir in
137 162
 	 /*)
138
-	   if ("$as_dir/$as_base" -c '
163
+	   for as_base in sh bash ksh sh5; do
164
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
165
+	   done;;
166
+       esac
167
+done
168
+IFS=$as_save_IFS
169
+
170
+
171
+      for as_shell in $as_candidate_shells $SHELL; do
172
+	 # Try only shells which exist, to save several forks.
173
+	 if test -f "$as_shell" &&
174
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
175
+# Be Bourne compatible
176
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
177
+  emulate sh
178
+  NULLCMD=:
179
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
180
+  # is contrary to our usage.  Disable this feature.
181
+  alias -g '${1+"$@"}'='"$@"'
182
+  setopt NO_GLOB_SUBST
183
+else
184
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
185
+fi
186
+BIN_SH=xpg4; export BIN_SH # for Tru64
187
+DUALCASE=1; export DUALCASE # for MKS sh
188
+
189
+:
190
+_ASEOF
191
+}; then
192
+  CONFIG_SHELL=$as_shell
193
+	       as_have_required=yes
194
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
195
+# Be Bourne compatible
196
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
197
+  emulate sh
198
+  NULLCMD=:
199
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
200
+  # is contrary to our usage.  Disable this feature.
201
+  alias -g '${1+"$@"}'='"$@"'
202
+  setopt NO_GLOB_SUBST
203
+else
204
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
205
+fi
206
+BIN_SH=xpg4; export BIN_SH # for Tru64
207
+DUALCASE=1; export DUALCASE # for MKS sh
208
+
209
+:
210
+(as_func_return () {
211
+  (exit $1)
212
+}
213
+as_func_success () {
214
+  as_func_return 0
215
+}
216
+as_func_failure () {
217
+  as_func_return 1
218
+}
219
+as_func_ret_success () {
220
+  return 0
221
+}
222
+as_func_ret_failure () {
223
+  return 1
224
+}
225
+
226
+exitcode=0
227
+if as_func_success; then
228
+  :
229
+else
230
+  exitcode=1
231
+  echo as_func_success failed.
232
+fi
233
+
234
+if as_func_failure; then
235
+  exitcode=1
236
+  echo as_func_failure succeeded.
237
+fi
238
+
239
+if as_func_ret_success; then
240
+  :
241
+else
242
+  exitcode=1
243
+  echo as_func_ret_success failed.
244
+fi
245
+
246
+if as_func_ret_failure; then
247
+  exitcode=1
248
+  echo as_func_ret_failure succeeded.
249
+fi
250
+
251
+if ( set x; as_func_ret_success y && test x = "$1" ); then
252
+  :
253
+else
254
+  exitcode=1
255
+  echo positional parameters were not saved.
256
+fi
257
+
258
+test $exitcode = 0) || { (exit 1); exit 1; }
259
+
260
+(
139 261
   as_lineno_1=$LINENO
140 262
   as_lineno_2=$LINENO
141
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
142 263
   test "x$as_lineno_1" != "x$as_lineno_2" &&
143
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
144
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
145
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
146
-	     CONFIG_SHELL=$as_dir/$as_base
147
-	     export CONFIG_SHELL
148
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
149
-	   fi;;
150
-	 esac
151
-       done
152
-done
153
-;;
154
-  esac
264
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
265
+
266
+_ASEOF
267
+}; then
268
+  break
269
+fi
270
+
271
+fi
272
+
273
+      done
274
+
275
+      if test "x$CONFIG_SHELL" != x; then
276
+  for as_var in BASH_ENV ENV
277
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
278
+        done
279
+        export CONFIG_SHELL
280
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
281
+fi
282
+
283
+
284
+    if test $as_have_required = no; then
285
+  echo This script requires a shell more modern than all the
286
+      echo shells that I found on your system.  Please install a
287
+      echo modern shell, or manually run the script under such a
288
+      echo shell if you do have one.
289
+      { (exit 1); exit 1; }
290
+fi
291
+
292
+
293
+fi
294
+
295
+fi
296
+
297
+
298
+
299
+(eval "as_func_return () {
300
+  (exit \$1)
301
+}
302
+as_func_success () {
303
+  as_func_return 0
304
+}
305
+as_func_failure () {
306
+  as_func_return 1
307
+}
308
+as_func_ret_success () {
309
+  return 0
310
+}
311
+as_func_ret_failure () {
312
+  return 1
313
+}
314
+
315
+exitcode=0
316
+if as_func_success; then
317
+  :
318
+else
319
+  exitcode=1
320
+  echo as_func_success failed.
321
+fi
322
+
323
+if as_func_failure; then
324
+  exitcode=1
325
+  echo as_func_failure succeeded.
326
+fi
327
+
328
+if as_func_ret_success; then
329
+  :
330
+else
331
+  exitcode=1
332
+  echo as_func_ret_success failed.
333
+fi
334
+
335
+if as_func_ret_failure; then
336
+  exitcode=1
337
+  echo as_func_ret_failure succeeded.
338
+fi
339
+
340
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
341
+  :
342
+else
343
+  exitcode=1
344
+  echo positional parameters were not saved.
345
+fi
346
+
347
+test \$exitcode = 0") || {
348
+  echo No shell found that supports shell functions.
349
+  echo Please tell autoconf@gnu.org about your system,
350
+  echo including any error possibly output before this
351
+  echo message
352
+}
353
+
354
+
355
+
356
+  as_lineno_1=$LINENO
357
+  as_lineno_2=$LINENO
358
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
359
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
155 360
 
156 361
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
157 362
   # uniformly replaced by the line number.  The first 'sed' inserts a
158
-  # line-number line before each line; the second 'sed' does the real
159
-  # work.  The second script uses 'N' to pair each line-number line
160
-  # with the numbered line, and appends trailing '-' during
161
-  # substitution so that $LINENO is not a special case at line end.
363
+  # line-number line after each line using $LINENO; the second 'sed'
364
+  # does the real work.  The second script uses 'N' to pair each
365
+  # line-number line with the line containing $LINENO, and appends
366
+  # trailing '-' during substitution so that $LINENO is not a special
367
+  # case at line end.
162 368
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
163
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
164
-  sed '=' <$as_myself |
369
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
370
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
371
+  sed -n '
372
+    p
373
+    /[$]LINENO/=
374
+  ' <$as_myself |
165 375
     sed '
376
+      s/[$]LINENO.*/&-/
377
+      t lineno
378
+      b
379
+      :lineno
166 380
       N
167
-      s,$,-,
168
-      : loop
169
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
381
+      :loop
382
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
170 383
       t loop
171
-      s,-$,,
172
-      s,^['$as_cr_digits']*\n,,
384
+      s/-\n.*//
173 385
     ' >$as_me.lineno &&
174
-  chmod +x $as_me.lineno ||
386
+  chmod +x "$as_me.lineno" ||
175 387
     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
176 388
    { (exit 1); exit 1; }; }
177 389
 
178 390
   # Don't try to exec as it changes $[0], causing all sort of problems
179 391
   # (the dirname of $[0] is not the place where we might find the
180
-  # original and so on.  Autoconf is especially sensible to this).
181
-  . ./$as_me.lineno
392
+  # original and so on.  Autoconf is especially sensitive to this).
393
+  . "./$as_me.lineno"
182 394
   # Exit status is that of the last command.
183 395
   exit
184 396
 }
185 397
 
186 398
 
187
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
188
-  *c*,-n*) ECHO_N= ECHO_C='
189
-' ECHO_T='	' ;;
190
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
191
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
399
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
400
+  as_dirname=dirname
401
+else
402
+  as_dirname=false
403
+fi
404
+
405
+ECHO_C= ECHO_N= ECHO_T=
406
+case `echo -n x` in
407
+-n*)
408
+  case `echo 'x\c'` in
409
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
410
+  *)   ECHO_C='\c';;
411
+  esac;;
412
+*)
413
+  ECHO_N='-n';;
192 414
 esac
193 415
 
194
-if expr a : '\(a\)' >/dev/null 2>&1; then
416
+if expr a : '\(a\)' >/dev/null 2>&1 &&
417
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
195 418
   as_expr=expr
196 419
 else
197 420
   as_expr=false
198 421
 fi
199 422
 
200 423
 rm -f conf$$ conf$$.exe conf$$.file
424
+if test -d conf$$.dir; then
425
+  rm -f conf$$.dir/conf$$.file
426
+else
427
+  rm -f conf$$.dir
428
+  mkdir conf$$.dir
429
+fi
201 430
 echo >conf$$.file
202 431
 if ln -s conf$$.file conf$$ 2>/dev/null; then
203
-  # We could just check for DJGPP; but this test a) works b) is more generic
204
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
205
-  if test -f conf$$.exe; then
206
-    # Don't use ln at all; we don't have any links
432
+  as_ln_s='ln -s'
433
+  # ... but there are two gotchas:
434
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
435
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
436
+  # In both cases, we have to default to `cp -p'.
437
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
207 438
     as_ln_s='cp -p'
208
-  else
209
-    as_ln_s='ln -s'
210
-  fi
211 439
 elif ln conf$$.file conf$$ 2>/dev/null; then
212 440
   as_ln_s=ln
213 441
 else
214 442
   as_ln_s='cp -p'
215 443
 fi
216
-rm -f conf$$ conf$$.exe conf$$.file
444
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
445
+rmdir conf$$.dir 2>/dev/null
217 446
 
218 447
 if mkdir -p . 2>/dev/null; then
219 448
   as_mkdir_p=:
... ...
@@ -222,7 +512,19 @@ else
222 222
   as_mkdir_p=false
223 223
 fi
224 224
 
225
-as_executable_p="test -f"
225
+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
226
+# systems may use methods other than mode bits to determine executability.
227
+cat >conf$$.file <<_ASEOF
228
+#! /bin/sh
229
+exit 0
230
+_ASEOF
231
+chmod +x conf$$.file
232
+if test -x conf$$.file >/dev/null 2>&1; then
233
+  as_executable_p="test -x"
234
+else
235
+  as_executable_p=:
236
+fi
237
+rm -f conf$$.file
226 238
 
227 239
 # Sed expression to map a string onto a valid CPP name.
228 240
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
... ...
@@ -231,15 +533,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
231 231
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
232 232
 
233 233
 
234
-# IFS
235
-# We need space, tab and new line, in precisely that order.
236
-as_nl='
237
-'
238
-IFS=" 	$as_nl"
239
-
240
-# CDPATH.
241
-$as_unset CDPATH
242
-
243 234
 
244 235
 # Find the correct PATH separator.  Usually this is `:', but
245 236
 # DJGPP uses `;' like DOS.
... ...
@@ -400,29 +693,26 @@ fi
400 400
 
401 401
 
402 402
 
403
+exec 7<&0 </dev/null 6>&1
404
+
403 405
 # Name of the host.
404 406
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
405 407
 # so uname gets run too.
406 408
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
407 409
 
408
-exec 6>&1
409
-
410 410
 #
411 411
 # Initializations.
412 412
 #
413 413
 ac_default_prefix=/usr/local
414
+ac_clean_files=
414 415
 ac_config_libobj_dir=.
416
+LIBOBJS=
415 417
 cross_compiling=no
416 418
 subdirs=
417 419
 MFLAGS=
418 420
 MAKEFLAGS=
419 421
 SHELL=${CONFIG_SHELL-/bin/sh}
420 422
 
421
-# Maximum number of lines to put in a shell here document.
422
-# This variable seems obsolete.  It should probably be removed, and
423
-# only ac_max_sed_lines should be used.
424
-: ${ac_max_here_lines=38}
425
-
426 423
 # Identity of this package.
427 424
 PACKAGE_NAME=
428 425
 PACKAGE_TARNAME=
... ...
@@ -459,17 +749,139 @@ ac_includes_default="\
459 459
 #endif
460 460
 #if HAVE_INTTYPES_H
461 461
 # include <inttypes.h>
462
-#else
463
-# if HAVE_STDINT_H
464
-#  include <stdint.h>
465
-# endif
462
+#endif
463
+#if HAVE_STDINT_H
464
+# include <stdint.h>
466 465
 #endif
467 466
 #if HAVE_UNISTD_H
468 467
 # include <unistd.h>
469 468
 #endif"
470 469
 
471
-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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBCLAMAV_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ECHO EGREP RANLIB ac_ct_RANLIB CPP LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT sendmailprog DBDIR CFGDIR LIBCLAMAV_LIBS CLAMD_LIBS CLAMAV_MILTER_LIBS FRESHCLAM_LIBS TH_SAFE ADDITIONAL_LIBS BUILD_CLAMD_TRUE BUILD_CLAMD_FALSE HAVE_MILTER_TRUE HAVE_MILTER_FALSE GETENT CLAMAVUSER CLAMAVGROUP LIBOBJS LTLIBOBJS'
470
+ac_subst_vars='SHELL
471
+PATH_SEPARATOR
472
+PACKAGE_NAME
473
+PACKAGE_TARNAME
474
+PACKAGE_VERSION
475
+PACKAGE_STRING
476
+PACKAGE_BUGREPORT
477
+exec_prefix
478
+prefix
479
+program_transform_name
480
+bindir
481
+sbindir
482
+libexecdir
483
+datarootdir
484
+datadir
485
+sysconfdir
486
+sharedstatedir
487
+localstatedir
488
+includedir
489
+oldincludedir
490
+docdir
491
+infodir
492
+htmldir
493
+dvidir
494
+pdfdir
495
+psdir
496
+libdir
497
+localedir
498
+mandir
499
+DEFS
500
+ECHO_C
501
+ECHO_N
502
+ECHO_T
503
+LIBS
504
+build_alias
505
+host_alias
506
+target_alias
507
+build
508
+build_cpu
509
+build_vendor
510
+build_os
511
+host
512
+host_cpu
513
+host_vendor
514
+host_os
515
+target
516
+target_cpu
517
+target_vendor
518
+target_os
519
+INSTALL_PROGRAM
520
+INSTALL_SCRIPT
521
+INSTALL_DATA
522
+CYGPATH_W
523
+PACKAGE
524
+VERSION
525
+ACLOCAL
526
+AUTOCONF
527
+AUTOMAKE
528
+AUTOHEADER
529
+MAKEINFO
530
+install_sh
531
+STRIP
532
+INSTALL_STRIP_PROGRAM
533
+mkdir_p
534
+AWK
535
+SET_MAKE
536
+am__leading_dot
537
+AMTAR
538
+am__tar
539
+am__untar
540
+LIBCLAMAV_VERSION
541
+CC
542
+CFLAGS
543
+LDFLAGS
544
+CPPFLAGS
545
+ac_ct_CC
546
+EXEEXT
547
+OBJEXT
548
+DEPDIR
549
+am__include
550
+am__quote
551
+AMDEP_TRUE
552
+AMDEP_FALSE
553
+AMDEPBACKSLASH
554
+CCDEPMODE
555
+am__fastdepCC_TRUE
556
+am__fastdepCC_FALSE
557
+LN_S
558
+ECHO
559
+GREP
560
+EGREP
561
+RANLIB
562
+CPP
563
+LIBTOOL
564
+MAINTAINER_MODE_TRUE
565
+MAINTAINER_MODE_FALSE
566
+MAINT
567
+sendmailprog
568
+DBDIR
569
+CFGDIR
570
+LIBCLAMAV_LIBS
571
+CLAMD_LIBS
572
+CLAMAV_MILTER_LIBS
573
+FRESHCLAM_LIBS
574
+TH_SAFE
575
+ADDITIONAL_LIBS
576
+BUILD_CLAMD_TRUE
577
+BUILD_CLAMD_FALSE
578
+HAVE_MILTER_TRUE
579
+HAVE_MILTER_FALSE
580
+GETENT
581
+CLAMAVUSER
582
+CLAMAVGROUP
583
+LIBOBJS
584
+LTLIBOBJS'
472 585
 ac_subst_files=''
586
+      ac_precious_vars='build_alias
587
+host_alias
588
+target_alias
589
+CC
590
+CFLAGS
591
+LDFLAGS
592
+CPPFLAGS
593
+CPP'
594
+
473 595
 
474 596
 # Initialize some variables set by options.
475 597
 ac_init_help=
... ...
@@ -496,34 +908,48 @@ x_libraries=NONE
496 496
 # and all the variables that are supposed to be based on exec_prefix
497 497
 # by default will actually change.
498 498
 # Use braces instead of parens because sh, perl, etc. also accept them.
499
+# (The list follows the same order as the GNU Coding Standards.)
499 500
 bindir='${exec_prefix}/bin'
500 501
 sbindir='${exec_prefix}/sbin'
501 502
 libexecdir='${exec_prefix}/libexec'
502
-datadir='${prefix}/share'
503
+datarootdir='${prefix}/share'
504
+datadir='${datarootdir}'
503 505
 sysconfdir='${prefix}/etc'
504 506
 sharedstatedir='${prefix}/com'
505 507
 localstatedir='${prefix}/var'
506
-libdir='${exec_prefix}/lib'
507 508
 includedir='${prefix}/include'
508 509
 oldincludedir='/usr/include'
509
-infodir='${prefix}/info'
510
-mandir='${prefix}/man'
510
+docdir='${datarootdir}/doc/${PACKAGE}'
511
+infodir='${datarootdir}/info'
512
+htmldir='${docdir}'
513
+dvidir='${docdir}'
514
+pdfdir='${docdir}'
515
+psdir='${docdir}'
516
+libdir='${exec_prefix}/lib'
517
+localedir='${datarootdir}/locale'
518
+mandir='${datarootdir}/man'
511 519
 
512 520
 ac_prev=
521
+ac_dashdash=
513 522
 for ac_option
514 523
 do
515 524
   # If the previous option needs an argument, assign it.
516 525
   if test -n "$ac_prev"; then
517
-    eval "$ac_prev=\$ac_option"
526
+    eval $ac_prev=\$ac_option
518 527
     ac_prev=
519 528
     continue
520 529
   fi
521 530
 
522
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
531
+  case $ac_option in
532
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
533
+  *)	ac_optarg=yes ;;
534
+  esac
523 535
 
524 536
   # Accept the important Cygnus configure options, so we can diagnose typos.
525 537
 
526
-  case $ac_option in
538
+  case $ac_dashdash$ac_option in
539
+  --)
540
+    ac_dashdash=yes ;;
527 541
 
528 542
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
529 543
     ac_prev=bindir ;;
... ...
@@ -545,12 +971,18 @@ do
545 545
   --config-cache | -C)
546 546
     cache_file=config.cache ;;
547 547
 
548
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
548
+  -datadir | --datadir | --datadi | --datad)
549 549
     ac_prev=datadir ;;
550
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
551
-  | --da=*)
550
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
552 551
     datadir=$ac_optarg ;;
553 552
 
553
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
554
+  | --dataroo | --dataro | --datar)
555
+    ac_prev=datarootdir ;;
556
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
557
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
558
+    datarootdir=$ac_optarg ;;
559
+
554 560
   -disable-* | --disable-*)
555 561
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
556 562
     # Reject names that are not valid shell variable names.
... ...
@@ -558,7 +990,17 @@ do
558 558
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
559 559
    { (exit 1); exit 1; }; }
560 560
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
561
-    eval "enable_$ac_feature=no" ;;
561
+    eval enable_$ac_feature=no ;;
562
+
563
+  -docdir | --docdir | --docdi | --doc | --do)
564
+    ac_prev=docdir ;;
565
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
566
+    docdir=$ac_optarg ;;
567
+
568
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
569
+    ac_prev=dvidir ;;
570
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
571
+    dvidir=$ac_optarg ;;
562 572
 
563 573
   -enable-* | --enable-*)
564 574
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
... ...
@@ -567,11 +1009,7 @@ do
567 567
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
568 568
    { (exit 1); exit 1; }; }
569 569
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
570
-    case $ac_option in
571
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
572
-      *) ac_optarg=yes ;;
573
-    esac
574
-    eval "enable_$ac_feature='$ac_optarg'" ;;
570
+    eval enable_$ac_feature=\$ac_optarg ;;
575 571
 
576 572
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
577 573
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
... ...
@@ -598,6 +1036,12 @@ do
598 598
   -host=* | --host=* | --hos=* | --ho=*)
599 599
     host_alias=$ac_optarg ;;
600 600
 
601
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
602
+    ac_prev=htmldir ;;
603
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
604
+  | --ht=*)
605
+    htmldir=$ac_optarg ;;
606
+
601 607
   -includedir | --includedir | --includedi | --included | --include \
602 608
   | --includ | --inclu | --incl | --inc)
603 609
     ac_prev=includedir ;;
... ...
@@ -622,13 +1066,16 @@ do
622 622
   | --libexe=* | --libex=* | --libe=*)
623 623
     libexecdir=$ac_optarg ;;
624 624
 
625
+  -localedir | --localedir | --localedi | --localed | --locale)
626
+    ac_prev=localedir ;;
627
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
628
+    localedir=$ac_optarg ;;
629
+
625 630
   -localstatedir | --localstatedir | --localstatedi | --localstated \
626
-  | --localstate | --localstat | --localsta | --localst \
627
-  | --locals | --local | --loca | --loc | --lo)
631
+  | --localstate | --localstat | --localsta | --localst | --locals)
628 632
     ac_prev=localstatedir ;;
629 633
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
630
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
631
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
634
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
632 635
     localstatedir=$ac_optarg ;;
633 636
 
634 637
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
... ...
@@ -693,6 +1140,16 @@ do
693 693
   | --progr-tra=* | --program-tr=* | --program-t=*)
694 694
     program_transform_name=$ac_optarg ;;
695 695
 
696
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
697
+    ac_prev=pdfdir ;;
698
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
699
+    pdfdir=$ac_optarg ;;
700
+
701
+  -psdir | --psdir | --psdi | --psd | --ps)
702
+    ac_prev=psdir ;;
703
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
704
+    psdir=$ac_optarg ;;
705
+
696 706
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
697 707
   | -silent | --silent | --silen | --sile | --sil)
698 708
     silent=yes ;;
... ...
@@ -749,11 +1206,7 @@ do
749 749
       { echo "$as_me: error: invalid package name: $ac_package" >&2
750 750
    { (exit 1); exit 1; }; }
751 751
     ac_package=`echo $ac_package| sed 's/-/_/g'`
752
-    case $ac_option in
753
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
754
-      *) ac_optarg=yes ;;
755
-    esac
756
-    eval "with_$ac_package='$ac_optarg'" ;;
752
+    eval with_$ac_package=\$ac_optarg ;;
757 753
 
758 754
   -without-* | --without-*)
759 755
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
... ...
@@ -762,7 +1215,7 @@ do
762 762
       { echo "$as_me: error: invalid package name: $ac_package" >&2
763 763
    { (exit 1); exit 1; }; }
764 764
     ac_package=`echo $ac_package | sed 's/-/_/g'`
765
-    eval "with_$ac_package=no" ;;
765
+    eval with_$ac_package=no ;;
766 766
 
767 767
   --x)
768 768
     # Obsolete; use --with-x.
... ...
@@ -793,8 +1246,7 @@ Try \`$0 --help' for more information." >&2
793 793
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
794 794
       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
795 795
    { (exit 1); exit 1; }; }
796
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
797
-    eval "$ac_envvar='$ac_optarg'"
796
+    eval $ac_envvar=\$ac_optarg
798 797
     export $ac_envvar ;;
799 798
 
800 799
   *)
... ...
@@ -814,27 +1266,19 @@ if test -n "$ac_prev"; then
814 814
    { (exit 1); exit 1; }; }
815 815
 fi
816 816
 
817
-# Be sure to have absolute paths.
818
-for ac_var in exec_prefix prefix
817
+# Be sure to have absolute directory names.
818
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
819
+		datadir sysconfdir sharedstatedir localstatedir includedir \
820
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
821
+		libdir localedir mandir
819 822
 do
820
-  eval ac_val=$`echo $ac_var`
823
+  eval ac_val=\$$ac_var
821 824
   case $ac_val in
822
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
823
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
824
-   { (exit 1); exit 1; }; };;
825
-  esac
826
-done
827
-
828
-# Be sure to have absolute paths.
829
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
830
-	      localstatedir libdir includedir oldincludedir infodir mandir
831
-do
832
-  eval ac_val=$`echo $ac_var`
833
-  case $ac_val in
834
-    [\\/$]* | ?:[\\/]* ) ;;
835
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
836
-   { (exit 1); exit 1; }; };;
825
+    [\\/$]* | ?:[\\/]* )  continue;;
826
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
837 827
   esac
828
+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
829
+   { (exit 1); exit 1; }; }
838 830
 done
839 831
 
840 832
 # There might be people who depend on the old broken behavior: `$host'
... ...
@@ -861,74 +1305,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
861 861
 test "$silent" = yes && exec 6>/dev/null
862 862
 
863 863
 
864
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
865
+ac_ls_di=`ls -di .` &&
866
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
867
+  { echo "$as_me: error: Working directory cannot be determined" >&2
868
+   { (exit 1); exit 1; }; }
869
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
870
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
871
+   { (exit 1); exit 1; }; }
872
+
873
+
864 874
 # Find the source files, if location was not specified.
865 875
 if test -z "$srcdir"; then
866 876
   ac_srcdir_defaulted=yes
867
-  # Try the directory containing this script, then its parent.
868
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
877
+  # Try the directory containing this script, then the parent directory.
878
+  ac_confdir=`$as_dirname -- "$0" ||
869 879
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \