Browse code

quote macro arguments, group AC_C_* macros (bb #452), thanks to Markus Elfring <Markus.Elfring*web.de> move ld --version-script check after compiler checks run autoreconf (new libtool)

git-svn: trunk@3598

Török Edvin authored on 2008/02/08 21:38:09
Showing 21 changed files
... ...
@@ -1,3 +1,11 @@
1
+Fri Feb  8 14:20:55 EET 2008 (edwin)
2
+------------------------------------
3
+  * configure.in:
4
+	* quote macro arguments, group AC_C_* macros (bb #452), 
5
+	  thanks to Markus Elfring <Markus.Elfring*web.de>
6
+	* move ld --version-script check after compiler checks
7
+  * run autoreconf (new libtool)
8
+
1 9
 Fri Feb  8 13:50:18 EET 2008 (edwin)
2 10
 ------------------------------------
3 11
   * reduce stack usage of cli_scanscript (bb #819)
... ...
@@ -141,6 +141,7 @@ CYGPATH_W = @CYGPATH_W@
141 141
 DBDIR = @DBDIR@
142 142
 DEFS = @DEFS@
143 143
 DEPDIR = @DEPDIR@
144
+DSYMUTIL = @DSYMUTIL@
144 145
 ECHO = @ECHO@
145 146
 ECHO_C = @ECHO_C@
146 147
 ECHO_N = @ECHO_N@
... ...
@@ -173,6 +174,7 @@ LTLIBOBJS = @LTLIBOBJS@
173 173
 MAINT = @MAINT@
174 174
 MAKEINFO = @MAKEINFO@
175 175
 MKDIR_P = @MKDIR_P@
176
+NMEDIT = @NMEDIT@
176 177
 OBJEXT = @OBJEXT@
177 178
 PACKAGE = @PACKAGE@
178 179
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -132,7 +132,7 @@ AC_LIB_PROG_LD_GNU
132 132
 
133 133
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
134 134
 
135
-# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
135
+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
136 136
 
137 137
 
138 138
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
... ...
@@ -220,7 +220,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
220 220
 AC_REQUIRE([AC_OBJEXT])dnl
221 221
 AC_REQUIRE([AC_EXEEXT])dnl
222 222
 dnl
223
-
224 223
 AC_LIBTOOL_SYS_MAX_CMD_LEN
225 224
 AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
226 225
 AC_LIBTOOL_OBJDIR
... ...
@@ -322,6 +321,8 @@ file_magic*)
322 322
   ;;
323 323
 esac
324 324
 
325
+_LT_REQUIRED_DARWIN_CHECKS
326
+
325 327
 AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
326 328
 AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
327 329
 enable_win32_dll=yes, enable_win32_dll=no)
... ...
@@ -401,9 +402,80 @@ ac_outfile=conftest.$ac_objext
401 401
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
402 402
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
403 403
 _lt_linker_boilerplate=`cat conftest.err`
404
-$rm conftest*
404
+$rm -r conftest*
405 405
 ])# _LT_LINKER_BOILERPLATE
406 406
 
407
+# _LT_REQUIRED_DARWIN_CHECKS
408
+# --------------------------
409
+# Check for some things on darwin
410
+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
411
+  case $host_os in
412
+    rhapsody* | darwin*)
413
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
414
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
415
+
416
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
417
+      [lt_cv_apple_cc_single_mod=no
418
+      if test -z "${LT_MULTI_MODULE}"; then
419
+   # By default we will add the -single_module flag. You can override
420
+   # by either setting the environment variable LT_MULTI_MODULE
421
+   # non-empty at configure time, or by adding -multi_module to the
422
+   # link flags.
423
+   echo "int foo(void){return 1;}" > conftest.c
424
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
425
+     -dynamiclib ${wl}-single_module conftest.c
426
+   if test -f libconftest.dylib; then
427
+     lt_cv_apple_cc_single_mod=yes
428
+     rm -rf libconftest.dylib*
429
+   fi
430
+   rm conftest.c
431
+      fi])
432
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
433
+      [lt_cv_ld_exported_symbols_list],
434
+      [lt_cv_ld_exported_symbols_list=no
435
+      save_LDFLAGS=$LDFLAGS
436
+      echo "_main" > conftest.sym
437
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
438
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
439
+   [lt_cv_ld_exported_symbols_list=yes],
440
+   [lt_cv_ld_exported_symbols_list=no])
441
+   LDFLAGS="$save_LDFLAGS"
442
+    ])
443
+    case $host_os in
444
+    rhapsody* | darwin1.[[0123]])
445
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
446
+    darwin1.*)
447
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
448
+    darwin*)
449
+      # if running on 10.5 or later, the deployment target defaults
450
+      # to the OS version, if on x86, and 10.4, the deployment
451
+      # target defaults to 10.4. Don't you love it?
452
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
453
+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
454
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
455
+   10.[[012]]*)
456
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
457
+   10.*)
458
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
459
+      esac
460
+    ;;
461
+  esac
462
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
463
+      _lt_dar_single_mod='$single_module'
464
+    fi
465
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
466
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
467
+    else
468
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
469
+    fi
470
+    if test "$DSYMUTIL" != ":"; then
471
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
472
+    else
473
+      _lt_dsymutil=
474
+    fi
475
+    ;;
476
+  esac
477
+])
407 478
 
408 479
 # _LT_AC_SYS_LIBPATH_AIX
409 480
 # ----------------------
... ...
@@ -728,7 +800,11 @@ sparc*-*solaris*)
728 728
     *64-bit*)
729 729
       case $lt_cv_prog_gnu_ld in
730 730
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
731
-      *)    LD="${LD-ld} -64" ;;
731
+      *)
732
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
733
+	  LD="${LD-ld} -64"
734
+	fi
735
+	;;
732 736
       esac
733 737
       ;;
734 738
     esac
... ...
@@ -821,7 +897,7 @@ AC_CACHE_CHECK([$1], [$2],
821 821
        $2=yes
822 822
      fi
823 823
    fi
824
-   $rm conftest*
824
+   $rm -r conftest*
825 825
    LDFLAGS="$save_LDFLAGS"
826 826
 ])
827 827
 
... ...
@@ -1092,7 +1168,7 @@ else
1092 1092
     AC_CHECK_FUNC([shl_load],
1093 1093
 	  [lt_cv_dlopen="shl_load"],
1094 1094
       [AC_CHECK_LIB([dld], [shl_load],
1095
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
1095
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
1096 1096
 	[AC_CHECK_FUNC([dlopen],
1097 1097
 	      [lt_cv_dlopen="dlopen"],
1098 1098
 	  [AC_CHECK_LIB([dl], [dlopen],
... ...
@@ -1100,7 +1176,7 @@ else
1100 1100
 	    [AC_CHECK_LIB([svld], [dlopen],
1101 1101
 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
1102 1102
 	      [AC_CHECK_LIB([dld], [dld_link],
1103
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
1103
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
1104 1104
 	      ])
1105 1105
 	    ])
1106 1106
 	  ])
... ...
@@ -1417,7 +1493,7 @@ aix3*)
1417 1417
   soname_spec='${libname}${release}${shared_ext}$major'
1418 1418
   ;;
1419 1419
 
1420
-aix4* | aix5*)
1420
+aix[[4-9]]*)
1421 1421
   version_type=linux
1422 1422
   need_lib_prefix=no
1423 1423
   need_version=no
... ...
@@ -1950,6 +2026,13 @@ esac
1950 1950
 AC_MSG_RESULT([$dynamic_linker])
1951 1951
 test "$dynamic_linker" = no && can_build_shared=no
1952 1952
 
1953
+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
1954
+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
1955
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
1956
+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
1957
+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
1958
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
1959
+
1953 1960
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
1954 1961
 if test "$GCC" = yes; then
1955 1962
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
... ...
@@ -2449,7 +2532,7 @@ lt_cv_deplibs_check_method='unknown'
2449 2449
 # whether `pass_all' will *always* work, you probably want this one.
2450 2450
 
2451 2451
 case $host_os in
2452
-aix4* | aix5*)
2452
+aix[[4-9]]*)
2453 2453
   lt_cv_deplibs_check_method=pass_all
2454 2454
   ;;
2455 2455
 
... ...
@@ -2885,7 +2968,7 @@ aix3*)
2885 2885
   fi
2886 2886
   ;;
2887 2887
 
2888
-aix4* | aix5*)
2888
+aix[[4-9]]*)
2889 2889
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
2890 2890
     test "$enable_shared" = yes && enable_static=no
2891 2891
   fi
... ...
@@ -2942,6 +3025,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
2942 2942
 _LT_AC_TAGVAR(predeps, $1)=
2943 2943
 _LT_AC_TAGVAR(postdeps, $1)=
2944 2944
 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
2945
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
2945 2946
 
2946 2947
 # Source file extension for C++ test sources.
2947 2948
 ac_ext=cpp
... ...
@@ -3051,7 +3135,7 @@ case $host_os in
3051 3051
     # FIXME: insert proper C++ library support
3052 3052
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
3053 3053
     ;;
3054
-  aix4* | aix5*)
3054
+  aix[[4-9]]*)
3055 3055
     if test "$host_cpu" = ia64; then
3056 3056
       # On IA64, the linker does run time linking by default, so we don't
3057 3057
       # have to do anything special.
... ...
@@ -3064,7 +3148,7 @@ case $host_os in
3064 3064
       # Test if we are trying to use run time linking or normal
3065 3065
       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
3066 3066
       # need to do runtime linking.
3067
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
3067
+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
3068 3068
 	for ld_flag in $LDFLAGS; do
3069 3069
 	  case $ld_flag in
3070 3070
 	  *-brtl*)
... ...
@@ -3210,51 +3294,23 @@ case $host_os in
3210 3210
     fi
3211 3211
   ;;
3212 3212
       darwin* | rhapsody*)
3213
-        case $host_os in
3214
-        rhapsody* | darwin1.[[012]])
3215
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
3216
-         ;;
3217
-       *) # Darwin 1.3 on
3218
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
3219
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
3220
-         else
3221
-           case ${MACOSX_DEPLOYMENT_TARGET} in
3222
-             10.[[012]])
3223
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
3224
-               ;;
3225
-             10.*)
3226
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
3227
-               ;;
3228
-           esac
3229
-         fi
3230
-         ;;
3231
-        esac
3232 3213
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
3233 3214
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
3234 3215
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
3235 3216
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
3236 3217
       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
3237 3218
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
3238
-
3239
-    if test "$GXX" = yes ; then
3240
-      lt_int_apple_cc_single_mod=no
3219
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
3220
+      if test "$GXX" = yes ; then
3241 3221
       output_verbose_link_cmd='echo'
3242
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
3243
-       lt_int_apple_cc_single_mod=yes
3222
+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
3223
+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
3224
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
3225
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
3226
+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
3227
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
3228
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
3244 3229
       fi
3245
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
3246
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
3247
-      else
3248
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
3249
-        fi
3250
-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
3251
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
3252
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
3253
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
3254
-          else
3255
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
3256
-          fi
3257
-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
3258 3230
       else
3259 3231
       case $cc_basename in
3260 3232
         xlc*)
... ...
@@ -3505,7 +3561,7 @@ case $host_os in
3505 3505
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
3506 3506
 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
3507 3507
 	;;
3508
-      pgCC*)
3508
+      pgCC* | pgcpp*)
3509 3509
         # Portland Group C++ compiler
3510 3510
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
3511 3511
   	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
... ...
@@ -3940,7 +3996,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
3940 3940
 # compiler output when linking a shared library.
3941 3941
 # Parse the compiler output and extract the necessary
3942 3942
 # objects, libraries and library flags.
3943
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
3943
+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
3944
+[AC_REQUIRE([LT_AC_PROG_SED])dnl
3944 3945
 dnl we can't use the lt_simple_compile_test_code here,
3945 3946
 dnl because it contains code intended for an executable,
3946 3947
 dnl not a library.  It's possible we should let each
... ...
@@ -4065,6 +4122,11 @@ fi
4065 4065
 
4066 4066
 $rm -f confest.$objext
4067 4067
 
4068
+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
4069
+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
4070
+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
4071
+fi
4072
+
4068 4073
 # PORTME: override above test on systems where it is broken
4069 4074
 ifelse([$1],[CXX],
4070 4075
 [case $host_os in
... ...
@@ -4121,7 +4183,6 @@ solaris*)
4121 4121
   ;;
4122 4122
 esac
4123 4123
 ])
4124
-
4125 4124
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
4126 4125
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
4127 4126
 esac
... ...
@@ -4206,7 +4267,7 @@ aix3*)
4206 4206
     postinstall_cmds='$RANLIB $lib'
4207 4207
   fi
4208 4208
   ;;
4209
-aix4* | aix5*)
4209
+aix[[4-9]]*)
4210 4210
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
4211 4211
     test "$enable_shared" = yes && enable_static=no
4212 4212
   fi
... ...
@@ -4383,6 +4444,7 @@ if test -f "$ltmain"; then
4383 4383
     _LT_AC_TAGVAR(predeps, $1) \
4384 4384
     _LT_AC_TAGVAR(postdeps, $1) \
4385 4385
     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
4386
+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
4386 4387
     _LT_AC_TAGVAR(archive_cmds, $1) \
4387 4388
     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
4388 4389
     _LT_AC_TAGVAR(postinstall_cmds, $1) \
... ...
@@ -4445,7 +4507,7 @@ ifelse([$1], [],
4445 4445
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
4446 4446
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
4447 4447
 #
4448
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
4448
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
4449 4449
 # Free Software Foundation, Inc.
4450 4450
 #
4451 4451
 # This file is part of GNU Libtool:
... ...
@@ -4682,6 +4744,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
4682 4682
 # shared library.
4683 4683
 postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
4684 4684
 
4685
+# The directories searched by this compiler when creating a shared
4686
+# library
4687
+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
4688
+
4685 4689
 # The library search path used internally by the compiler when linking
4686 4690
 # a shared library.
4687 4691
 compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
... ...
@@ -5031,7 +5097,7 @@ EOF
5031 5031
     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
5032 5032
     cat conftest.$ac_ext >&5
5033 5033
   fi
5034
-  rm -f conftest* conftst*
5034
+  rm -rf conftest* conftst*
5035 5035
 
5036 5036
   # Do not use the global_symbol_pipe unless it works.
5037 5037
   if test "$pipe_works" = yes; then
... ...
@@ -5088,7 +5154,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
5088 5088
       # built for inclusion in a dll (and should export symbols for example).
5089 5089
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
5090 5090
       # (--disable-auto-import) libraries
5091
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
5091
+      m4_if([$1], [GCJ], [],
5092
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
5092 5093
       ;;
5093 5094
     darwin* | rhapsody*)
5094 5095
       # PIC is the default on this platform
... ...
@@ -5125,7 +5192,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
5125 5125
     esac
5126 5126
   else
5127 5127
     case $host_os in
5128
-      aix4* | aix5*)
5128
+      aix[[4-9]]*)
5129 5129
 	# All AIX code is PIC.
5130 5130
 	if test "$host_cpu" = ia64; then
5131 5131
 	  # AIX 5 now supports IA64 processor
... ...
@@ -5221,7 +5288,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
5221 5221
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
5222 5222
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
5223 5223
 	    ;;
5224
-	  pgCC*)
5224
+	  pgCC* | pgcpp*)
5225 5225
 	    # Portland Group C++ compiler.
5226 5226
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
5227 5227
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
... ...
@@ -5372,7 +5439,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
5372 5372
       # built for inclusion in a dll (and should export symbols for example).
5373 5373
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
5374 5374
       # (--disable-auto-import) libraries
5375
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
5375
+      m4_if([$1], [GCJ], [],
5376
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
5376 5377
       ;;
5377 5378
 
5378 5379
     darwin* | rhapsody*)
... ...
@@ -5442,7 +5510,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
5442 5442
     mingw* | cygwin* | pw32* | os2*)
5443 5443
       # This hack is so that the source file can tell whether it is being
5444 5444
       # built for inclusion in a dll (and should export symbols for example).
5445
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
5445
+      m4_if([$1], [GCJ], [],
5446
+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
5446 5447
       ;;
5447 5448
 
5448 5449
     hpux9* | hpux10* | hpux11*)
... ...
@@ -5579,7 +5648,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
5579 5579
 #
5580 5580
 if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
5581 5581
   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
5582
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
5582
+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
5583 5583
     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
5584 5584
     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
5585 5585
      "" | " "*) ;;
... ...
@@ -5603,7 +5672,7 @@ esac
5603 5603
 #
5604 5604
 wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
5605 5605
 AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
5606
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
5606
+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
5607 5607
   $lt_tmp_static_flag,
5608 5608
   [],
5609 5609
   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
... ...
@@ -5619,7 +5688,7 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
5619 5619
 ifelse([$1],[CXX],[
5620 5620
   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
5621 5621
   case $host_os in
5622
-  aix4* | aix5*)
5622
+  aix[[4-9]]*)
5623 5623
     # If we're using GNU nm, then we don't want the "-C" option.
5624 5624
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
5625 5625
     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
... ...
@@ -5641,6 +5710,7 @@ ifelse([$1],[CXX],[
5641 5641
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
5642 5642
   ;;
5643 5643
   esac
5644
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
5644 5645
 ],[
5645 5646
   runpath_var=
5646 5647
   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
... ...
@@ -5671,12 +5741,14 @@ ifelse([$1],[CXX],[
5671 5671
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
5672 5672
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
5673 5673
   # as well as any symbol that contains `d'.
5674
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
5674
+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
5675 5675
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
5676 5676
   # platforms (ab)use it in PIC code, but their linkers get confused if
5677 5677
   # the symbol is explicitly referenced.  Since portable code cannot
5678 5678
   # rely on this symbol name, it's probably fine to never include it in
5679 5679
   # preloaded symbol tables.
5680
+  # Exclude shared library initialization/finalization symbols.
5681
+dnl Note also adjust exclude_expsyms for C++ above.
5680 5682
   extract_expsyms_cmds=
5681 5683
   # Just being paranoid about ensuring that cc_basename is set.
5682 5684
   _LT_CC_BASENAME([$compiler])
... ...
@@ -5726,7 +5798,7 @@ ifelse([$1],[CXX],[
5726 5726
 
5727 5727
     # See if GNU ld supports shared libraries.
5728 5728
     case $host_os in
5729
-    aix3* | aix4* | aix5*)
5729
+    aix[[3-9]]*)
5730 5730
       # On AIX/PPC, the GNU linker is very broken
5731 5731
       if test "$host_cpu" != ia64; then
5732 5732
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
... ...
@@ -5946,7 +6018,7 @@ _LT_EOF
5946 5946
       fi
5947 5947
       ;;
5948 5948
 
5949
-    aix4* | aix5*)
5949
+    aix[[4-9]]*)
5950 5950
       if test "$host_cpu" = ia64; then
5951 5951
 	# On IA64, the linker does run time linking by default, so we don't
5952 5952
 	# have to do anything special.
... ...
@@ -5966,7 +6038,7 @@ _LT_EOF
5966 5966
 	# Test if we are trying to use run time linking or normal
5967 5967
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
5968 5968
 	# need to do runtime linking.
5969
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
5969
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
5970 5970
 	  for ld_flag in $LDFLAGS; do
5971 5971
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
5972 5972
   	    aix_use_runtimelinking=yes
... ...
@@ -6126,11 +6198,10 @@ _LT_EOF
6126 6126
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
6127 6127
     if test "$GCC" = yes ; then
6128 6128
     	output_verbose_link_cmd='echo'
6129
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
6130
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
6131
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
6132
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
6133
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
6129
+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
6130
+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
6131
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
6132
+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
6134 6133
     else
6135 6134
       case $cc_basename in
6136 6135
         xlc*)
... ...
@@ -123,6 +123,7 @@ CYGPATH_W = @CYGPATH_W@
123 123
 DBDIR = @DBDIR@
124 124
 DEFS = @DEFS@
125 125
 DEPDIR = @DEPDIR@
126
+DSYMUTIL = @DSYMUTIL@
126 127
 ECHO = @ECHO@
127 128
 ECHO_C = @ECHO_C@
128 129
 ECHO_N = @ECHO_N@
... ...
@@ -155,6 +156,7 @@ LTLIBOBJS = @LTLIBOBJS@
155 155
 MAINT = @MAINT@
156 156
 MAKEINFO = @MAKEINFO@
157 157
 MKDIR_P = @MKDIR_P@
158
+NMEDIT = @NMEDIT@
158 159
 OBJEXT = @OBJEXT@
159 160
 PACKAGE = @PACKAGE@
160 161
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@
108 108
 DBDIR = @DBDIR@
109 109
 DEFS = @DEFS@ -DCL_NOTHREADS
110 110
 DEPDIR = @DEPDIR@
111
+DSYMUTIL = @DSYMUTIL@
111 112
 ECHO = @ECHO@
112 113
 ECHO_C = @ECHO_C@
113 114
 ECHO_N = @ECHO_N@
... ...
@@ -140,6 +141,7 @@ LTLIBOBJS = @LTLIBOBJS@
140 140
 MAINT = @MAINT@
141 141
 MAKEINFO = @MAKEINFO@
142 142
 MKDIR_P = @MKDIR_P@
143
+NMEDIT = @NMEDIT@
143 144
 OBJEXT = @OBJEXT@
144 145
 PACKAGE = @PACKAGE@
145 146
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
128 128
 DBDIR = @DBDIR@
129 129
 DEFS = @DEFS@
130 130
 DEPDIR = @DEPDIR@
131
+DSYMUTIL = @DSYMUTIL@
131 132
 ECHO = @ECHO@
132 133
 ECHO_C = @ECHO_C@
133 134
 ECHO_N = @ECHO_N@
... ...
@@ -160,6 +161,7 @@ LTLIBOBJS = @LTLIBOBJS@
160 160
 MAINT = @MAINT@
161 161
 MAKEINFO = @MAKEINFO@
162 162
 MKDIR_P = @MKDIR_P@
163
+NMEDIT = @NMEDIT@
163 164
 OBJEXT = @OBJEXT@
164 165
 PACKAGE = @PACKAGE@
165 166
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -117,6 +117,7 @@ CYGPATH_W = @CYGPATH_W@
117 117
 DBDIR = @DBDIR@
118 118
 DEFS = @DEFS@ -DCL_NOTHREADS -DCL_NOLIBCLAMAV
119 119
 DEPDIR = @DEPDIR@
120
+DSYMUTIL = @DSYMUTIL@
120 121
 ECHO = @ECHO@
121 122
 ECHO_C = @ECHO_C@
122 123
 ECHO_N = @ECHO_N@
... ...
@@ -149,6 +150,7 @@ LTLIBOBJS = @LTLIBOBJS@
149 149
 MAINT = @MAINT@
150 150
 MAKEINFO = @MAKEINFO@
151 151
 MKDIR_P = @MKDIR_P@
152
+NMEDIT = @NMEDIT@
152 153
 OBJEXT = @OBJEXT@
153 154
 PACKAGE = @PACKAGE@
154 155
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -111,6 +111,7 @@ CYGPATH_W = @CYGPATH_W@
111 111
 DBDIR = @DBDIR@
112 112
 DEFS = @DEFS@ -DCL_NOTHREADS
113 113
 DEPDIR = @DEPDIR@
114
+DSYMUTIL = @DSYMUTIL@
114 115
 ECHO = @ECHO@
115 116
 ECHO_C = @ECHO_C@
116 117
 ECHO_N = @ECHO_N@
... ...
@@ -143,6 +144,7 @@ LTLIBOBJS = @LTLIBOBJS@
143 143
 MAINT = @MAINT@
144 144
 MAKEINFO = @MAKEINFO@
145 145
 MKDIR_P = @MKDIR_P@
146
+NMEDIT = @NMEDIT@
146 147
 OBJEXT = @OBJEXT@
147 148
 PACKAGE = @PACKAGE@
148 149
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -2,7 +2,7 @@
2 2
 # NOTE: Changing this file will not affect anything until you rerun configure.
3 3
 #
4 4
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
5
-# 2007  Free Software Foundation, Inc.
5
+# 2007, 2008  Free Software Foundation, Inc.
6 6
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
7 7
 #
8 8
 # This program is free software; you can redistribute it and/or modify
... ...
@@ -43,8 +43,8 @@ EXIT_FAILURE=1
43 43
 
44 44
 PROGRAM=ltmain.sh
45 45
 PACKAGE=libtool
46
-VERSION="1.5.24 Debian 1.5.24-2"
47
-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
46
+VERSION="1.5.26 Debian 1.5.26-1"
47
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
48 48
 
49 49
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
50 50
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
... ...
@@ -113,15 +113,21 @@ esac
113 113
 # These must not be set unconditionally because not all systems understand
114 114
 # e.g. LANG=C (notably SCO).
115 115
 # We save the old values to restore during execute mode.
116
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
116
+lt_env=
117
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
117 118
 do
118 119
   eval "if test \"\${$lt_var+set}\" = set; then
119 120
 	  save_$lt_var=\$$lt_var
121
+	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
120 122
 	  $lt_var=C
121 123
 	  export $lt_var
122 124
 	fi"
123 125
 done
124 126
 
127
+if test -n "$lt_env"; then
128
+  lt_env="env $lt_env"
129
+fi
130
+
125 131
 # Make sure IFS has a sensible default
126 132
 lt_nl='
127 133
 '
... ...
@@ -485,7 +491,7 @@ do
485 485
     echo "\
486 486
 $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
487 487
 
488
-Copyright (C) 2007  Free Software Foundation, Inc.
488
+Copyright (C) 2008  Free Software Foundation, Inc.
489 489
 This is free software; see the source for copying conditions.  There is NO
490 490
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
491 491
     exit $?
... ...
@@ -788,6 +794,7 @@ if test -z "$show_help"; then
788 788
     *.for) xform=for ;;
789 789
     *.java) xform=java ;;
790 790
     *.obj) xform=obj ;;
791
+    *.sx) xform=sx ;;
791 792
     esac
792 793
 
793 794
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
... ...
@@ -956,7 +963,7 @@ EOF
956 956
       $run $rm "$lobj" "$output_obj"
957 957
 
958 958
       $show "$command"
959
-      if $run eval "$command"; then :
959
+      if $run eval $lt_env "$command"; then :
960 960
       else
961 961
 	test -n "$output_obj" && $run $rm $removelist
962 962
 	exit $EXIT_FAILURE
... ...
@@ -1028,7 +1035,7 @@ EOF
1028 1028
       command="$command$suppress_output"
1029 1029
       $run $rm "$obj" "$output_obj"
1030 1030
       $show "$command"
1031
-      if $run eval "$command"; then :
1031
+      if $run eval $lt_env "$command"; then :
1032 1032
       else
1033 1033
 	$run $rm $removelist
1034 1034
 	exit $EXIT_FAILURE
... ...
@@ -1161,6 +1168,7 @@ EOF
1161 1161
     thread_safe=no
1162 1162
     vinfo=
1163 1163
     vinfo_number=no
1164
+    single_module="${wl}-single_module"
1164 1165
 
1165 1166
     func_infer_tag $base_compile
1166 1167
 
... ...
@@ -1646,6 +1654,11 @@ EOF
1646 1646
 	continue
1647 1647
 	;;
1648 1648
 
1649
+      -multi_module)
1650
+	single_module="${wl}-multi_module"
1651
+	continue
1652
+	;;
1653
+
1649 1654
       -module)
1650 1655
 	module=yes
1651 1656
 	continue
... ...
@@ -2152,7 +2165,12 @@ EOF
2152 2152
 	    continue
2153 2153
 	  fi
2154 2154
 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
2155
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
2155
+	  if test "$linkmode" = lib; then
2156
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
2157
+	  else
2158
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
2159
+	  fi
2160
+	  for searchdir in $searchdirs; do
2156 2161
 	    for search_ext in .la $std_shrext .so .a; do
2157 2162
 	      # Search the libtool library
2158 2163
 	      lib="$searchdir/lib${name}${search_ext}"
... ...
@@ -2948,12 +2966,18 @@ EOF
2948 2948
 		  # we do not want to link against static libs,
2949 2949
 		  # but need to link against shared
2950 2950
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
2951
+		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
2951 2952
 		  if test -n "$deplibrary_names" ; then
2952 2953
 		    for tmp in $deplibrary_names ; do
2953 2954
 		      depdepl=$tmp
2954 2955
 		    done
2955
-		    if test -f "$path/$depdepl" ; then
2956
+		    if test -f "$deplibdir/$depdepl" ; then
2957
+		      depdepl="$deplibdir/$depdepl"
2958
+	      	    elif test -f "$path/$depdepl" ; then
2956 2959
 		      depdepl="$path/$depdepl"
2960
+		    else
2961
+		      # Can't find it, oh well...
2962
+		      depdepl=
2957 2963
 		    fi
2958 2964
 		    # do not add paths which are already there
2959 2965
 		    case " $newlib_search_path " in
... ...
@@ -3101,9 +3125,10 @@ EOF
3101 3101
 
3102 3102
     case $linkmode in
3103 3103
     oldlib)
3104
-      if test -n "$deplibs"; then
3105
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
3106
-      fi
3104
+      case " $deplibs" in
3105
+      *\ -l* | *\ -L*)
3106
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
3107
+      esac
3107 3108
 
3108 3109
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
3109 3110
 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
... ...
@@ -4245,9 +4270,10 @@ EOF
4245 4245
       ;;
4246 4246
 
4247 4247
     obj)
4248
-      if test -n "$deplibs"; then
4249
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
4250
-      fi
4248
+      case " $deplibs" in
4249
+      *\ -l* | *\ -L*)
4250
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
4251
+      esac
4251 4252
 
4252 4253
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
4253 4254
 	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
... ...
@@ -6486,7 +6512,7 @@ relink_command=\"$relink_command\""
6486 6486
       fi
6487 6487
 
6488 6488
       # Restore saved environment variables
6489
-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
6489
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
6490 6490
       do
6491 6491
 	eval "if test \"\${save_$lt_var+set}\" = set; then
6492 6492
 		$lt_var=\$save_$lt_var; export $lt_var
... ...
@@ -860,14 +860,16 @@ EGREP
860 860
 ECHO
861 861
 AR
862 862
 RANLIB
863
+DSYMUTIL
864
+NMEDIT
863 865
 CPP
864 866
 LIBTOOL
865
-MAINTAINER_MODE_TRUE
866
-MAINTAINER_MODE_FALSE
867
-MAINT
868 867
 VERSIONSCRIPTFLAG
869 868
 VERSIONSCRIPT_TRUE
870 869
 VERSIONSCRIPT_FALSE
870
+MAINTAINER_MODE_TRUE
871
+MAINTAINER_MODE_FALSE
872
+MAINT
871 873
 LIBBZ2
872 874
 LTLIBBZ2
873 875
 LIBBZ2_PREFIX
... ...
@@ -4544,7 +4546,7 @@ lt_cv_deplibs_check_method='unknown'
4544 4544
 # whether `pass_all' will *always* work, you probably want this one.
4545 4545
 
4546 4546
 case $host_os in
4547
-aix4* | aix5*)
4547
+aix[4-9]*)
4548 4548
   lt_cv_deplibs_check_method=pass_all
4549 4549
   ;;
4550 4550
 
... ...
@@ -4760,7 +4762,7 @@ ia64-*-hpux*)
4760 4760
   ;;
4761 4761
 *-*-irix6*)
4762 4762
   # Find out which ABI we are using.
4763
-  echo '#line 4763 "configure"' > conftest.$ac_ext
4763
+  echo '#line 4765 "configure"' > conftest.$ac_ext
4764 4764
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
4765 4765
   (eval $ac_compile) 2>&5
4766 4766
   ac_status=$?
... ...
@@ -4932,7 +4934,11 @@ sparc*-*solaris*)
4932 4932
     *64-bit*)
4933 4933
       case $lt_cv_prog_gnu_ld in
4934 4934
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
4935
-      *)    LD="${LD-ld} -64" ;;
4935
+      *)
4936
+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
4937
+	  LD="${LD-ld} -64"
4938
+	fi
4939
+	;;
4936 4940
       esac
4937 4941
       ;;
4938 4942
     esac
... ...
@@ -5567,7 +5573,6 @@ done
5567 5567
 
5568 5568
 
5569 5569
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
5570
-
5571 5570
 # find the maximum length of command line arguments
5572 5571
 { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
5573 5572
 echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
... ...
@@ -5882,7 +5887,7 @@ EOF
5882 5882
     echo "$progname: failed program was:" >&5
5883 5883
     cat conftest.$ac_ext >&5
5884 5884
   fi
5885
-  rm -f conftest* conftst*
5885
+  rm -rf conftest* conftst*
5886 5886
 
5887 5887
   # Do not use the global_symbol_pipe unless it works.
5888 5888
   if test "$pipe_works" = yes; then
... ...
@@ -6442,6 +6447,318 @@ fi
6442 6442
   ;;
6443 6443
 esac
6444 6444
 
6445
+
6446
+  case $host_os in
6447
+    rhapsody* | darwin*)
6448
+    if test -n "$ac_tool_prefix"; then
6449
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
6450
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
6451
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
6452
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
6453
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
6454
+  echo $ECHO_N "(cached) $ECHO_C" >&6
6455
+else
6456
+  if test -n "$DSYMUTIL"; then
6457
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
6458
+else
6459
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6460
+for as_dir in $PATH
6461
+do
6462
+  IFS=$as_save_IFS
6463
+  test -z "$as_dir" && as_dir=.
6464
+  for ac_exec_ext in '' $ac_executable_extensions; do
6465
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6466
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
6467
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6468
+    break 2
6469
+  fi
6470
+done
6471
+done
6472
+IFS=$as_save_IFS
6473
+
6474
+fi
6475
+fi
6476
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
6477
+if test -n "$DSYMUTIL"; then
6478
+  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
6479
+echo "${ECHO_T}$DSYMUTIL" >&6; }
6480
+else
6481
+  { echo "$as_me:$LINENO: result: no" >&5
6482
+echo "${ECHO_T}no" >&6; }
6483
+fi
6484
+
6485
+
6486
+fi
6487
+if test -z "$ac_cv_prog_DSYMUTIL"; then
6488
+  ac_ct_DSYMUTIL=$DSYMUTIL
6489
+  # Extract the first word of "dsymutil", so it can be a program name with args.
6490
+set dummy dsymutil; ac_word=$2
6491
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
6492
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
6493
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
6494
+  echo $ECHO_N "(cached) $ECHO_C" >&6
6495
+else
6496
+  if test -n "$ac_ct_DSYMUTIL"; then
6497
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
6498
+else
6499
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6500
+for as_dir in $PATH
6501
+do
6502
+  IFS=$as_save_IFS
6503
+  test -z "$as_dir" && as_dir=.
6504
+  for ac_exec_ext in '' $ac_executable_extensions; do
6505
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6506
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
6507
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6508
+    break 2
6509
+  fi
6510
+done
6511
+done
6512
+IFS=$as_save_IFS
6513
+
6514
+fi
6515
+fi
6516
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
6517
+if test -n "$ac_ct_DSYMUTIL"; then
6518
+  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
6519
+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
6520
+else
6521
+  { echo "$as_me:$LINENO: result: no" >&5
6522
+echo "${ECHO_T}no" >&6; }
6523
+fi
6524
+
6525
+  if test "x$ac_ct_DSYMUTIL" = x; then
6526
+    DSYMUTIL=":"
6527
+  else
6528
+    case $cross_compiling:$ac_tool_warned in
6529
+yes:)
6530
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
6531
+whose name does not start with the host triplet.  If you think this
6532
+configuration is useful to you, please write to autoconf@gnu.org." >&5
6533
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
6534
+whose name does not start with the host triplet.  If you think this
6535
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
6536
+ac_tool_warned=yes ;;
6537
+esac
6538
+    DSYMUTIL=$ac_ct_DSYMUTIL
6539
+  fi
6540
+else
6541
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
6542
+fi
6543
+
6544
+    if test -n "$ac_tool_prefix"; then
6545
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
6546
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
6547
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
6548
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
6549
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
6550
+  echo $ECHO_N "(cached) $ECHO_C" >&6
6551
+else
6552
+  if test -n "$NMEDIT"; then
6553
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
6554
+else
6555
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6556
+for as_dir in $PATH
6557
+do
6558
+  IFS=$as_save_IFS
6559
+  test -z "$as_dir" && as_dir=.
6560
+  for ac_exec_ext in '' $ac_executable_extensions; do
6561
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6562
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
6563
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6564
+    break 2
6565
+  fi
6566
+done
6567
+done
6568
+IFS=$as_save_IFS
6569
+
6570
+fi
6571
+fi
6572
+NMEDIT=$ac_cv_prog_NMEDIT
6573
+if test -n "$NMEDIT"; then
6574
+  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
6575
+echo "${ECHO_T}$NMEDIT" >&6; }
6576
+else
6577
+  { echo "$as_me:$LINENO: result: no" >&5
6578
+echo "${ECHO_T}no" >&6; }
6579
+fi
6580
+
6581
+
6582
+fi
6583
+if test -z "$ac_cv_prog_NMEDIT"; then
6584
+  ac_ct_NMEDIT=$NMEDIT
6585
+  # Extract the first word of "nmedit", so it can be a program name with args.
6586
+set dummy nmedit; ac_word=$2
6587
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
6588
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
6589
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
6590
+  echo $ECHO_N "(cached) $ECHO_C" >&6
6591
+else
6592
+  if test -n "$ac_ct_NMEDIT"; then
6593
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
6594
+else
6595
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6596
+for as_dir in $PATH
6597
+do
6598
+  IFS=$as_save_IFS
6599
+  test -z "$as_dir" && as_dir=.
6600
+  for ac_exec_ext in '' $ac_executable_extensions; do
6601
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6602
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
6603
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6604
+    break 2
6605
+  fi
6606
+done
6607
+done
6608
+IFS=$as_save_IFS
6609
+
6610
+fi
6611
+fi
6612
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
6613
+if test -n "$ac_ct_NMEDIT"; then
6614
+  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
6615
+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
6616
+else
6617
+  { echo "$as_me:$LINENO: result: no" >&5
6618
+echo "${ECHO_T}no" >&6; }
6619
+fi
6620
+
6621
+  if test "x$ac_ct_NMEDIT" = x; then
6622
+    NMEDIT=":"
6623
+  else
6624
+    case $cross_compiling:$ac_tool_warned in
6625
+yes:)
6626
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
6627
+whose name does not start with the host triplet.  If you think this
6628
+configuration is useful to you, please write to autoconf@gnu.org." >&5
6629
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
6630
+whose name does not start with the host triplet.  If you think this
6631
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
6632
+ac_tool_warned=yes ;;
6633
+esac
6634
+    NMEDIT=$ac_ct_NMEDIT
6635
+  fi
6636
+else
6637
+  NMEDIT="$ac_cv_prog_NMEDIT"
6638
+fi
6639
+
6640
+
6641
+    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
6642
+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
6643
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
6644
+  echo $ECHO_N "(cached) $ECHO_C" >&6
6645
+else
6646
+  lt_cv_apple_cc_single_mod=no
6647
+      if test -z "${LT_MULTI_MODULE}"; then
6648
+   # By default we will add the -single_module flag. You can override
6649
+   # by either setting the environment variable LT_MULTI_MODULE
6650
+   # non-empty at configure time, or by adding -multi_module to the
6651
+   # link flags.
6652
+   echo "int foo(void){return 1;}" > conftest.c
6653
+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
6654
+     -dynamiclib ${wl}-single_module conftest.c
6655
+   if test -f libconftest.dylib; then
6656
+     lt_cv_apple_cc_single_mod=yes
6657
+     rm -rf libconftest.dylib*
6658
+   fi
6659
+   rm conftest.c
6660
+      fi
6661
+fi
6662
+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
6663
+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
6664
+    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
6665
+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
6666
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
6667
+  echo $ECHO_N "(cached) $ECHO_C" >&6
6668
+else
6669
+  lt_cv_ld_exported_symbols_list=no
6670
+      save_LDFLAGS=$LDFLAGS
6671
+      echo "_main" > conftest.sym
6672
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
6673
+      cat >conftest.$ac_ext <<_ACEOF
6674
+/* confdefs.h.  */
6675
+_ACEOF
6676
+cat confdefs.h >>conftest.$ac_ext
6677
+cat >>conftest.$ac_ext <<_ACEOF
6678
+/* end confdefs.h.  */
6679
+
6680
+int
6681
+main ()
6682
+{
6683
+
6684
+  ;
6685
+  return 0;
6686
+}
6687
+_ACEOF
6688
+rm -f conftest.$ac_objext conftest$ac_exeext
6689
+if { (ac_try="$ac_link"
6690
+case "(($ac_try" in
6691
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
6692
+  *) ac_try_echo=$ac_try;;
6693
+esac
6694
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
6695
+  (eval "$ac_link") 2>conftest.er1
6696
+  ac_status=$?
6697
+  grep -v '^ *+' conftest.er1 >conftest.err
6698
+  rm -f conftest.er1
6699
+  cat conftest.err >&5
6700
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
6701
+  (exit $ac_status); } && {
6702
+	 test -z "$ac_c_werror_flag" ||
6703
+	 test ! -s conftest.err
6704
+       } && test -s conftest$ac_exeext &&
6705
+       $as_test_x conftest$ac_exeext; then
6706
+  lt_cv_ld_exported_symbols_list=yes
6707
+else
6708
+  echo "$as_me: failed program was:" >&5
6709
+sed 's/^/| /' conftest.$ac_ext >&5
6710
+
6711
+	lt_cv_ld_exported_symbols_list=no
6712
+fi
6713
+
6714
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
6715
+      conftest$ac_exeext conftest.$ac_ext
6716
+   LDFLAGS="$save_LDFLAGS"
6717
+
6718
+fi
6719
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
6720
+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
6721
+    case $host_os in
6722
+    rhapsody* | darwin1.[0123])
6723
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
6724
+    darwin1.*)
6725
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
6726
+    darwin*)
6727
+      # if running on 10.5 or later, the deployment target defaults
6728
+      # to the OS version, if on x86, and 10.4, the deployment
6729
+      # target defaults to 10.4. Don't you love it?
6730
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
6731
+   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
6732
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
6733
+   10.[012]*)
6734
+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
6735
+   10.*)
6736
+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
6737
+      esac
6738
+    ;;
6739
+  esac
6740
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
6741
+      _lt_dar_single_mod='$single_module'
6742
+    fi
6743
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
6744
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
6745
+    else
6746
+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
6747
+    fi
6748
+    if test "$DSYMUTIL" != ":"; then
6749
+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
6750
+    else
6751
+      _lt_dsymutil=
6752
+    fi
6753
+    ;;
6754
+  esac
6755
+
6756
+
6445 6757
 enable_dlopen=no
6446 6758
 enable_win32_dll=no
6447 6759
 
... ...
@@ -6507,7 +6824,7 @@ ac_outfile=conftest.$ac_objext
6507 6507
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
6508 6508
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
6509 6509
 _lt_linker_boilerplate=`cat conftest.err`
6510
-$rm conftest*
6510
+$rm -r conftest*
6511 6511
 
6512 6512
 
6513 6513
 
... ...
@@ -6535,11 +6852,11 @@ else
6535 6535
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6536 6536
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6537 6537
    -e 's:$: $lt_compiler_flag:'`
6538
-   (eval echo "\"\$as_me:6538: $lt_compile\"" >&5)
6538
+   (eval echo "\"\$as_me:6855: $lt_compile\"" >&5)
6539 6539
    (eval "$lt_compile" 2>conftest.err)
6540 6540
    ac_status=$?
6541 6541
    cat conftest.err >&5
6542
-   echo "$as_me:6542: \$? = $ac_status" >&5
6542
+   echo "$as_me:6859: \$? = $ac_status" >&5
6543 6543
    if (exit $ac_status) && test -s "$ac_outfile"; then
6544 6544
      # The compiler can only warn and ignore the option if not recognized
6545 6545
      # So say no if there are warnings other than the usual output.
... ...
@@ -6809,10 +7126,10 @@ if test -n "$lt_prog_compiler_pic"; then
6809 6809
 
6810 6810
 { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
6811 6811
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
6812
-if test "${lt_prog_compiler_pic_works+set}" = set; then
6812
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
6813 6813
   echo $ECHO_N "(cached) $ECHO_C" >&6
6814 6814
 else
6815
-  lt_prog_compiler_pic_works=no
6815
+  lt_cv_prog_compiler_pic_works=no
6816 6816
   ac_outfile=conftest.$ac_objext
6817 6817
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
6818 6818
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
... ...
@@ -6825,27 +7142,27 @@ else
6825 6825
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6826 6826
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6827 6827
    -e 's:$: $lt_compiler_flag:'`
6828
-   (eval echo "\"\$as_me:6828: $lt_compile\"" >&5)
6828
+   (eval echo "\"\$as_me:7145: $lt_compile\"" >&5)
6829 6829
    (eval "$lt_compile" 2>conftest.err)
6830 6830
    ac_status=$?
6831 6831
    cat conftest.err >&5
6832
-   echo "$as_me:6832: \$? = $ac_status" >&5
6832
+   echo "$as_me:7149: \$? = $ac_status" >&5
6833 6833
    if (exit $ac_status) && test -s "$ac_outfile"; then
6834 6834
      # The compiler can only warn and ignore the option if not recognized
6835 6835
      # So say no if there are warnings other than the usual output.
6836 6836
      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
6837 6837
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
6838 6838
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
6839
-       lt_prog_compiler_pic_works=yes
6839
+       lt_cv_prog_compiler_pic_works=yes
6840 6840
      fi
6841 6841
    fi
6842 6842
    $rm conftest*
6843 6843
 
6844 6844
 fi
6845
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
6846
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
6845
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
6846
+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
6847 6847
 
6848
-if test x"$lt_prog_compiler_pic_works" = xyes; then
6848
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
6849 6849
     case $lt_prog_compiler_pic in
6850 6850
      "" | " "*) ;;
6851 6851
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
... ...
@@ -6872,10 +7189,10 @@ esac
6872 6872
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
6873 6873
 { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
6874 6874
 echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
6875
-if test "${lt_prog_compiler_static_works+set}" = set; then
6875
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
6876 6876
   echo $ECHO_N "(cached) $ECHO_C" >&6
6877 6877
 else
6878
-  lt_prog_compiler_static_works=no
6878
+  lt_cv_prog_compiler_static_works=no
6879 6879
    save_LDFLAGS="$LDFLAGS"
6880 6880
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
6881 6881
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
... ...
@@ -6888,20 +7205,20 @@ else
6888 6888
        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
6889 6889
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
6890 6890
        if diff conftest.exp conftest.er2 >/dev/null; then
6891
-         lt_prog_compiler_static_works=yes
6891
+         lt_cv_prog_compiler_static_works=yes
6892 6892
        fi
6893 6893
      else
6894
-       lt_prog_compiler_static_works=yes
6894
+       lt_cv_prog_compiler_static_works=yes
6895 6895
      fi
6896 6896
    fi
6897
-   $rm conftest*
6897
+   $rm -r conftest*
6898 6898
    LDFLAGS="$save_LDFLAGS"
6899 6899
 
6900 6900
 fi
6901
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
6902
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
6901
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
6902
+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
6903 6903
 
6904
-if test x"$lt_prog_compiler_static_works" = xyes; then
6904
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
6905 6905
     :
6906 6906
 else
6907 6907
     lt_prog_compiler_static=
... ...
@@ -6929,11 +7246,11 @@ else
6929 6929
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6930 6930
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6931 6931
    -e 's:$: $lt_compiler_flag:'`
6932
-   (eval echo "\"\$as_me:6932: $lt_compile\"" >&5)
6932
+   (eval echo "\"\$as_me:7249: $lt_compile\"" >&5)
6933 6933
    (eval "$lt_compile" 2>out/conftest.err)
6934 6934
    ac_status=$?
6935 6935
    cat out/conftest.err >&5
6936
-   echo "$as_me:6936: \$? = $ac_status" >&5
6936
+   echo "$as_me:7253: \$? = $ac_status" >&5
6937 6937
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
6938 6938
    then
6939 6939
      # The compiler can only warn and ignore the option if not recognized
... ...
@@ -7013,12 +7330,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
7013 7013
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
7014 7014
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
7015 7015
   # as well as any symbol that contains `d'.
7016
-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
7016
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
7017 7017
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
7018 7018
   # platforms (ab)use it in PIC code, but their linkers get confused if
7019 7019
   # the symbol is explicitly referenced.  Since portable code cannot
7020 7020
   # rely on this symbol name, it's probably fine to never include it in
7021 7021
   # preloaded symbol tables.
7022
+  # Exclude shared library initialization/finalization symbols.
7022 7023
   extract_expsyms_cmds=
7023 7024
   # Just being paranoid about ensuring that cc_basename is set.
7024 7025
   for cc_temp in $compiler""; do
... ...
@@ -7077,7 +7395,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
7077 7077
 
7078 7078
     # See if GNU ld supports shared libraries.
7079 7079
     case $host_os in
7080
-    aix3* | aix4* | aix5*)
7080
+    aix[3-9]*)
7081 7081
       # On AIX/PPC, the GNU linker is very broken
7082 7082
       if test "$host_cpu" != ia64; then
7083 7083
 	ld_shlibs=no
... ...
@@ -7297,7 +7615,7 @@ _LT_EOF
7297 7297
       fi
7298 7298
       ;;
7299 7299
 
7300
-    aix4* | aix5*)
7300
+    aix[4-9]*)
7301 7301
       if test "$host_cpu" = ia64; then
7302 7302
 	# On IA64, the linker does run time linking by default, so we don't
7303 7303
 	# have to do anything special.
... ...
@@ -7317,7 +7635,7 @@ _LT_EOF
7317 7317
 	# Test if we are trying to use run time linking or normal
7318 7318
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
7319 7319
 	# need to do runtime linking.
7320
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
7320
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
7321 7321
 	  for ld_flag in $LDFLAGS; do
7322 7322
   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
7323 7323
   	    aix_use_runtimelinking=yes
... ...
@@ -7589,11 +7907,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
7589 7589
       link_all_deplibs=yes
7590 7590
     if test "$GCC" = yes ; then
7591 7591
     	output_verbose_link_cmd='echo'
7592
-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
7593
-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
7594
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
7595
-      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
7596
-      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
7592
+        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
7593
+        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
7594
+        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
7595
+        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
7597 7596
     else
7598 7597
       case $cc_basename in
7599 7598
         xlc*)
... ...
@@ -8113,7 +8430,7 @@ aix3*)
8113 8113
   soname_spec='${libname}${release}${shared_ext}$major'
8114 8114
   ;;
8115 8115
 
8116
-aix4* | aix5*)
8116
+aix[4-9]*)
8117 8117
   version_type=linux
8118 8118
   need_lib_prefix=no
8119 8119
   need_version=no
... ...
@@ -8647,6 +8964,21 @@ esac
8647 8647
 echo "${ECHO_T}$dynamic_linker" >&6; }
8648 8648
 test "$dynamic_linker" = no && can_build_shared=no
8649 8649
 
8650
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
8651
+  echo $ECHO_N "(cached) $ECHO_C" >&6
8652
+else
8653
+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
8654
+fi
8655
+
8656
+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
8657
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
8658
+  echo $ECHO_N "(cached) $ECHO_C" >&6
8659
+else
8660
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
8661
+fi
8662
+
8663
+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
8664
+
8650 8665
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
8651 8666
 if test "$GCC" = yes; then
8652 8667
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
... ...
@@ -8966,7 +9298,7 @@ fi
8966 8966
 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
8967 8967
 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
8968 8968
 if test $ac_cv_lib_dld_shl_load = yes; then
8969
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
8969
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
8970 8970
 else
8971 8971
   { echo "$as_me:$LINENO: checking for dlopen" >&5
8972 8972
 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
... ...
@@ -9242,7 +9574,7 @@ fi
9242 9242
 { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
9243 9243
 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
9244 9244
 if test $ac_cv_lib_dld_dld_link = yes; then
9245
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
9245
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
9246 9246
 fi
9247 9247
 
9248 9248
 
... ...
@@ -9291,7 +9623,7 @@ else
9291 9291
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9292 9292
   lt_status=$lt_dlunknown
9293 9293
   cat > conftest.$ac_ext <<EOF
9294
-#line 9294 "configure"
9294
+#line 9626 "configure"
9295 9295
 #include "confdefs.h"
9296 9296
 
9297 9297
 #if HAVE_DLFCN_H
... ...
@@ -9391,7 +9723,7 @@ else
9391 9391
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
9392 9392
   lt_status=$lt_dlunknown
9393 9393
   cat > conftest.$ac_ext <<EOF
9394
-#line 9394 "configure"
9394
+#line 9726 "configure"
9395 9395
 #include "confdefs.h"
9396 9396
 
9397 9397
 #if HAVE_DLFCN_H
... ...
@@ -9518,7 +9850,7 @@ aix3*)
9518 9518
   fi
9519 9519
   ;;
9520 9520
 
9521
-aix4* | aix5*)
9521
+aix[4-9]*)
9522 9522
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
9523 9523
     test "$enable_shared" = yes && enable_static=no
9524 9524
   fi
... ...
@@ -9574,6 +9906,7 @@ if test -f "$ltmain"; then
9574 9574
     predeps \
9575 9575
     postdeps \
9576 9576
     compiler_lib_search_path \
9577
+    compiler_lib_search_dirs \
9577 9578
     archive_cmds \
9578 9579
     archive_expsym_cmds \
9579 9580
     postinstall_cmds \
... ...
@@ -9634,7 +9967,7 @@ echo "$as_me: creating $ofile" >&6;}
9634 9634
 # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
9635 9635
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
9636 9636
 #
9637
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
9637
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
9638 9638
 # Free Software Foundation, Inc.
9639 9639
 #
9640 9640
 # This file is part of GNU Libtool:
... ...
@@ -9870,6 +10203,10 @@ predeps=$lt_predeps
9870 9870
 # shared library.
9871 9871
 postdeps=$lt_postdeps
9872 9872
 
9873
+# The directories searched by this compiler when creating a shared
9874
+# library
9875
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
9876
+
9873 9877
 # The library search path used internally by the compiler when linking
9874 9878
 # a shared library.
9875 9879
 compiler_lib_search_path=$lt_compiler_lib_search_path
... ...
@@ -10304,6 +10641,500 @@ _ACEOF
10304 10304
  ;;
10305 10305
  esac
10306 10306
 
10307
+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
10308
+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
10309
+if test "${ac_cv_c_const+set}" = set; then
10310
+  echo $ECHO_N "(cached) $ECHO_C" >&6
10311
+else
10312
+  cat >conftest.$ac_ext <<_ACEOF
10313
+/* confdefs.h.  */
10314
+_ACEOF
10315
+cat confdefs.h >>conftest.$ac_ext
10316
+cat >>conftest.$ac_ext <<_ACEOF
10317
+/* end confdefs.h.  */
10318
+
10319
+int
10320
+main ()
10321
+{
10322
+/* FIXME: Include the comments suggested by Paul. */
10323
+#ifndef __cplusplus
10324
+  /* Ultrix mips cc rejects this.  */
10325
+  typedef int charset[2];
10326
+  const charset cs;
10327
+  /* SunOS 4.1.1 cc rejects this.  */
10328
+  char const *const *pcpcc;
10329
+  char **ppc;
10330
+  /* NEC SVR4.0.2 mips cc rejects this.  */
10331
+  struct point {int x, y;};
10332
+  static struct point const zero = {0,0};
10333
+  /* AIX XL C 1.02.0.0 rejects this.
10334
+     It does not let you subtract one const X* pointer from another in
10335
+     an arm of an if-expression whose if-part is not a constant
10336
+     expression */
10337
+  const char *g = "string";
10338
+  pcpcc = &g + (g ? g-g : 0);
10339
+  /* HPUX 7.0 cc rejects these. */
10340
+  ++pcpcc;
10341
+  ppc = (char**) pcpcc;
10342
+  pcpcc = (char const *const *) ppc;
10343
+  { /* SCO 3.2v4 cc rejects this.  */
10344
+    char *t;
10345
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
10346
+
10347
+    *t++ = 0;
10348
+    if (s) return 0;
10349
+  }
10350
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
10351
+    int x[] = {25, 17};
10352
+    const int *foo = &x[0];
10353
+    ++foo;
10354
+  }
10355
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
10356
+    typedef const int *iptr;
10357
+    iptr p = 0;
10358
+    ++p;
10359
+  }
10360
+  { /* AIX XL C 1.02.0.0 rejects this saying
10361
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
10362
+    struct s { int j; const int *ap[3]; };
10363
+    struct s *b; b->j = 5;
10364
+  }
10365
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
10366
+    const int foo = 10;
10367
+    if (!foo) return 0;
10368
+  }
10369
+  return !cs[0] && !zero.x;
10370
+#endif
10371
+
10372
+  ;
10373
+  return 0;
10374
+}
10375
+_ACEOF
10376
+rm -f conftest.$ac_objext
10377
+if { (ac_try="$ac_compile"
10378
+case "(($ac_try" in
10379
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10380
+  *) ac_try_echo=$ac_try;;
10381
+esac
10382
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10383
+  (eval "$ac_compile") 2>conftest.er1
10384
+  ac_status=$?
10385
+  grep -v '^ *+' conftest.er1 >conftest.err
10386
+  rm -f conftest.er1
10387
+  cat conftest.err >&5
10388
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
10389
+  (exit $ac_status); } && {
10390
+	 test -z "$ac_c_werror_flag" ||
10391
+	 test ! -s conftest.err
10392
+       } && test -s conftest.$ac_objext; then
10393
+  ac_cv_c_const=yes
10394
+else
10395
+  echo "$as_me: failed program was:" >&5
10396
+sed 's/^/| /' conftest.$ac_ext >&5
10397
+
10398
+	ac_cv_c_const=no
10399
+fi
10400
+
10401
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10402
+fi
10403
+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
10404
+echo "${ECHO_T}$ac_cv_c_const" >&6; }
10405
+if test $ac_cv_c_const = no; then
10406
+
10407
+cat >>confdefs.h <<\_ACEOF
10408
+#define const
10409
+_ACEOF
10410
+
10411
+fi
10412
+
10413
+{ echo "$as_me:$LINENO: checking for inline" >&5
10414
+echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
10415
+if test "${ac_cv_c_inline+set}" = set; then
10416
+  echo $ECHO_N "(cached) $ECHO_C" >&6
10417
+else
10418
+  ac_cv_c_inline=no
10419
+for ac_kw in inline __inline__ __inline; do
10420
+  cat >conftest.$ac_ext <<_ACEOF
10421
+/* confdefs.h.  */
10422
+_ACEOF
10423
+cat confdefs.h >>conftest.$ac_ext
10424
+cat >>conftest.$ac_ext <<_ACEOF
10425
+/* end confdefs.h.  */
10426
+#ifndef __cplusplus
10427
+typedef int foo_t;
10428
+static $ac_kw foo_t static_foo () {return 0; }
10429
+$ac_kw foo_t foo () {return 0; }
10430
+#endif
10431
+
10432
+_ACEOF
10433
+rm -f conftest.$ac_objext
10434
+if { (ac_try="$ac_compile"
10435
+case "(($ac_try" in
10436
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10437
+  *) ac_try_echo=$ac_try;;
10438
+esac
10439
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10440
+  (eval "$ac_compile") 2>conftest.er1
10441
+  ac_status=$?
10442
+  grep -v '^ *+' conftest.er1 >conftest.err
10443
+  rm -f conftest.er1
10444
+  cat conftest.err >&5
10445
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
10446
+  (exit $ac_status); } && {
10447
+	 test -z "$ac_c_werror_flag" ||
10448
+	 test ! -s conftest.err
10449
+       } && test -s conftest.$ac_objext; then
10450
+  ac_cv_c_inline=$ac_kw
10451
+else
10452
+  echo "$as_me: failed program was:" >&5
10453
+sed 's/^/| /' conftest.$ac_ext >&5
10454
+
10455
+
10456
+fi
10457
+
10458
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10459
+  test "$ac_cv_c_inline" != no && break
10460
+done
10461
+
10462
+fi
10463
+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
10464
+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
10465
+
10466
+
10467
+case $ac_cv_c_inline in
10468
+  inline | yes) ;;
10469
+  *)
10470
+    case $ac_cv_c_inline in
10471
+      no) ac_val=;;
10472
+      *) ac_val=$ac_cv_c_inline;;
10473
+    esac
10474
+    cat >>confdefs.h <<_ACEOF
10475
+#ifndef __cplusplus
10476
+#define inline $ac_val
10477
+#endif
10478
+_ACEOF
10479
+    ;;
10480
+esac
10481
+
10482
+{ echo "$as_me:$LINENO: checking whether FPU byte ordering is bigendian" >&5
10483
+echo $ECHO_N "checking whether FPU byte ordering is bigendian... $ECHO_C" >&6; }
10484
+if test "${ac_cv_c_fpu_bigendian+set}" = set; then
10485
+  echo $ECHO_N "(cached) $ECHO_C" >&6
10486
+else
10487
+  ac_cv_c_fpu_bigendian=unknown
10488
+cat >conftest.$ac_ext <<_ACEOF
10489
+/* confdefs.h.  */
10490
+_ACEOF
10491
+cat confdefs.h >>conftest.$ac_ext
10492
+cat >>conftest.$ac_ext <<_ACEOF
10493
+/* end confdefs.h.  */
10494
+double d = 3815911171354501045744583353695226502220105394563506259449467213186125718792664588210662403287568710818873279842508553551908601408568128557088985172985437412593385138085986771664896.0;
10495
+_ACEOF
10496
+rm -f conftest.$ac_objext
10497
+if { (ac_try="$ac_compile"
10498
+case "(($ac_try" in
10499
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10500
+  *) ac_try_echo=$ac_try;;
10501
+esac
10502
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10503
+  (eval "$ac_compile") 2>conftest.er1
10504
+  ac_status=$?
10505
+  grep -v '^ *+' conftest.er1 >conftest.err
10506
+  rm -f conftest.er1
10507
+  cat conftest.err >&5
10508
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
10509
+  (exit $ac_status); } && {
10510
+	 test -z "$ac_c_werror_flag" ||
10511
+	 test ! -s conftest.err
10512
+       } && test -s conftest.$ac_objext; then
10513
+
10514
+if ${GREP-grep} emmeelle conftest.$ac_objext >/dev/null 2>&1 ; then
10515
+	ac_cv_c_fpu_bigendian=yes
10516
+fi
10517
+if ${GREP-grep} elleemme conftest.$ac_objext >/dev/null 2>&1 ; then
10518
+	ac_cv_c_fpu_bigendian=no
10519
+fi
10520
+
10521
+else
10522
+  echo "$as_me: failed program was:" >&5
10523
+sed 's/^/| /' conftest.$ac_ext >&5
10524
+
10525
+
10526
+fi
10527
+
10528
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10529
+fi
10530
+{ echo "$as_me:$LINENO: result: $ac_cv_c_fpu_bigendian" >&5
10531
+echo "${ECHO_T}$ac_cv_c_fpu_bigendian" >&6; }
10532
+case $ac_cv_c_fpu_bigendian in
10533
+	yes)
10534
+
10535
+cat >>confdefs.h <<\_ACEOF
10536
+#define FPU_WORDS_BIGENDIAN 1
10537
+_ACEOF
10538
+
10539
+		;;
10540
+	no)
10541
+
10542
+cat >>confdefs.h <<\_ACEOF
10543
+#define FPU_WORDS_BIGENDIAN 0
10544
+_ACEOF
10545
+
10546
+		;;
10547
+	*)
10548
+		{ echo "$as_me:$LINENO: WARNING: Unable to determine FPU endianess, some features may not be available in this build" >&5
10549
+echo "$as_me: WARNING: Unable to determine FPU endianess, some features may not be available in this build" >&2;}
10550
+esac
10551
+
10552
+{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
10553
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
10554
+if test "${ac_cv_c_bigendian+set}" = set; then
10555
+  echo $ECHO_N "(cached) $ECHO_C" >&6
10556
+else
10557
+  # See if sys/param.h defines the BYTE_ORDER macro.
10558
+cat >conftest.$ac_ext <<_ACEOF
10559
+/* confdefs.h.  */
10560
+_ACEOF
10561
+cat confdefs.h >>conftest.$ac_ext
10562
+cat >>conftest.$ac_ext <<_ACEOF
10563
+/* end confdefs.h.  */
10564
+#include <sys/types.h>
10565
+#include <sys/param.h>
10566
+
10567
+int
10568
+main ()
10569
+{
10570
+#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
10571
+	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
10572
+ bogus endian macros
10573
+#endif
10574
+
10575
+  ;
10576
+  return 0;
10577
+}
10578
+_ACEOF
10579
+rm -f conftest.$ac_objext
10580
+if { (ac_try="$ac_compile"
10581
+case "(($ac_try" in
10582
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10583
+  *) ac_try_echo=$ac_try;;
10584
+esac
10585
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10586
+  (eval "$ac_compile") 2>conftest.er1
10587
+  ac_status=$?
10588
+  grep -v '^ *+' conftest.er1 >conftest.err
10589
+  rm -f conftest.er1
10590
+  cat conftest.err >&5
10591
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
10592
+  (exit $ac_status); } && {
10593
+	 test -z "$ac_c_werror_flag" ||
10594
+	 test ! -s conftest.err
10595
+       } && test -s conftest.$ac_objext; then
10596
+  # It does; now see whether it defined to BIG_ENDIAN or not.
10597
+cat >conftest.$ac_ext <<_ACEOF
10598
+/* confdefs.h.  */
10599
+_ACEOF
10600
+cat confdefs.h >>conftest.$ac_ext
10601
+cat >>conftest.$ac_ext <<_ACEOF
10602
+/* end confdefs.h.  */
10603
+#include <sys/types.h>
10604
+#include <sys/param.h>
10605
+
10606
+int
10607
+main ()
10608
+{
10609
+#if BYTE_ORDER != BIG_ENDIAN
10610
+ not big endian
10611
+#endif
10612
+
10613
+  ;
10614
+  return 0;
10615
+}
10616
+_ACEOF
10617
+rm -f conftest.$ac_objext
10618
+if { (ac_try="$ac_compile"
10619
+case "(($ac_try" in
10620
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10621
+  *) ac_try_echo=$ac_try;;
10622
+esac
10623
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10624
+  (eval "$ac_compile") 2>conftest.er1
10625
+  ac_status=$?
10626
+  grep -v '^ *+' conftest.er1 >conftest.err
10627
+  rm -f conftest.er1
10628
+  cat conftest.err >&5
10629
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
10630
+  (exit $ac_status); } && {
10631
+	 test -z "$ac_c_werror_flag" ||
10632
+	 test ! -s conftest.err
10633
+       } && test -s conftest.$ac_objext; then
10634
+  ac_cv_c_bigendian=yes
10635
+else
10636
+  echo "$as_me: failed program was:" >&5
10637
+sed 's/^/| /' conftest.$ac_ext >&5
10638
+
10639
+	ac_cv_c_bigendian=no
10640
+fi
10641
+
10642
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10643
+else
10644
+  echo "$as_me: failed program was:" >&5
10645
+sed 's/^/| /' conftest.$ac_ext >&5
10646
+
10647
+	# It does not; compile a test program.
10648
+if test "$cross_compiling" = yes; then
10649
+  # try to guess the endianness by grepping values into an object file
10650
+  ac_cv_c_bigendian=unknown
10651
+  cat >conftest.$ac_ext <<_ACEOF
10652
+/* confdefs.h.  */
10653
+_ACEOF
10654
+cat confdefs.h >>conftest.$ac_ext
10655
+cat >>conftest.$ac_ext <<_ACEOF
10656
+/* end confdefs.h.  */
10657
+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
10658
+short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
10659
+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
10660
+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
10661
+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
10662
+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
10663
+int
10664
+main ()
10665
+{
10666
+ _ascii (); _ebcdic ();
10667
+  ;
10668
+  return 0;
10669
+}
10670
+_ACEOF
10671
+rm -f conftest.$ac_objext
10672
+if { (ac_try="$ac_compile"
10673
+case "(($ac_try" in
10674
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10675
+  *) ac_try_echo=$ac_try;;
10676
+esac
10677
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10678
+  (eval "$ac_compile") 2>conftest.er1
10679
+  ac_status=$?
10680
+  grep -v '^ *+' conftest.er1 >conftest.err
10681
+  rm -f conftest.er1
10682
+  cat conftest.err >&5
10683
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
10684
+  (exit $ac_status); } && {
10685
+	 test -z "$ac_c_werror_flag" ||
10686
+	 test ! -s conftest.err
10687
+       } && test -s conftest.$ac_objext; then
10688
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
10689
+  ac_cv_c_bigendian=yes
10690
+fi
10691
+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
10692
+  if test "$ac_cv_c_bigendian" = unknown; then
10693
+    ac_cv_c_bigendian=no
10694
+  else
10695
+    # finding both strings is unlikely to happen, but who knows?
10696
+    ac_cv_c_bigendian=unknown
10697
+  fi
10698
+fi
10699
+else
10700
+  echo "$as_me: failed program was:" >&5
10701
+sed 's/^/| /' conftest.$ac_ext >&5
10702
+
10703
+
10704
+fi
10705
+
10706
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10707
+else
10708
+  cat >conftest.$ac_ext <<_ACEOF
10709
+/* confdefs.h.  */
10710
+_ACEOF
10711
+cat confdefs.h >>conftest.$ac_ext
10712
+cat >>conftest.$ac_ext <<_ACEOF
10713
+/* end confdefs.h.  */
10714
+$ac_includes_default
10715
+int
10716
+main ()
10717
+{
10718
+
10719
+  /* Are we little or big endian?  From Harbison&Steele.  */
10720
+  union
10721
+  {
10722
+    long int l;
10723
+    char c[sizeof (long int)];
10724
+  } u;
10725
+  u.l = 1;
10726
+  return u.c[sizeof (long int) - 1] == 1;
10727
+
10728
+  ;
10729
+  return 0;
10730
+}
10731
+_ACEOF
10732
+rm -f conftest$ac_exeext
10733
+if { (ac_try="$ac_link"
10734
+case "(($ac_try" in
10735
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10736
+  *) ac_try_echo=$ac_try;;
10737
+esac
10738
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10739
+  (eval "$ac_link") 2>&5
10740
+  ac_status=$?
10741
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
10742
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
10743
+  { (case "(($ac_try" in
10744
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
10745
+  *) ac_try_echo=$ac_try;;
10746
+esac
10747
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
10748
+  (eval "$ac_try") 2>&5
10749
+  ac_status=$?
10750
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
10751
+  (exit $ac_status); }; }; then
10752
+  ac_cv_c_bigendian=no
10753
+else
10754
+  echo "$as_me: program exited with status $ac_status" >&5
10755
+echo "$as_me: failed program was:" >&5
10756
+sed 's/^/| /' conftest.$ac_ext >&5
10757
+
10758
+( exit $ac_status )
10759
+ac_cv_c_bigendian=yes
10760
+fi
10761
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
10762
+fi
10763
+
10764
+
10765
+fi
10766
+
10767
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
10768
+fi
10769
+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
10770
+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
10771
+case $ac_cv_c_bigendian in
10772
+  yes)
10773
+
10774
+cat >>confdefs.h <<\_ACEOF
10775
+#define WORDS_BIGENDIAN 1
10776
+_ACEOF
10777
+ ;;
10778
+  no)
10779
+     ;;
10780
+  *)
10781
+    { { echo "$as_me:$LINENO: error: unknown endianness
10782
+presetting ac_cv_c_bigendian=no (or yes) will help" >&5
10783
+echo "$as_me: error: unknown endianness
10784
+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
10785
+   { (exit 1); exit 1; }; } ;;
10786
+esac
10787
+
10788
+if test $ac_cv_c_bigendian = yes; then
10789
+
10790
+cat >>confdefs.h <<\_ACEOF
10791
+#define WORDS_BIGENDIAN 1
10792
+_ACEOF
10793
+
10794
+else
10795
+
10796
+cat >>confdefs.h <<\_ACEOF
10797
+#define WORDS_BIGENDIAN 0
10798
+_ACEOF
10799
+
10800
+fi
10307 10801
 
10308 10802
 # Check whether --enable-gcc-vcheck was given.
10309 10803
 if test "${enable_gcc_vcheck+set}" = set; then
... ...
@@ -10354,7 +11185,7 @@ cat >>conftest.$ac_ext <<_ACEOF
10354 10354
 void exit (int);
10355 10355
 void abort (void);
10356 10356
 int a;
10357
-int main()
10357
+int main(void)
10358 10358
 {
10359 10359
   int j;
10360 10360
   for (j = 0; j < 6; j++)
... ...
@@ -10522,7 +11353,7 @@ int crashtest()
10522 10522
 	return 0;
10523 10523
 }
10524 10524
 
10525
-int main()
10525
+int main(void)
10526 10526
 {
10527 10527
 	int i;
10528 10528
 	for(i=0;i<sizeof(values)/sizeof(values[0]);i++) {
... ...
@@ -10653,6 +11484,73 @@ fi
10653 10653
 
10654 10654
 
10655 10655
 
10656
+{ echo "$as_me:$LINENO: checking for ld --version-script" >&5
10657
+echo $ECHO_N "checking for ld --version-script... $ECHO_C" >&6; }
10658
+if test "${ac_cv_ld_version_script+set}" = set; then
10659
+  echo $ECHO_N "(cached) $ECHO_C" >&6
10660
+else
10661
+    cat > conftest.c <<EOF
10662
+void cl_symbol1(void) {}
10663
+void cli_symbol2(void) {}
10664
+EOF
10665
+  cat > conftest.map <<EOF
10666
+RELEASE
10667
+{
10668
+	global:
10669
+		cl_*;
10670
+	local:
10671
+		*;
10672
+};
10673
+PRIVATE
10674
+{
10675
+	global:
10676
+		cli_*;
10677
+	local:
10678
+		*;
10679
+};
10680
+EOF
10681
+    if { ac_try='${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
10682
+				-o conftest.so conftest.c
10683
+				-Wl,--version-script,conftest.map
10684
+		       1>&5'
10685
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10686
+  (eval $ac_try) 2>&5
10687
+  ac_status=$?
10688
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
10689
+  (exit $ac_status); }; };
10690
+  then
10691
+      VERSIONSCRIPTFLAG=--version-script
10692
+      ac_cv_ld_version_script=yes
10693
+  else
10694
+		if { ac_try='${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
10695
+				-o conftest.so conftest.c
10696
+				-Wl,-M,conftest.map
10697
+			1>&5'
10698
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10699
+  (eval $ac_try) 2>&5
10700
+  ac_status=$?
10701
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
10702
+  (exit $ac_status); }; };
10703
+	then
10704
+		VERSIONSCRIPTFLAG=-M
10705
+		ac_cv_ld_version_script=yes;
10706
+	else
10707
+		ac_cv_ld_version_script=no
10708
+	fi
10709
+  fi
10710
+ rm -f conftest*
10711
+fi
10712
+{ echo "$as_me:$LINENO: result: $ac_cv_ld_version_script" >&5
10713
+echo "${ECHO_T}$ac_cv_ld_version_script" >&6; }
10714
+
10715
+ if test "x$ac_cv_ld_version_script" = "xyes"; then
10716
+  VERSIONSCRIPT_TRUE=
10717
+  VERSIONSCRIPT_FALSE='#'
10718
+else
10719
+  VERSIONSCRIPT_TRUE='#'
10720
+  VERSIONSCRIPT_FALSE=
10721
+fi
10722
+
10656 10723
 
10657 10724
 
10658 10725
 
... ...
@@ -12455,74 +13353,6 @@ echo "${ECHO_T}$ZLIB_HOME" >&6; }
12455 12455
 fi
12456 12456
 
12457 12457
 
12458
-{ echo "$as_me:$LINENO: checking for ld --version-script" >&5
12459
-echo $ECHO_N "checking for ld --version-script... $ECHO_C" >&6; }
12460
-if test "${ac_cv_ld_version_script+set}" = set; then
12461
-  echo $ECHO_N "(cached) $ECHO_C" >&6
12462
-else
12463
-    cat > conftest.c <<EOF
12464
-void cl_symbol1(void) {}
12465
-void cli_symbol2(void) {}
12466
-EOF
12467
-  cat > conftest.map <<EOF
12468
-RELEASE
12469
-{
12470
-	global:
12471
-		cl_*;
12472
-	local:
12473
-		*;
12474
-};
12475
-PRIVATE
12476
-{
12477
-	global:
12478
-		cli_*;
12479
-	local:
12480
-		*;
12481
-};
12482
-EOF
12483
-    if { ac_try='${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
12484
-				-o conftest.so conftest.c
12485
-				-Wl,--version-script,conftest.map
12486
-		       1>&5'
12487
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12488
-  (eval $ac_try) 2>&5
12489
-  ac_status=$?
12490
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
12491
-  (exit $ac_status); }; };
12492
-  then
12493
-      VERSIONSCRIPTFLAG=--version-script
12494
-      ac_cv_ld_version_script=yes
12495
-  else
12496
-		if { ac_try='${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
12497
-				-o conftest.so conftest.c
12498
-				-Wl,-M,conftest.map
12499
-			1>&5'
12500
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
12501
-  (eval $ac_try) 2>&5
12502
-  ac_status=$?
12503
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
12504
-  (exit $ac_status); }; };
12505
-	then
12506
-		VERSIONSCRIPTFLAG=-M
12507
-		ac_cv_ld_version_script=yes;
12508
-	else
12509
-		ac_cv_ld_version_script=no
12510
-	fi
12511
-  fi
12512
- rm -f conftest*
12513
-fi
12514
-{ echo "$as_me:$LINENO: result: $ac_cv_ld_version_script" >&5
12515
-echo "${ECHO_T}$ac_cv_ld_version_script" >&6; }
12516
-
12517
- if test "x$ac_cv_ld_version_script" = "xyes"; then
12518
-  VERSIONSCRIPT_TRUE=
12519
-  VERSIONSCRIPT_FALSE='#'
12520
-else
12521
-  VERSIONSCRIPT_TRUE='#'
12522
-  VERSIONSCRIPT_FALSE=
12523
-fi
12524
-
12525
-
12526 12458
 # Check whether --enable-zlib-vcheck was given.
12527 12459
 if test "${enable_zlib_vcheck+set}" = set; then
12528 12460
   enableval=$enable_zlib_vcheck; zlib_check=$enableval
... ...
@@ -15974,7 +16804,7 @@ int
15974 15974
 main ()
15975 15975
 {
15976 15976
 
15977
-int main() {
15977
+int main(void) {
15978 15978
 #ifdef msg_accrights
15979 15979
 #error msg_accrights defined
15980 15980
 #endif
... ...
@@ -16047,7 +16877,7 @@ int
16047 16047
 main ()
16048 16048
 {
16049 16049
 
16050
-int main() {
16050
+int main(void) {
16051 16051
 #ifdef msg_control
16052 16052
 #error msg_control defined
16053 16053
 #endif
... ...
@@ -17037,431 +17867,6 @@ echo "${ECHO_T}yes, user $clamav_user and group $clamav_group" >&6; }
17037 17037
     fi
17038 17038
 fi
17039 17039
 
17040
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
17041
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
17042
-if test "${ac_cv_c_const+set}" = set; then
17043
-  echo $ECHO_N "(cached) $ECHO_C" >&6
17044
-else
17045
-  cat >conftest.$ac_ext <<_ACEOF
17046
-/* confdefs.h.  */
17047
-_ACEOF
17048
-cat confdefs.h >>conftest.$ac_ext
17049
-cat >>conftest.$ac_ext <<_ACEOF
17050
-/* end confdefs.h.  */
17051
-
17052
-int
17053
-main ()
17054
-{
17055
-/* FIXME: Include the comments suggested by Paul. */
17056
-#ifndef __cplusplus
17057
-  /* Ultrix mips cc rejects this.  */
17058
-  typedef int charset[2];
17059
-  const charset cs;
17060
-  /* SunOS 4.1.1 cc rejects this.  */
17061
-  char const *const *pcpcc;
17062
-  char **ppc;
17063
-  /* NEC SVR4.0.2 mips cc rejects this.  */
17064
-  struct point {int x, y;};
17065
-  static struct point const zero = {0,0};
17066
-  /* AIX XL C 1.02.0.0 rejects this.
17067
-     It does not let you subtract one const X* pointer from another in
17068
-     an arm of an if-expression whose if-part is not a constant
17069
-     expression */
17070
-  const char *g = "string";
17071
-  pcpcc = &g + (g ? g-g : 0);
17072
-  /* HPUX 7.0 cc rejects these. */
17073
-  ++pcpcc;
17074
-  ppc = (char**) pcpcc;
17075
-  pcpcc = (char const *const *) ppc;
17076
-  { /* SCO 3.2v4 cc rejects this.  */
17077
-    char *t;
17078
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
17079
-
17080
-    *t++ = 0;
17081
-    if (s) return 0;
17082
-  }
17083
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
17084
-    int x[] = {25, 17};
17085
-    const int *foo = &x[0];
17086
-    ++foo;
17087
-  }
17088
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
17089
-    typedef const int *iptr;
17090
-    iptr p = 0;
17091
-    ++p;
17092
-  }
17093
-  { /* AIX XL C 1.02.0.0 rejects this saying
17094
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
17095
-    struct s { int j; const int *ap[3]; };
17096
-    struct s *b; b->j = 5;
17097
-  }
17098
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
17099
-    const int foo = 10;
17100
-    if (!foo) return 0;
17101
-  }
17102
-  return !cs[0] && !zero.x;
17103
-#endif
17104
-
17105
-  ;
17106
-  return 0;
17107
-}
17108
-_ACEOF
17109
-rm -f conftest.$ac_objext
17110
-if { (ac_try="$ac_compile"
17111
-case "(($ac_try" in
17112
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17113
-  *) ac_try_echo=$ac_try;;
17114
-esac
17115
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17116
-  (eval "$ac_compile") 2>conftest.er1
17117
-  ac_status=$?
17118
-  grep -v '^ *+' conftest.er1 >conftest.err
17119
-  rm -f conftest.er1
17120
-  cat conftest.err >&5
17121
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
17122
-  (exit $ac_status); } && {
17123
-	 test -z "$ac_c_werror_flag" ||
17124
-	 test ! -s conftest.err
17125
-       } && test -s conftest.$ac_objext; then
17126
-  ac_cv_c_const=yes
17127
-else
17128
-  echo "$as_me: failed program was:" >&5
17129
-sed 's/^/| /' conftest.$ac_ext >&5
17130
-
17131
-	ac_cv_c_const=no
17132
-fi
17133
-
17134
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17135
-fi
17136
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
17137
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
17138
-if test $ac_cv_c_const = no; then
17139
-
17140
-cat >>confdefs.h <<\_ACEOF
17141
-#define const
17142
-_ACEOF
17143
-
17144
-fi
17145
-
17146
-{ echo "$as_me:$LINENO: checking for inline" >&5
17147
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
17148
-if test "${ac_cv_c_inline+set}" = set; then
17149
-  echo $ECHO_N "(cached) $ECHO_C" >&6
17150
-else
17151
-  ac_cv_c_inline=no
17152
-for ac_kw in inline __inline__ __inline; do
17153
-  cat >conftest.$ac_ext <<_ACEOF
17154
-/* confdefs.h.  */
17155
-_ACEOF
17156
-cat confdefs.h >>conftest.$ac_ext
17157
-cat >>conftest.$ac_ext <<_ACEOF
17158
-/* end confdefs.h.  */
17159
-#ifndef __cplusplus
17160
-typedef int foo_t;
17161
-static $ac_kw foo_t static_foo () {return 0; }
17162
-$ac_kw foo_t foo () {return 0; }
17163
-#endif
17164
-
17165
-_ACEOF
17166
-rm -f conftest.$ac_objext
17167
-if { (ac_try="$ac_compile"
17168
-case "(($ac_try" in
17169
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17170
-  *) ac_try_echo=$ac_try;;
17171
-esac
17172
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17173
-  (eval "$ac_compile") 2>conftest.er1
17174
-  ac_status=$?
17175
-  grep -v '^ *+' conftest.er1 >conftest.err
17176
-  rm -f conftest.er1
17177
-  cat conftest.err >&5
17178
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
17179
-  (exit $ac_status); } && {
17180
-	 test -z "$ac_c_werror_flag" ||
17181
-	 test ! -s conftest.err
17182
-       } && test -s conftest.$ac_objext; then
17183
-  ac_cv_c_inline=$ac_kw
17184
-else
17185
-  echo "$as_me: failed program was:" >&5
17186
-sed 's/^/| /' conftest.$ac_ext >&5
17187
-
17188
-
17189
-fi
17190
-
17191
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17192
-  test "$ac_cv_c_inline" != no && break
17193
-done
17194
-
17195
-fi
17196
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
17197
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
17198
-
17199
-
17200
-case $ac_cv_c_inline in
17201
-  inline | yes) ;;
17202
-  *)
17203
-    case $ac_cv_c_inline in
17204
-      no) ac_val=;;
17205
-      *) ac_val=$ac_cv_c_inline;;
17206
-    esac
17207
-    cat >>confdefs.h <<_ACEOF
17208
-#ifndef __cplusplus
17209
-#define inline $ac_val
17210
-#endif
17211
-_ACEOF
17212
-    ;;
17213
-esac
17214
-
17215
-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
17216
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
17217
-if test "${ac_cv_c_bigendian+set}" = set; then
17218
-  echo $ECHO_N "(cached) $ECHO_C" >&6
17219
-else
17220
-  # See if sys/param.h defines the BYTE_ORDER macro.
17221
-cat >conftest.$ac_ext <<_ACEOF
17222
-/* confdefs.h.  */
17223
-_ACEOF
17224
-cat confdefs.h >>conftest.$ac_ext
17225
-cat >>conftest.$ac_ext <<_ACEOF
17226
-/* end confdefs.h.  */
17227
-#include <sys/types.h>
17228
-#include <sys/param.h>
17229
-
17230
-int
17231
-main ()
17232
-{
17233
-#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
17234
-	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
17235
- bogus endian macros
17236
-#endif
17237
-
17238
-  ;
17239
-  return 0;
17240
-}
17241
-_ACEOF
17242
-rm -f conftest.$ac_objext
17243
-if { (ac_try="$ac_compile"
17244
-case "(($ac_try" in
17245
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17246
-  *) ac_try_echo=$ac_try;;
17247
-esac
17248
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17249
-  (eval "$ac_compile") 2>conftest.er1
17250
-  ac_status=$?
17251
-  grep -v '^ *+' conftest.er1 >conftest.err
17252
-  rm -f conftest.er1
17253
-  cat conftest.err >&5
17254
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
17255
-  (exit $ac_status); } && {
17256
-	 test -z "$ac_c_werror_flag" ||
17257
-	 test ! -s conftest.err
17258
-       } && test -s conftest.$ac_objext; then
17259
-  # It does; now see whether it defined to BIG_ENDIAN or not.
17260
-cat >conftest.$ac_ext <<_ACEOF
17261
-/* confdefs.h.  */
17262
-_ACEOF
17263
-cat confdefs.h >>conftest.$ac_ext
17264
-cat >>conftest.$ac_ext <<_ACEOF
17265
-/* end confdefs.h.  */
17266
-#include <sys/types.h>
17267
-#include <sys/param.h>
17268
-
17269
-int
17270
-main ()
17271
-{
17272
-#if BYTE_ORDER != BIG_ENDIAN
17273
- not big endian
17274
-#endif
17275
-
17276
-  ;
17277
-  return 0;
17278
-}
17279
-_ACEOF
17280
-rm -f conftest.$ac_objext
17281
-if { (ac_try="$ac_compile"
17282
-case "(($ac_try" in
17283
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17284
-  *) ac_try_echo=$ac_try;;
17285
-esac
17286
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17287
-  (eval "$ac_compile") 2>conftest.er1
17288
-  ac_status=$?
17289
-  grep -v '^ *+' conftest.er1 >conftest.err
17290
-  rm -f conftest.er1
17291
-  cat conftest.err >&5
17292
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
17293
-  (exit $ac_status); } && {
17294
-	 test -z "$ac_c_werror_flag" ||
17295
-	 test ! -s conftest.err
17296
-       } && test -s conftest.$ac_objext; then
17297
-  ac_cv_c_bigendian=yes
17298
-else
17299
-  echo "$as_me: failed program was:" >&5
17300
-sed 's/^/| /' conftest.$ac_ext >&5
17301
-
17302
-	ac_cv_c_bigendian=no
17303
-fi
17304
-
17305
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17306
-else
17307
-  echo "$as_me: failed program was:" >&5
17308
-sed 's/^/| /' conftest.$ac_ext >&5
17309
-
17310
-	# It does not; compile a test program.
17311
-if test "$cross_compiling" = yes; then
17312
-  # try to guess the endianness by grepping values into an object file
17313
-  ac_cv_c_bigendian=unknown
17314
-  cat >conftest.$ac_ext <<_ACEOF
17315
-/* confdefs.h.  */
17316
-_ACEOF
17317
-cat confdefs.h >>conftest.$ac_ext
17318
-cat >>conftest.$ac_ext <<_ACEOF
17319
-/* end confdefs.h.  */
17320
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
17321
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
17322
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
17323
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
17324
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
17325
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
17326
-int
17327
-main ()
17328
-{
17329
- _ascii (); _ebcdic ();
17330
-  ;
17331
-  return 0;
17332
-}
17333
-_ACEOF
17334
-rm -f conftest.$ac_objext
17335
-if { (ac_try="$ac_compile"
17336
-case "(($ac_try" in
17337
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17338
-  *) ac_try_echo=$ac_try;;
17339
-esac
17340
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17341
-  (eval "$ac_compile") 2>conftest.er1
17342
-  ac_status=$?
17343
-  grep -v '^ *+' conftest.er1 >conftest.err
17344
-  rm -f conftest.er1
17345
-  cat conftest.err >&5
17346
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
17347
-  (exit $ac_status); } && {
17348
-	 test -z "$ac_c_werror_flag" ||
17349
-	 test ! -s conftest.err
17350
-       } && test -s conftest.$ac_objext; then
17351
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
17352
-  ac_cv_c_bigendian=yes
17353
-fi
17354
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
17355
-  if test "$ac_cv_c_bigendian" = unknown; then
17356
-    ac_cv_c_bigendian=no
17357
-  else
17358
-    # finding both strings is unlikely to happen, but who knows?
17359
-    ac_cv_c_bigendian=unknown
17360
-  fi
17361
-fi
17362
-else
17363
-  echo "$as_me: failed program was:" >&5
17364
-sed 's/^/| /' conftest.$ac_ext >&5
17365
-
17366
-
17367
-fi
17368
-
17369
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17370
-else
17371
-  cat >conftest.$ac_ext <<_ACEOF
17372
-/* confdefs.h.  */
17373
-_ACEOF
17374
-cat confdefs.h >>conftest.$ac_ext
17375
-cat >>conftest.$ac_ext <<_ACEOF
17376
-/* end confdefs.h.  */
17377
-$ac_includes_default
17378
-int
17379
-main ()
17380
-{
17381
-
17382
-  /* Are we little or big endian?  From Harbison&Steele.  */
17383
-  union
17384
-  {
17385
-    long int l;
17386
-    char c[sizeof (long int)];
17387
-  } u;
17388
-  u.l = 1;
17389
-  return u.c[sizeof (long int) - 1] == 1;
17390
-
17391
-  ;
17392
-  return 0;
17393
-}
17394
-_ACEOF
17395
-rm -f conftest$ac_exeext
17396
-if { (ac_try="$ac_link"
17397
-case "(($ac_try" in
17398
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17399
-  *) ac_try_echo=$ac_try;;
17400
-esac
17401
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17402
-  (eval "$ac_link") 2>&5
17403
-  ac_status=$?
17404
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
17405
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
17406
-  { (case "(($ac_try" in
17407
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17408
-  *) ac_try_echo=$ac_try;;
17409
-esac
17410
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17411
-  (eval "$ac_try") 2>&5
17412
-  ac_status=$?
17413
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
17414
-  (exit $ac_status); }; }; then
17415
-  ac_cv_c_bigendian=no
17416
-else
17417
-  echo "$as_me: program exited with status $ac_status" >&5
17418
-echo "$as_me: failed program was:" >&5
17419
-sed 's/^/| /' conftest.$ac_ext >&5
17420
-
17421
-( exit $ac_status )
17422
-ac_cv_c_bigendian=yes
17423
-fi
17424
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
17425
-fi
17426
-
17427
-
17428
-fi
17429
-
17430
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17431
-fi
17432
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
17433
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
17434
-case $ac_cv_c_bigendian in
17435
-  yes)
17436
-
17437
-cat >>confdefs.h <<\_ACEOF
17438
-#define WORDS_BIGENDIAN 1
17439
-_ACEOF
17440
- ;;
17441
-  no)
17442
-     ;;
17443
-  *)
17444
-    { { echo "$as_me:$LINENO: error: unknown endianness
17445
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
17446
-echo "$as_me: error: unknown endianness
17447
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
17448
-   { (exit 1); exit 1; }; } ;;
17449
-esac
17450
-
17451
-if test $ac_cv_c_bigendian = yes; then
17452
-
17453
-cat >>confdefs.h <<\_ACEOF
17454
-#define WORDS_BIGENDIAN 1
17455
-_ACEOF
17456
-
17457
-else
17458
-
17459
-cat >>confdefs.h <<\_ACEOF
17460
-#define WORDS_BIGENDIAN 0
17461
-_ACEOF
17462
-
17463
-fi
17464
-
17465 17040
 { echo "$as_me:$LINENO: checking for structure packing via __attribute__((packed))" >&5
17466 17041
 echo $ECHO_N "checking for structure packing via __attribute__((packed))... $ECHO_C" >&6; }
17467 17042
 if test "${have_attrib_packed+set}" = set; then
... ...
@@ -17842,7 +18247,7 @@ int main(void) {
17842 17842
 		perror("fopen failed");
17843 17843
 		return errno;
17844 17844
 	}
17845
-        exit(0);
17845
+        return EXIT_SUCCESS;
17846 17846
 }
17847 17847
 
17848 17848
 _ACEOF
... ...
@@ -17943,77 +18348,6 @@ fi
17943 17943
 { echo "$as_me:$LINENO: result: $have_signed_rightshift_extended" >&5
17944 17944
 echo "${ECHO_T}$have_signed_rightshift_extended" >&6; };
17945 17945
 
17946
-{ echo "$as_me:$LINENO: checking whether FPU byte ordering is bigendian" >&5
17947
-echo $ECHO_N "checking whether FPU byte ordering is bigendian... $ECHO_C" >&6; }
17948
-if test "${ac_cv_c_fpu_bigendian+set}" = set; then
17949
-  echo $ECHO_N "(cached) $ECHO_C" >&6
17950
-else
17951
-  ac_cv_c_fpu_bigendian=unknown
17952
-cat >conftest.$ac_ext <<_ACEOF
17953
-/* confdefs.h.  */
17954
-_ACEOF
17955
-cat confdefs.h >>conftest.$ac_ext
17956
-cat >>conftest.$ac_ext <<_ACEOF
17957
-/* end confdefs.h.  */
17958
-double d = 3815911171354501045744583353695226502220105394563506259449467213186125718792664588210662403287568710818873279842508553551908601408568128557088985172985437412593385138085986771664896.0;
17959
-_ACEOF
17960
-rm -f conftest.$ac_objext
17961
-if { (ac_try="$ac_compile"
17962
-case "(($ac_try" in
17963
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
17964
-  *) ac_try_echo=$ac_try;;
17965
-esac
17966
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
17967
-  (eval "$ac_compile") 2>conftest.er1
17968
-  ac_status=$?
17969
-  grep -v '^ *+' conftest.er1 >conftest.err
17970
-  rm -f conftest.er1
17971
-  cat conftest.err >&5
17972
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
17973
-  (exit $ac_status); } && {
17974
-	 test -z "$ac_c_werror_flag" ||
17975
-	 test ! -s conftest.err
17976
-       } && test -s conftest.$ac_objext; then
17977
-
17978
-if ${GREP-grep} emmeelle conftest.$ac_objext >/dev/null 2>&1 ; then
17979
-	ac_cv_c_fpu_bigendian=yes
17980
-fi
17981
-if ${GREP-grep} elleemme conftest.$ac_objext >/dev/null 2>&1 ; then
17982
-	ac_cv_c_fpu_bigendian=no
17983
-fi
17984
-
17985
-else
17986
-  echo "$as_me: failed program was:" >&5
17987
-sed 's/^/| /' conftest.$ac_ext >&5
17988
-
17989
-
17990
-fi
17991
-
17992
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
17993
-fi
17994
-{ echo "$as_me:$LINENO: result: $ac_cv_c_fpu_bigendian" >&5
17995
-echo "${ECHO_T}$ac_cv_c_fpu_bigendian" >&6; }
17996
-case $ac_cv_c_fpu_bigendian in
17997
-	yes)
17998
-
17999
-cat >>confdefs.h <<\_ACEOF
18000
-#define FPU_WORDS_BIGENDIAN 1
18001
-_ACEOF
18002
-
18003
-		;;
18004
-	no)
18005
-
18006
-cat >>confdefs.h <<\_ACEOF
18007
-#define FPU_WORDS_BIGENDIAN 0
18008
-_ACEOF
18009
-
18010
-		;;
18011
-	*)
18012
-		{ echo "$as_me:$LINENO: WARNING: Unable to determine FPU endianess, some features may not be available in this build" >&5
18013
-echo "$as_me: WARNING: Unable to determine FPU endianess, some features may not be available in this build" >&2;}
18014
-esac
18015
-
18016
-
18017 17946
 ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile libclamav/lzma/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1"
18018 17947
 
18019 17948
 cat >confcache <<\_ACEOF
... ...
@@ -18126,17 +18460,17 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
18126 18126
 Usually this means the macro was only invoked conditionally." >&2;}
18127 18127
    { (exit 1); exit 1; }; }
18128 18128
 fi
18129
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
18130
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
18129
+if test -z "${VERSIONSCRIPT_TRUE}" && test -z "${VERSIONSCRIPT_FALSE}"; then
18130
+  { { echo "$as_me:$LINENO: error: conditional \"VERSIONSCRIPT\" was never defined.
18131 18131
 Usually this means the macro was only invoked conditionally." >&5
18132
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
18132
+echo "$as_me: error: conditional \"VERSIONSCRIPT\" was never defined.
18133 18133
 Usually this means the macro was only invoked conditionally." >&2;}
18134 18134
    { (exit 1); exit 1; }; }
18135 18135
 fi
18136
-if test -z "${VERSIONSCRIPT_TRUE}" && test -z "${VERSIONSCRIPT_FALSE}"; then
18137
-  { { echo "$as_me:$LINENO: error: conditional \"VERSIONSCRIPT\" was never defined.
18136
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
18137
+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
18138 18138
 Usually this means the macro was only invoked conditionally." >&5
18139
-echo "$as_me: error: conditional \"VERSIONSCRIPT\" was never defined.
18139
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
18140 18140
 Usually this means the macro was only invoked conditionally." >&2;}
18141 18141
    { (exit 1); exit 1; }; }
18142 18142
 fi
... ...
@@ -18814,8 +19148,8 @@ EGREP!$EGREP$ac_delim
18814 18814
 ECHO!$ECHO$ac_delim
18815 18815
 AR!$AR$ac_delim
18816 18816
 RANLIB!$RANLIB$ac_delim
18817
-CPP!$CPP$ac_delim
18818
-LIBTOOL!$LIBTOOL$ac_delim
18817
+DSYMUTIL!$DSYMUTIL$ac_delim
18818
+NMEDIT!$NMEDIT$ac_delim
18819 18819
 _ACEOF
18820 18820
 
18821 18821
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
... ...
@@ -18857,12 +19191,14 @@ _ACEOF
18857 18857
 ac_delim='%!_!# '
18858 18858
 for ac_last_try in false false false false false :; do
18859 18859
   cat >conf$$subs.sed <<_ACEOF
18860
-MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
18861
-MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
18862
-MAINT!$MAINT$ac_delim
18860
+CPP!$CPP$ac_delim
18861
+LIBTOOL!$LIBTOOL$ac_delim
18863 18862
 VERSIONSCRIPTFLAG!$VERSIONSCRIPTFLAG$ac_delim
18864 18863
 VERSIONSCRIPT_TRUE!$VERSIONSCRIPT_TRUE$ac_delim
18865 18864
 VERSIONSCRIPT_FALSE!$VERSIONSCRIPT_FALSE$ac_delim
18865
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
18866
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
18867
+MAINT!$MAINT$ac_delim
18866 18868
 LIBBZ2!$LIBBZ2$ac_delim
18867 18869
 LTLIBBZ2!$LTLIBBZ2$ac_delim
18868 18870
 LIBBZ2_PREFIX!$LIBBZ2_PREFIX$ac_delim
... ...
@@ -18892,7 +19228,7 @@ LIBOBJS!$LIBOBJS$ac_delim
18892 18892
 LTLIBOBJS!$LTLIBOBJS$ac_delim
18893 18893
 _ACEOF
18894 18894
 
18895
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then
18895
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
18896 18896
     break
18897 18897
   elif $ac_last_try; then
18898 18898
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
... ...
@@ -18,7 +18,7 @@ dnl   along with this program; if not, write to the Free Software
18 18
 dnl   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
19 19
 dnl   MA 02110-1301, USA.
20 20
 
21
-AC_PREREQ(2.59)
21
+AC_PREREQ([2.59])
22 22
 dnl For a release change [devel] to the real version [0.xy]
23 23
 dnl also change VERSION below
24 24
 AC_INIT([clamav], [devel], [http://bugs.clamav.net/])
... ...
@@ -37,17 +37,17 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign dist-bzip2 no-define])
37 37
 
38 38
 dnl we told automake to not define these, since we want to include
39 39
 dnl the date in the version
40
-AC_DEFINE(PACKAGE, PACKAGE_NAME, [Name of package])
40
+AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
41 41
 
42 42
 dnl change this on a release
43 43
 VERSION="devel-`date +%Y%m%d`"
44
-AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version number of package])
44
+AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])
45 45
 
46 46
 LC_CURRENT=3
47 47
 LC_REVISION=3
48 48
 LC_AGE=0
49 49
 LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE"
50
-AC_SUBST(LIBCLAMAV_VERSION)
50
+AC_SUBST([LIBCLAMAV_VERSION])
51 51
 
52 52
 AC_PROG_AWK
53 53
 AC_PROG_INSTALL
... ...
@@ -60,13 +60,22 @@ dnl libtool-1.6 should already do it right, but thats not stable yet
60 60
 AC_DEFUN([_LT_AC_TAGCONFIG])
61 61
 AC_PROG_LIBTOOL
62 62
 
63
-AC_DEFINE(SCANBUFF, 131072, [scan buffer size])
64
-AC_DEFINE(FILEBUFF, 8192,   [file i/o buffer size])
63
+AC_DEFINE([SCANBUFF], 131072, [scan buffer size])
64
+AC_DEFINE([FILEBUFF], 8192,   [file i/o buffer size])
65 65
 
66 66
 AC_HEADER_STDC
67 67
 AC_C_RESTRICT
68
+AC_C_CONST
69
+AC_C_INLINE
70
+AC_C_FPU_BIGENDIAN
71
+AC_C_BIGENDIAN
72
+if test $ac_cv_c_bigendian = yes; then
73
+  AC_DEFINE([WORDS_BIGENDIAN],1,endianess)
74
+else
75
+  AC_DEFINE([WORDS_BIGENDIAN],0,endianess)
76
+fi
68 77
 
69
-AC_ARG_ENABLE(gcc-vcheck,
78
+AC_ARG_ENABLE([gcc-vcheck],
70 79
 [  --disable-gcc-vcheck	  do not check for buggy gcc version ],
71 80
 gcc_check=$enableval, gcc_check="yes")
72 81
 
... ...
@@ -102,7 +111,7 @@ AC_TRY_RUN(
102 102
 void exit (int);
103 103
 void abort (void);
104 104
 int a;
105
-int main()
105
+int main(void)
106 106
 {
107 107
   int j;
108 108
   for (j = 0; j < 6; j++)
... ...
@@ -181,7 +190,7 @@ int crashtest()
181 181
 	return 0;
182 182
 }
183 183
 
184
-int main()
184
+int main(void)
185 185
 {
186 186
 	int i;
187 187
 	for(i=0;i<sizeof(values)/sizeof(values[0]);i++) {
... ...
@@ -232,30 +241,77 @@ int main ()
232 232
 ], [AC_MSG_RESULT([ok, bug not present])],
233 233
 [AC_MSG_ERROR([your compiler has gcc PR28045 bug, use a different compiler, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28045])], [AC_MSG_RESULT([cross-compiling, assumed ok])])
234 234
 
235
+dnl Linker feature checks
236
+dnl check for version script support in the linker (GNU ld, or Solaris ld style)
237
+AC_CACHE_CHECK([for ld --version-script], [ac_cv_ld_version_script], [dnl
238
+  cat > conftest.c <<EOF
239
+void cl_symbol1(void) {}
240
+void cli_symbol2(void) {}
241
+EOF
242
+  cat > conftest.map <<EOF
243
+RELEASE
244
+{
245
+	global:
246
+		cl_*;
247
+	local:
248
+		*;
249
+};
250
+PRIVATE
251
+{
252
+	global:
253
+		cli_*;
254
+	local:
255
+		*;
256
+};
257
+EOF
258
+  dnl check for GNU ld style linker version script
259
+  if AC_TRY_COMMAND([${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
260
+				-o conftest.so conftest.c
261
+				-Wl,--version-script,conftest.map
262
+		       1>&AS_MESSAGE_LOG_FD]);
263
+  then
264
+      VERSIONSCRIPTFLAG=--version-script
265
+      ac_cv_ld_version_script=yes
266
+  else
267
+	dnl check for Solaris ld style linker version script
268
+	if AC_TRY_COMMAND([${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
269
+				-o conftest.so conftest.c
270
+				-Wl,-M,conftest.map
271
+			1>&AS_MESSAGE_LOG_FD]);
272
+	then
273
+		VERSIONSCRIPTFLAG=-M
274
+		ac_cv_ld_version_script=yes;
275
+	else
276
+		ac_cv_ld_version_script=no
277
+	fi
278
+  fi
279
+ rm -f conftest*])
280
+AC_SUBST([VERSIONSCRIPTFLAG])
281
+AM_CONDITIONAL([VERSIONSCRIPT], test "x$ac_cv_ld_version_script" = "xyes")
235 282
 
236
-AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h stdbool.h pwd.h grp.h)
237
-AC_CHECK_HEADER(syslog.h,AC_DEFINE(USE_SYSLOG,1,[use syslog]),)
283
+AC_CHECK_HEADERS([stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h limits.h sys/filio.h sys/uio.h termios.h stdbool.h pwd.h grp.h])
284
+AC_CHECK_HEADER([syslog.h],AC_DEFINE([USE_SYSLOG],1,[use syslog]),)
238 285
 
239 286
 AC_TYPE_OFF_T
240
-AC_COMPILE_CHECK_SIZEOF(short)
241
-AC_COMPILE_CHECK_SIZEOF(int)
242
-AC_COMPILE_CHECK_SIZEOF(long)
243
-AC_COMPILE_CHECK_SIZEOF(long long)
287
+AC_COMPILE_CHECK_SIZEOF([short])
288
+AC_COMPILE_CHECK_SIZEOF([int])
289
+AC_COMPILE_CHECK_SIZEOF([long])
290
+AC_COMPILE_CHECK_SIZEOF([long long])
244 291
 
245
-AC_ARG_ENABLE(experimental,
292
+AC_ARG_ENABLE([experimental],
246 293
 [  --enable-experimental	enable experimental code],
247 294
 enable_experimental=$enableval, enable_experimental="no")
248 295
 
249 296
 if test "$enable_experimental" = "yes"; then
250
-  AC_DEFINE(CL_EXPERIMENTAL,1,[enable experimental code])
297
+  AC_DEFINE([CL_EXPERIMENTAL],1,[enable experimental code])
251 298
 fi
252 299
 
253
-AC_CHECK_LIB(socket, bind, [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])
300
+AC_CHECK_LIB([socket], [bind], [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])
254 301
 AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])
255 302
 
256 303
 dnl we need to try to link with iconv, otherwise there could be a 
257 304
 dnl mismatch between a 32-bit and 64-bit lib. Detect this at configure time.
258
-AC_ARG_WITH(iconv, [  --with-iconv supports iconv() (default=auto)],
305
+AC_ARG_WITH([iconv], [  --with-iconv supports iconv() (default=auto)],
259 306
 [
260 307
  case "$withval" in
261 308
 	 yes|no) wiconv="$withval";;
... ...
@@ -263,7 +319,7 @@ AC_ARG_WITH(iconv, [  --with-iconv supports iconv() (default=auto)],
263 263
  esac],
264 264
 [ wiconv=auto ])
265 265
 if test "X$wiconv" != "Xno"; then
266
-	AC_CHECK_LIB(iconv, libiconv_open, LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv")
266
+	AC_CHECK_LIB([iconv], [libiconv_open], LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -liconv")
267 267
 	AC_MSG_CHECKING([for iconv])
268 268
 	save_LIBS="$LIBS"
269 269
 	LIBS="$LIBCLAMAV_LIBS"
... ...
@@ -278,30 +334,30 @@ if test "X$wiconv" != "Xno"; then
278 278
 	iconv_close(iconv_struct);
279 279
 ],[
280 280
    AC_MSG_RESULT(yes)
281
-   AC_DEFINE(HAVE_ICONV, 1, [iconv() available])
281
+   AC_DEFINE([HAVE_ICONV], 1, [iconv() available])
282 282
 ],[
283 283
 	AC_MSG_RESULT(no)
284 284
 ])
285 285
 	LIBS="$save_LIBS"
286 286
 fi
287 287
 
288
-AC_CHECK_FUNCS(poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp)
288
+AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp])
289 289
 AC_FUNC_MMAP
290 290
 AC_FUNC_FSEEKO
291 291
 
292 292
 have_pthreads=no
293
-AC_CHECK_HEADER(pthread.h,[have_pthreads=yes],)
293
+AC_CHECK_HEADER([pthread.h],[have_pthreads=yes],)
294 294
 
295 295
 AM_MAINTAINER_MODE
296 296
 dnl Check for zlib
297
-AC_MSG_CHECKING(for zlib installation)
298
-AC_ARG_WITH(zlib,
297
+AC_MSG_CHECKING([for zlib installation])
298
+AC_ARG_WITH([zlib],
299 299
 [  --with-zlib=DIR	  path to directory containing zlib library (default=
300 300
 			  /usr/local or /usr if not found in /usr/local)],
301 301
 [
302 302
 if test "$withval"; then
303 303
   ZLIB_HOME="$withval"
304
-  AC_MSG_RESULT(using $ZLIB_HOME)
304
+  AC_MSG_RESULT([using $ZLIB_HOME])
305 305
 fi
306 306
 ], [
307 307
 ZLIB_HOME=/usr/local
... ...
@@ -309,63 +365,16 @@ if test ! -f "$ZLIB_HOME/include/zlib.h"
309 309
 then
310 310
   ZLIB_HOME=/usr
311 311
 fi
312
-AC_MSG_RESULT($ZLIB_HOME)
312
+AC_MSG_RESULT([$ZLIB_HOME])
313 313
 ])
314 314
 
315
-dnl check for version script support in the linker (GNU ld, or Solaris ld style)
316
-AC_CACHE_CHECK([for ld --version-script], [ac_cv_ld_version_script], [dnl
317
-  cat > conftest.c <<EOF
318
-void cl_symbol1(void) {}
319
-void cli_symbol2(void) {}
320
-EOF
321
-  cat > conftest.map <<EOF
322
-RELEASE
323
-{
324
-	global:
325
-		cl_*;
326
-	local:
327
-		*;
328
-};
329
-PRIVATE
330
-{
331
-	global:
332
-		cli_*;
333
-	local:
334
-		*;
335
-};
336
-EOF
337
-  dnl check for GNU ld style linker version script
338
-  if AC_TRY_COMMAND([${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
339
-				-o conftest.so conftest.c
340
-				-Wl,--version-script,conftest.map
341
-		       1>&AS_MESSAGE_LOG_FD]);
342
-  then
343
-      VERSIONSCRIPTFLAG=--version-script
344
-      ac_cv_ld_version_script=yes
345
-  else
346
-	dnl check for Solaris ld style linker version script
347
-	if AC_TRY_COMMAND([${CC-cc} $CFLAGS $pic_flag $LDFLAGS -shared
348
-				-o conftest.so conftest.c
349
-				-Wl,-M,conftest.map
350
-			1>&AS_MESSAGE_LOG_FD]);
351
-	then
352
-		VERSIONSCRIPTFLAG=-M
353
-		ac_cv_ld_version_script=yes;
354
-	else
355
-		ac_cv_ld_version_script=no
356
-	fi
357
-  fi
358
- rm -f conftest*])
359
-AC_SUBST(VERSIONSCRIPTFLAG)
360
-AM_CONDITIONAL(VERSIONSCRIPT, test "x$ac_cv_ld_version_script" = "xyes")
361
-
362
-AC_ARG_ENABLE(zlib-vcheck,
315
+AC_ARG_ENABLE([zlib-vcheck],
363 316
 [  --disable-zlib-vcheck	  do not check for buggy zlib version ],
364 317
 zlib_check=$enableval, zlib_check="yes")
365 318
 
366 319
 if test ! -f "$ZLIB_HOME/include/zlib.h"
367 320
 then
368
-    AC_MSG_ERROR(Please install zlib and zlib-devel packages)
321
+    AC_MSG_ERROR([Please install zlib and zlib-devel packages])
369 322
 else
370 323
 
371 324
     vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`
... ...
@@ -387,54 +396,54 @@ else
387 387
 	CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include"
388 388
 	save_LDFLAGS="$LDFLAGS"
389 389
 	LDFLAGS="$LIBS -L$ZLIB_HOME/lib"
390
-	AC_CHECK_LIB(z, inflateEnd, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"; AC_DEFINE(HAVE_ZLIB_H,1,zlib installed)], AC_MSG_ERROR(Please install zlib and zlib-devel packages))
390
+	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -L$ZLIB_HOME/lib -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
391 391
 	LDFLAGS="$save_LDFLAGS"
392 392
     else
393
-	AC_CHECK_LIB(z, inflateEnd, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"; AC_DEFINE(HAVE_ZLIB_H,1,zlib installed)], AC_MSG_ERROR(Please install zlib and zlib-devel packages))
393
+	AC_CHECK_LIB([z], [inflateEnd], [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"; AC_DEFINE([HAVE_ZLIB_H],1,zlib installed)], AC_MSG_ERROR([Please install zlib and zlib-devel packages]))
394 394
     fi
395 395
 fi
396 396
 
397
-AC_ARG_ENABLE(bzip2,
397
+AC_ARG_ENABLE([bzip2],
398 398
 [  --disable-bzip2	  disable bzip2 support],
399 399
 want_bzip2=$enableval, want_bzip2="yes")
400 400
 
401 401
 if test "$want_bzip2" = "yes"
402 402
 then
403
-    AC_LIB_LINKFLAGS(bz2)
404
-    AC_CHECK_LIB(bz2, bzReadOpen,
405
-		 [AC_DEFINE(NOBZ2PREFIX,1,bzip funtions do not have bz2 prefix)],,
403
+    AC_LIB_LINKFLAGS([bz2])
404
+    AC_CHECK_LIB([bz2], [bzReadOpen],
405
+		 [AC_DEFINE([NOBZ2PREFIX],1,[bzip funtions do not have bz2 prefix])],,
406 406
 		 [-L$LIBBZ2_PREFIX/lib])
407 407
     if test "$HAVE_LIBBZ2" = "yes"; then
408
-	AC_CHECK_HEADER(bzlib.h,
408
+	AC_CHECK_HEADER([bzlib.h],
409 409
 			[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2";
410
-			 AC_DEFINE(HAVE_BZLIB_H,1,have bzip2)],
410
+			 AC_DEFINE([HAVE_BZLIB_H],1,[have bzip2])],
411 411
 			[AC_MSG_WARN([****** bzip2 support disabled])])
412 412
     else
413 413
 	AC_MSG_WARN([****** bzip2 support disabled])
414 414
     fi
415 415
 fi
416 416
 
417
-AC_ARG_ENABLE(unrar,
417
+AC_ARG_ENABLE([unrar],
418 418
 [  --disable-unrar	  don't build libclamunrar and libclamunrar_iface ],
419 419
 want_unrar=$enableval, want_unrar="yes")
420 420
 
421
-AC_ARG_ENABLE(dns,
421
+AC_ARG_ENABLE([dns],
422 422
     AC_HELP_STRING([--disable-dns], [disable support for database verification through DNS]),
423 423
     [want_dns=$enableval], [want_dns=yes]
424 424
 )
425 425
 if test $want_dns = yes; then
426
-    AC_CHECK_LIB(resolv, __dn_expand, resolv_lib="-lresolv",)
426
+    AC_CHECK_LIB([resolv], [__dn_expand], [resolv_lib="-lresolv"],)
427 427
     if test -z "$resolv_lib"; then
428
-	AC_CHECK_LIB(resolv, dn_expand, resolv_lib="-lresolv",)
428
+	AC_CHECK_LIB([resolv], [dn_expand], [resolv_lib="-lresolv"],)
429 429
     fi
430
-    AC_CHECK_HEADER(resolv.h,[FRESHCLAM_LIBS="$FRESHCLAM_LIBS $resolv_lib"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $resolv_lib"; AC_DEFINE(HAVE_RESOLV_H,1,have resolv.h)], AC_MSG_WARN([****** DNS support disabled]), [
430
+    AC_CHECK_HEADER([resolv.h],[FRESHCLAM_LIBS="$FRESHCLAM_LIBS $resolv_lib"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS $resolv_lib"; AC_DEFINE([HAVE_RESOLV_H],1,[have resolv.h])], AC_MSG_WARN([****** DNS support disabled]), [
431 431
 #include <sys/types.h>
432 432
 #include <netinet/in.h>
433 433
 #include <arpa/nameser.h>
434 434
 ])
435 435
 fi
436 436
 
437
-AC_ARG_ENABLE(clamuko,
437
+AC_ARG_ENABLE([clamuko],
438 438
 [  --disable-clamuko	  disable clamuko support (Linux, DragonFly and FreeBSD only)],
439 439
 want_clamuko=$enableval, want_clamuko="yes")
440 440
 
... ...
@@ -444,7 +453,7 @@ dnl testcase from gdb/configure.ac
444 444
 if test "$cross_compiling" = no; then
445 445
  AC_FUNC_SETPGRP
446 446
 else
447
- AC_CACHE_CHECK([whether setpgrp takes no argument], ac_cv_func_setpgrp_void,
447
+ AC_CACHE_CHECK([whether setpgrp takes no argument], [ac_cv_func_setpgrp_void],
448 448
    [AC_TRY_COMPILE([
449 449
 #include <unistd.h>
450 450
 ], [
... ...
@@ -454,25 +463,25 @@ else
454 454
    exit (1);
455 455
 ], ac_cv_func_setpgrp_void=no, ac_cv_func_setpgrp_void=yes)])
456 456
 if test $ac_cv_func_setpgrp_void = yes; then
457
- AC_DEFINE(SETPGRP_VOID, 1)
457
+ AC_DEFINE([SETPGRP_VOID], 1)
458 458
 fi
459 459
 fi
460 460
 
461
-AC_ARG_ENABLE(milter,
461
+AC_ARG_ENABLE([milter],
462 462
 [  --enable-milter	  build clamav-milter],
463 463
 have_milter=$enableval, have_milter="no")
464 464
 
465 465
 if test "$have_milter" = "yes"; then
466 466
   sendmailprog=no
467
-  AC_ARG_WITH(sendmail,
467
+  AC_ARG_WITH([sendmail],
468 468
   [  --with-sendmail=PATH    specify location of Sendmail binary (default=auto find)],
469 469
   sendmailprog=$with_sendmail, sendmailprog=no)
470 470
 
471 471
   if test "$sendmailprog" = "no" ; then
472
-    AC_PATH_PROG(sendmailprog, sendmail, no, $PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec)
472
+    AC_PATH_PROG([sendmailprog], sendmail, no, $PATH:/sbin:/usr/sbin:/usr/lib:/usr/libexec)
473 473
   fi
474 474
 
475
-  AC_DEFINE_UNQUOTED(SENDMAIL_BIN, "$sendmailprog", [location of Sendmail binary])
475
+  AC_DEFINE_UNQUOTED([SENDMAIL_BIN], "$sendmailprog", [location of Sendmail binary])
476 476
 
477 477
   sendmailver=`$sendmailprog -d0 < /dev/null | head -1 | awk '{print $2}'`
478 478
 
... ...
@@ -481,13 +490,13 @@ if test "$have_milter" = "yes"; then
481 481
     sendmailver_b=`echo $sendmailver | awk -F. '{printf $2}'`
482 482
     sendmailver_c=`echo $sendmailver | awk -F. '{printf $3}'`
483 483
 
484
-    AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_A, $sendmailver_a, [major version of Sendmail])
485
-    AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_B, $sendmailver_b, [minor version of Sendmail])
486
-    AC_DEFINE_UNQUOTED(SENDMAIL_VERSION_C, $sendmailver_c, [subversion of Sendmail])
484
+    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_A], $sendmailver_a, [major version of Sendmail])
485
+    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_B], $sendmailver_b, [minor version of Sendmail])
486
+    AC_DEFINE_UNQUOTED([SENDMAIL_VERSION_C], $sendmailver_c, [subversion of Sendmail])
487 487
   fi
488 488
 fi
489 489
 
490
-AC_ARG_ENABLE(dsig,
490
+AC_ARG_ENABLE([dsig],
491 491
 [  --disable-dsig	  disable support for digital signatures],
492 492
 want_dsig=$enableval, want_dsig="yes")
493 493
 
... ...
@@ -495,7 +504,7 @@ if test "$want_dsig" = "yes"
495 495
 then
496 496
     dnl defines HAVE_LIBGMP, LIBGMP, and LTLIBGMP
497 497
     dnl also adds option --with-libgmp-prefix to configure
498
-    AC_LIB_HAVE_LINKFLAGS(gmp,,
498
+    AC_LIB_HAVE_LINKFLAGS([gmp],,
499 499
 	[#include <gmp.h>
500 500
 	],
501 501
 	[mpz_init(0);])
... ...
@@ -509,70 +518,70 @@ then
509 509
     fi
510 510
 fi
511 511
 
512
-AC_ARG_ENABLE(pthreads,
512
+AC_ARG_ENABLE([pthreads],
513 513
 [  --disable-pthreads      disable POSIX threads support],
514 514
 have_pthreads=$enableval,)
515 515
 
516
-AC_ARG_ENABLE(cr,
516
+AC_ARG_ENABLE([cr],
517 517
 [  --disable-cr		  don't link with C reentrant library (BSD) ],
518 518
 use_cr=$enableval,)
519 519
 
520
-AC_ARG_ENABLE(id-check,
520
+AC_ARG_ENABLE([id-check],
521 521
 [  --enable-id-check	  use id utility instead of /etc/passwd parsing],
522 522
 use_id=$enableval, use_id="no")
523 523
 
524
-AC_ARG_ENABLE(yp-check,
524
+AC_ARG_ENABLE([yp-check],
525 525
 [  --enable-yp-check	  use ypmatch utility instead of /etc/passwd parsing],
526 526
 use_yp=$enableval, use_yp="no")
527 527
 
528
-AC_ARG_WITH(user, 
528
+AC_ARG_WITH([user], 
529 529
 [  --with-user=uid	  name of the clamav user (default=clamav)],
530 530
 clamav_user="$withval", clamav_user="clamav")
531 531
 
532
-AC_ARG_WITH(group, 
532
+AC_ARG_WITH([group], 
533 533
 [  --with-group=gid	  name of the clamav group (default=clamav)],
534 534
 clamav_group="$withval", clamav_group="clamav")
535 535
 
536
-AC_DEFINE_UNQUOTED(CLAMAVUSER,"$clamav_user",[name of the clamav user])
537
-AC_DEFINE_UNQUOTED(CLAMAVGROUP,"$clamav_group",[name of the clamav group])
536
+AC_DEFINE_UNQUOTED([CLAMAVUSER],"$clamav_user",[name of the clamav user])
537
+AC_DEFINE_UNQUOTED([CLAMAVGROUP],"$clamav_group",[name of the clamav group])
538 538
 
539
-AC_ARG_ENABLE(clamav,
539
+AC_ARG_ENABLE([clamav],
540 540
 [  --disable-clamav	  disable test for clamav user/group],
541 541
 test_clamav=$enableval, test_clamav=yes)
542 542
 
543
-AC_ARG_ENABLE(debug,
543
+AC_ARG_ENABLE([debug],
544 544
 [  --enable-debug	  enable debug code],
545 545
 enable_debug=$enableval, enable_debug="no")
546 546
 
547 547
 if test "$enable_debug" = "yes"; then
548
-  AC_DEFINE(CL_DEBUG,1,[enable debugging])
548
+  AC_DEFINE([CL_DEBUG],1,[enable debugging])
549 549
 fi
550 550
 
551
-AC_ARG_ENABLE(no-cache,
551
+AC_ARG_ENABLE([no-cache],
552 552
 [  --enable-no-cache	  use "Cache-Control: no-cache" in freshclam],
553 553
 enable_nocache=$enableval, enable_nocache="no")
554 554
 
555 555
 if test "$enable_nocache" = "yes"; then
556
-  AC_DEFINE(FRESHCLAM_NO_CACHE,1,[use "Cache-Control: no-cache" in freshclam])
556
+  AC_DEFINE([FRESHCLAM_NO_CACHE],1,[use "Cache-Control: no-cache" in freshclam])
557 557
 fi
558 558
 
559
-AC_ARG_ENABLE(dns-fix,
559
+AC_ARG_ENABLE([dns-fix],
560 560
 [  --enable-dns-fix	  enable workaround for broken DNS servers (as in SpeedTouch 510)],
561 561
 enable_dnsfix=$enableval, enable_dnsfix="no")
562 562
 
563 563
 if test "$enable_dnsfix" = "yes"; then
564
-  AC_DEFINE(FRESHCLAM_DNS_FIX,1,[enable workaround for broken DNS servers])
564
+  AC_DEFINE([FRESHCLAM_DNS_FIX],1,[enable workaround for broken DNS servers])
565 565
 fi
566 566
 
567
-AC_ARG_ENABLE(bigstack,
567
+AC_ARG_ENABLE([bigstack],
568 568
 [  --enable-bigstack	  increase thread stack size],
569 569
 enable_bigstack=$enableval, enable_bigstack="no")
570 570
 
571 571
 if test "$enable_bigstack" = "yes"; then
572
-  AC_DEFINE(C_BIGSTACK,1,[Increase thread stack size.])
572
+  AC_DEFINE([C_BIGSTACK],1,[Increase thread stack size.])
573 573
 fi
574 574
 
575
-AC_ARG_WITH(dbdir, 
575
+AC_ARG_WITH([dbdir], 
576 576
 [  --with-dbdir=path	  path to virus database directory],
577 577
 db_dir="$withval", db_dir="_default_")
578 578
 
... ...
@@ -587,9 +596,9 @@ then
587 587
     fi
588 588
 fi
589 589
 
590
-AC_DEFINE_UNQUOTED(DATADIR,"$db_dir", [Path to virus database directory.])
590
+AC_DEFINE_UNQUOTED([DATADIR],"$db_dir", [Path to virus database directory.])
591 591
 DBDIR="$db_dir"
592
-AC_SUBST(DBDIR)
592
+AC_SUBST([DBDIR])
593 593
 
594 594
 dnl configure config directory
595 595
 cfg_dir=`echo $sysconfdir | grep prefix`
... ...
@@ -606,8 +615,8 @@ else
606 606
 fi
607 607
 
608 608
 CFGDIR=$cfg_dir
609
-AC_SUBST(CFGDIR)
610
-AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file])
609
+AC_SUBST([CFGDIR])
610
+AC_DEFINE_UNQUOTED([CONFDIR],"$cfg_dir",[where to look for the config file])
611 611
 
612 612
 dnl check for in_port_t definition
613 613
 AC_MSG_CHECKING([whether in_port_t is defined])
... ...
@@ -618,7 +627,7 @@ AC_TRY_COMPILE([
618 618
 [int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; }],
619 619
 [
620 620
     AC_MSG_RESULT(yes)
621
-    AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined])
621
+    AC_DEFINE([HAVE_IN_PORT_T],1,[in_port_t is defined])
622 622
 ],
623 623
 AC_MSG_RESULT(no))
624 624
 
... ...
@@ -631,42 +640,42 @@ AC_TRY_COMPILE([
631 631
 [int main(int argc, char **argv) { in_addr_t pt; pt = 0; return pt; }],
632 632
 [
633 633
     AC_MSG_RESULT(yes)
634
-    AC_DEFINE(HAVE_IN_ADDR_T,1,[in_addr_t is defined])
634
+    AC_DEFINE([HAVE_IN_ADDR_T],1,[in_addr_t is defined])
635 635
 ],
636 636
 AC_MSG_RESULT(no))
637 637
 
638 638
 case "$target_os" in
639 639
 linux*)
640
-    AC_DEFINE(C_LINUX,1,[target is linux])
640
+    AC_DEFINE([C_LINUX],1,[target is linux])
641 641
     if test "$have_pthreads" = "yes"; then
642 642
 	THREAD_LIBS="-lpthread"
643 643
 	TH_SAFE="-thread-safe"
644
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
645
-	AC_DEFINE(_REENTRANT,1,[thread safe])
644
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
645
+	AC_DEFINE([_REENTRANT],1,[thread safe])
646 646
 	if test "$want_clamuko" = "yes"; then
647
-	    AC_DEFINE(CLAMUKO,1,[enable clamuko])
647
+	    AC_DEFINE([CLAMUKO],1,[enable clamuko])
648 648
 	fi
649 649
     fi
650 650
     case `uname -r` in
651 651
     1.*|2.0.*)
652
-       AC_DEFINE(INCOMPLETE_CMSG,1,[Early Linux doesn't set cmsg fields])
652
+       AC_DEFINE([INCOMPLETE_CMSG],1,[Early Linux doesn't set cmsg fields])
653 653
        ;;
654 654
     esac
655 655
     ;;
656 656
 kfreebsd*-gnu)
657
-    AC_DEFINE(C_KFREEBSD_GNU,1,[target is kfreebsd-gnu])
657
+    AC_DEFINE([C_KFREEBSD_GNU],1,[target is kfreebsd-gnu])
658 658
     if test "$have_pthreads" = "yes"; then
659 659
        THREAD_LIBS="-lpthread"
660 660
        TH_SAFE="-thread-safe"
661
-       AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
662
-       AC_DEFINE(_REENTRANT,1,[thread safe])
661
+       AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
662
+       AC_DEFINE([_REENTRANT],1,[thread safe])
663 663
        if test "$want_clamuko" = "yes"; then
664
-           AC_DEFINE(CLAMUKO,1,[enable clamuko])
664
+           AC_DEFINE([CLAMUKO],1,[enable clamuko])
665 665
        fi
666 666
     fi
667 667
     ;;
668 668
 cygwin*)
669
-    AC_DEFINE(C_CYGWIN,1,[os is cygwin])
669
+    AC_DEFINE([C_CYGWIN],1,[os is cygwin])
670 670
     if test "$test_clamav" = "yes"; then
671 671
 	if test ! -r /etc/passwd; then
672 672
 	   test_clamav="no"
... ...
@@ -675,8 +684,8 @@ cygwin*)
675 675
     if test "$have_pthreads" = "yes"; then
676 676
 	THREAD_LIBS="-lpthread"
677 677
 	TH_SAFE="-thread-safe"
678
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
679
-	AC_DEFINE(_REENTRANT,1,[thread safe])
678
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
679
+	AC_DEFINE([_REENTRANT],1,[thread safe])
680 680
     fi
681 681
     use_gethostbyname_r="no"
682 682
     ;;
... ...
@@ -687,48 +696,48 @@ solaris*)
687 687
 	CLAMD_LIBS="$CLAMD_LIBS -lresolv"
688 688
 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv"
689 689
 	TH_SAFE="-thread-safe"
690
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
691
-	AC_DEFINE(_REENTRANT,1,[thread safe])
690
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
691
+	AC_DEFINE([_REENTRANT],1,[thread safe])
692 692
     fi
693
-    AC_DEFINE(C_SOLARIS,1,[os is solaris])
693
+    AC_DEFINE([C_SOLARIS],1,[os is solaris])
694 694
     ;;
695 695
 freebsd[[45]]*)
696 696
     if test "$have_pthreads" = "yes"; then
697 697
 	THREAD_LIBS="-pthread -lc_r"
698 698
 	TH_SAFE="-thread-safe"
699
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
700
-	AC_DEFINE(_REENTRANT,1,[thread safe])
699
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
700
+	AC_DEFINE([_REENTRANT],1,[thread safe])
701 701
 	if test "$want_clamuko" = "yes"; then
702
-	    AC_DEFINE(CLAMUKO,1,[enable clamuko])
702
+	    AC_DEFINE([CLAMUKO],1,[enable clamuko])
703 703
 	fi
704 704
     fi
705
-    AC_DEFINE(C_BSD,1,[os is freebsd 4 or 5])
705
+    AC_DEFINE([C_BSD],1,[os is freebsd 4 or 5])
706 706
     use_gethostbyname_r="no"
707 707
     ;;
708 708
 freebsd*)
709 709
     if test "$have_pthreads" = "yes"; then
710 710
 	THREAD_LIBS="-lthr"
711 711
 	TH_SAFE="-thread-safe"
712
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
713
-	AC_DEFINE(_REENTRANT,1,[thread safe])
712
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
713
+	AC_DEFINE([_REENTRANT],1,[thread safe])
714 714
 	if test "$want_clamuko" = "yes"; then
715
-	    AC_DEFINE(CLAMUKO,1,[enable clamuko])
715
+	    AC_DEFINE([CLAMUKO],1,[enable clamuko])
716 716
 	fi
717 717
     fi
718
-    AC_DEFINE(C_BSD,1,[os is freebsd 6])
718
+    AC_DEFINE([C_BSD],1,[os is freebsd 6])
719 719
     use_gethostbyname_r="no"
720 720
     ;;
721 721
 dragonfly*)
722 722
     if test "$have_pthreads" = "yes"; then
723 723
 	THREAD_LIBS="-pthread"
724 724
 	TH_SAFE="-thread-safe"
725
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
726
-	AC_DEFINE(_REENTRANT,1,[thread safe])
725
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
726
+	AC_DEFINE([_REENTRANT],1,[thread safe])
727 727
 	if test "$want_clamuko" = "yes"; then
728
-	    AC_DEFINE(CLAMUKO,1,[enable clamuko])
728
+	    AC_DEFINE([CLAMUKO],1,[enable clamuko])
729 729
 	fi
730 730
     fi
731
-    AC_DEFINE(C_BSD,1,[os is dragonfly])
731
+    AC_DEFINE([C_BSD],1,[os is dragonfly])
732 732
     use_gethostbyname_r="no"
733 733
     ;;
734 734
 openbsd*)
... ...
@@ -739,46 +748,46 @@ openbsd*)
739 739
 	    THREAD_LIBS="-pthread -lc_r"
740 740
 	fi
741 741
 	TH_SAFE="-thread-safe"
742
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
743
-	AC_DEFINE(_REENTRANT,1,[thread safe])
742
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
743
+	AC_DEFINE([_REENTRANT],1,[thread safe])
744 744
     fi
745
-    AC_DEFINE(C_BSD,1,[os is OpenBSD])
745
+    AC_DEFINE([C_BSD],1,[os is OpenBSD])
746 746
     use_gethostbyname_r="no"
747 747
     ;;
748 748
 bsdi*)
749 749
     if test "$have_pthreads" = "yes"; then
750 750
 	THREAD_LIBS="-pthread"
751 751
 	TH_SAFE="-thread-safe"
752
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
753
-	AC_DEFINE(_REENTRANT,1,[thread safe])
752
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
753
+	AC_DEFINE([_REENTRANT],1,[thread safe])
754 754
     fi
755
-    AC_DEFINE(C_BSD,1,[os is BSDI BSD/OS])
755
+    AC_DEFINE([C_BSD],1,[os is BSDI BSD/OS])
756 756
     use_gethostbyname_r="no"
757 757
     ;;
758 758
 netbsd*)
759 759
      if test "$have_pthreads" = "yes"; then
760 760
 	THREAD_LIBS="-lpthread"
761
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
762
-	AC_DEFINE(_REENTRANT,1,[thread safe])
761
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
762
+	AC_DEFINE([_REENTRANT],1,[thread safe])
763 763
      fi
764
-    AC_DEFINE(C_BSD,1,[os is NetBSD])
764
+    AC_DEFINE([C_BSD],1,[os is NetBSD])
765 765
     use_gethostbyname_r="no"
766 766
     ;;
767 767
 bsd*)
768
-    AC_MSG_RESULT(Unknown BSD detected. Disabling thread support.)
768
+    AC_MSG_RESULT([Unknown BSD detected. Disabling thread support.])
769 769
     have_pthreads="no"
770
-    AC_DEFINE(C_BSD,1,[os is bsd flavor])
770
+    AC_DEFINE([C_BSD],1,[os is bsd flavor])
771 771
     use_gethostbyname_r="no"
772 772
     ;;
773 773
 beos*)
774
-    AC_MSG_RESULT(BeOS detected. Disabling thread support.)
774
+    AC_MSG_RESULT([BeOS detected. Disabling thread support.])
775 775
     have_pthreads="no"
776
-    AC_DEFINE(C_BEOS,1,[os is beos])
776
+    AC_DEFINE([C_BEOS],1,[os is beos])
777 777
     ;;
778 778
 darwin*)
779
-    AC_DEFINE(C_BSD,1,[os is bsd flavor])
780
-    AC_DEFINE(C_DARWIN,1,[os is darwin])
781
-    AC_DEFINE(BIND_8_COMPAT,1,[enable bind8 compatibility])
779
+    AC_DEFINE([C_BSD],1,[os is bsd flavor])
780
+    AC_DEFINE([C_DARWIN],1,[os is darwin])
781
+    AC_DEFINE([BIND_8_COMPAT],1,[enable bind8 compatibility])
782 782
     use_netinfo="yes"
783 783
     use_gethostbyname_r="no"
784 784
     ;;
... ...
@@ -789,10 +798,10 @@ os2*)
789 789
     if test "$have_pthreads" = "yes"; then
790 790
 	THREAD_LIBS="-lpthread"
791 791
 	TH_SAFE="-thread-safe"
792
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
793
-	AC_DEFINE(_REENTRANT,1,[thread safe])
792
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
793
+	AC_DEFINE([_REENTRANT],1,[thread safe])
794 794
     fi
795
-    AC_DEFINE(C_OS2,1,[os is OS/2])
795
+    AC_DEFINE([C_OS2],1,[os is OS/2])
796 796
     ;;
797 797
 sco*)
798 798
     dnl njh@bandsman.sco.uk: SCO Unix port
... ...
@@ -804,49 +813,49 @@ hpux*)
804 804
     if test "$have_pthreads" = "yes"; then
805 805
 	THREAD_LIBS="-lpthread"
806 806
 	TH_SAFE="-thread-safe"
807
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
808
-	AC_DEFINE(_REENTRANT,1,[thread safe])
807
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
808
+	AC_DEFINE([_REENTRANT],1,[thread safe])
809 809
     fi
810
-    AC_DEFINE(C_HPUX,1,[os is hpux])
810
+    AC_DEFINE([C_HPUX],1,[os is hpux])
811 811
     use_gethostbyname_r="no"
812 812
     ;;
813 813
 aix*)
814 814
     if test "$have_pthreads" = "yes"; then
815 815
 	THREAD_LIBS="-lpthread"
816 816
 	TH_SAFE="-thread-safe"
817
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
818
-	AC_DEFINE(_REENTRANT,1,[thread safe])
817
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
818
+	AC_DEFINE([_REENTRANT],1,[thread safe])
819 819
     fi
820
-    AC_DEFINE(C_AIX,1,[os is aix])
820
+    AC_DEFINE([C_AIX],1,[os is aix])
821 821
     ;;
822 822
 *-*-osf*)
823 823
     if test "$have_pthreads" = "yes"; then
824 824
 	THREAD_LIBS="-pthread"
825 825
 	TH_SAFE="-thread-safe"
826
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
827
-	AC_DEFINE(_REENTRANT,1,[thread safe])
828
-	AC_DEFINE(_POSIX_PII_SOCKET,1,[POSIX compatibility])
826
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
827
+	AC_DEFINE([_REENTRANT],1,[thread safe])
828
+	AC_DEFINE([_POSIX_PII_SOCKET],1,[POSIX compatibility])
829 829
     fi
830
-    AC_DEFINE(C_OSF,1,[os is osf/tru64])
830
+    AC_DEFINE([C_OSF],1,[os is osf/tru64])
831 831
     ;;
832 832
 nto-qnx*)
833 833
      if test "$have_pthreads" = "yes"; then
834
-       AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
835
-       AC_DEFINE(_REENTRANT,1,[thread safe])
834
+       AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
835
+       AC_DEFINE([_REENTRANT],1,[thread safe])
836 836
      fi
837
-    AC_DEFINE(C_QNX6,1,[os is QNX 6.x.x])
837
+    AC_DEFINE([C_QNX6],1,[os is QNX 6.x.x])
838 838
     ;;
839 839
 irix*)
840 840
     if test "$have_pthreads" = "yes"; then
841 841
 	THREAD_LIBS="-lpthread"
842 842
 	TH_SAFE="-thread-safe"
843
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
844
-	AC_DEFINE(_REENTRANT,1,[thread safe])
843
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
844
+	AC_DEFINE([_REENTRANT],1,[thread safe])
845 845
     fi
846
-    AC_DEFINE(C_IRIX,1,[os is irix])
846
+    AC_DEFINE([C_IRIX],1,[os is irix])
847 847
     ;;
848 848
 interix*)
849
-    AC_DEFINE(C_INTERIX,1,[os is interix])
849
+    AC_DEFINE([C_INTERIX],1,[os is interix])
850 850
     if test "$test_clamav" = "yes"; then
851 851
 	if test ! -r /etc/passwd; then
852 852
 	   test_clamav="no"
... ...
@@ -855,29 +864,29 @@ interix*)
855 855
     if test "$have_pthreads" = "yes"; then
856 856
 	THREAD_LIBS="-lpthread"
857 857
 	TH_SAFE="-thread-safe"
858
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
859
-	AC_DEFINE(_REENTRANT,1,[thread safe])
858
+	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
859
+	AC_DEFINE([_REENTRANT],1,[thread safe])
860 860
     fi
861 861
     ;;
862 862
 gnu*)
863
-    AC_DEFINE(C_GNU_HURD,1,[target is gnu-hurd])
863
+    AC_DEFINE([C_GNU_HURD],1,[target is gnu-hurd])
864 864
     if test "$have_pthreads" = "yes"; then
865 865
        THREAD_LIBS="-lpthread"
866 866
        TH_SAFE="-thread-safe"
867
-       AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
868
-       AC_DEFINE(_REENTRANT,1,[thread safe])
867
+       AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
868
+       AC_DEFINE([_REENTRANT],1,[thread safe])
869 869
     fi
870 870
     ;;
871 871
 *)
872 872
     ;;
873 873
 esac
874 874
 
875
-AC_SUBST(LIBCLAMAV_LIBS)
876
-AC_SUBST(CLAMD_LIBS)
877
-AC_SUBST(CLAMAV_MILTER_LIBS)
878
-AC_SUBST(FRESHCLAM_LIBS)
879
-AC_SUBST(TH_SAFE)
880
-AC_SUBST(THREAD_LIBS)
875
+AC_SUBST([LIBCLAMAV_LIBS])
876
+AC_SUBST([CLAMD_LIBS])
877
+AC_SUBST([CLAMAV_MILTER_LIBS])
878
+AC_SUBST([FRESHCLAM_LIBS])
879
+AC_SUBST([TH_SAFE])
880
+AC_SUBST([THREAD_LIBS])
881 881
 
882 882
 dnl --enable-milter
883 883
 if test "$have_milter" = "yes"; then
... ...
@@ -891,40 +900,40 @@ if test "$have_milter" = "yes"; then
891 891
 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
892 892
     fi
893 893
     LDFLAGS="$LDFLAGS -lmilter $CLAMAV_MILTER_LIBS"
894
-    AC_CHECK_LIB(milter, mi_stop,[CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_LIBS"],[
894
+    AC_CHECK_LIB([milter],[mi_stop],[CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_LIBS"],[
895 895
 	dnl Older sendmails require libsm or libsmutil for support functions
896
-	AC_SEARCH_LIBS(strlcpy, [sm smutil], [test "$ac_cv_search_strlcpy" = "none required" || CLAMAV_MILTER_XLIB="$ac_cv_search_strlcpy"])
896
+	AC_SEARCH_LIBS([strlcpy], [sm smutil], [test "$ac_cv_search_strlcpy" = "none required" || CLAMAV_MILTER_XLIB="$ac_cv_search_strlcpy"])
897 897
 	LDFLAGS="$save_LDFLAGS $CLAMAV_MILTER_LIBS $CLAMAV_MILTER_XLIB"
898 898
 	$as_unset ac_cv_lib_milter_mi_stop
899
-	AC_CHECK_LIB(milter, mi_stop,[CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS"],[
899
+	AC_CHECK_LIB([milter],[mi_stop],[CLAMAV_MILTER_LIBS="-lmilter $CLAMAV_MILTER_XLIB $CLAMAV_MILTER_LIBS"],[
900 900
 	    AC_MSG_ERROR([Cannot find libmilter])
901 901
 	])
902 902
     ])
903 903
     LDFLAGS="$save_LDFLAGS"
904
-    AC_CHECK_HEADERS(libmilter/mfapi.h,have_milter="yes",[
904
+    AC_CHECK_HEADERS([libmilter/mfapi.h],[have_milter="yes"],[
905 905
 	AC_MSG_ERROR([Please install mfapi.h from the sendmail distribution])
906 906
     ])
907 907
 fi
908 908
 
909
-AM_CONDITIONAL(BUILD_CLAMD, test "$have_pthreads" = "yes")
910
-AM_CONDITIONAL(HAVE_MILTER, test "$have_milter" = "yes")
911
-AM_CONDITIONAL(ENABLE_UNRAR, test "$want_unrar" = "yes")
909
+AM_CONDITIONAL([BUILD_CLAMD],[test "$have_pthreads" = "yes"])
910
+AM_CONDITIONAL([HAVE_MILTER],[test "$have_milter" = "yes"])
911
+AM_CONDITIONAL([ENABLE_UNRAR],[test "$want_unrar" = "yes"])
912 912
 
913 913
 if test "$have_pthreads" = "yes"
914 914
 then
915
-    AC_DEFINE(BUILD_CLAMD, 1, "build clamd")
915
+    AC_DEFINE([BUILD_CLAMD], 1, "build clamd")
916 916
 fi
917 917
 
918 918
 if test "$want_unrar" = "yes"
919 919
 then
920
-    AC_DEFINE(ENABLE_UNRAR, 1, "build unrar code")
920
+    AC_DEFINE([ENABLE_UNRAR], 1, "build unrar code")
921 921
 fi
922 922
 
923 923
 dnl Check if we can do fd passing
924 924
 dnl Submitted by Richard Lyons <frob-clamav@webcentral.com.au>
925
-AC_CHECK_FUNCS(recvmsg sendmsg)
925
+AC_CHECK_FUNCS([recvmsg sendmsg])
926 926
 AC_CACHE_CHECK([for msg_accrights field in struct msghdr],
927
-	ac_cv_have_accrights_in_msghdr, [
927
+	[ac_cv_have_accrights_in_msghdr], [
928 928
     AC_TRY_COMPILE(
929 929
 [
930 930
 #include <sys/types.h>
... ...
@@ -932,7 +941,7 @@ AC_CACHE_CHECK([for msg_accrights field in struct msghdr],
932 932
 #include <sys/uio.h>
933 933
 ],
934 934
 [
935
-int main() {
935
+int main(void) {
936 936
 #ifdef msg_accrights
937 937
 #error msg_accrights defined
938 938
 #endif
... ...
@@ -944,11 +953,11 @@ return 0;
944 944
 , [ac_cv_have_accrights_in_msghdr="yes"],[ac_cv_have_accrights_in_msghdr="no"])
945 945
 ])
946 946
 if test "x$ac_cv_have_accrights_in_msghdr" = "xyes" ; then
947
-    AC_DEFINE(HAVE_ACCRIGHTS_IN_MSGHDR,1,[access rights in msghdr])
947
+    AC_DEFINE([HAVE_ACCRIGHTS_IN_MSGHDR],1,[access rights in msghdr])
948 948
 fi
949 949
 
950 950
 AC_CACHE_CHECK([for msg_control field in struct msghdr],
951
-	ac_cv_have_control_in_msghdr, [
951
+	[ac_cv_have_control_in_msghdr], [
952 952
     AC_TRY_COMPILE(
953 953
 [
954 954
 #include <sys/types.h>
... ...
@@ -956,7 +965,7 @@ AC_CACHE_CHECK([for msg_control field in struct msghdr],
956 956
 #include <sys/uio.h>
957 957
 ],
958 958
 [
959
-int main() {
959
+int main(void) {
960 960
 #ifdef msg_control
961 961
 #error msg_control defined
962 962
 #endif
... ...
@@ -967,12 +976,12 @@ return 0;
967 967
 ], [ ac_cv_have_control_in_msghdr="yes" ], [ ac_cv_have_control_in_msghdr="no" ])
968 968
 ])
969 969
 if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then
970
-    AC_DEFINE(HAVE_CONTROL_IN_MSGHDR,1,[ancillary data style fd pass])
970
+    AC_DEFINE([HAVE_CONTROL_IN_MSGHDR],1,[ancillary data style fd pass])
971 971
 fi
972 972
 
973 973
 dnl tcpwrappers support
974 974
 dnl rules from http://ma.ph-freiburg.de/tng/tng-technical/2002-01/msg00094.html
975
-AC_ARG_WITH(tcpwrappers,
975
+AC_ARG_WITH([tcpwrappers],
976 976
 [  --with-tcpwrappers      support hosts.allow / hosts.deny (default=auto)],
977 977
 [ case "$withval" in
978 978
   yes|no) tcpw="$withval" ;;
... ...
@@ -981,7 +990,7 @@ AC_ARG_WITH(tcpwrappers,
981 981
 [ tcpw=auto ])
982 982
 
983 983
 if test "$tcpw" != "no" && test "$have_milter" = "yes" ; then
984
-        AC_CHECK_HEADERS(tcpd.h,[
984
+        AC_CHECK_HEADERS([tcpd.h],[
985 985
                 AC_MSG_CHECKING([for TCP wrappers library])
986 986
                 save_LIBS="$LIBS"
987 987
                 LIBS="$LIBS -lwrap $FRESHCLAM_LIBS"
... ...
@@ -1016,7 +1025,7 @@ hosts_access(req)
1016 1016
                 have_wrappers=no])],[have_wrappers=no])
1017 1017
 
1018 1018
         if test $have_wrappers = yes ; then
1019
-                AC_DEFINE(WITH_TCPWRAP,1, [tcpwrappers support])
1019
+                AC_DEFINE([WITH_TCPWRAP],1, [tcpwrappers support])
1020 1020
         elif test $tcpw = yes ; then
1021 1021
                 AC_MSG_ERROR([could not find TCP wrappers])
1022 1022
         else
... ...
@@ -1026,7 +1035,7 @@ fi
1026 1026
 
1027 1027
 dnl Check for gethostbyname_r and number of its arguments
1028 1028
 dnl Code from libwww/configure.in
1029
-AC_MSG_CHECKING(for gethostbyname_r)
1029
+AC_MSG_CHECKING([for gethostbyname_r])
1030 1030
 if test -z "$ac_cv_gethostbyname_args"; then
1031 1031
 AC_TRY_COMPILE(
1032 1032
 [
... ...
@@ -1071,21 +1080,21 @@ rc = gethostbyname_r(name, &h, buf, 10, &hp, &h_errno);
1071 1071
 ], ac_cv_gethostbyname_args=6)
1072 1072
 fi
1073 1073
 
1074
-AC_ARG_ENABLE(gethostbyname_r,
1074
+AC_ARG_ENABLE([gethostbyname_r],
1075 1075
 [  --disable-gethostbyname_r	  disable support for gethostbyname_r],
1076 1076
 use_gethostbyname_r=$enableval,)
1077 1077
 
1078 1078
 if test "$use_gethostbyname_r" = "no"; then
1079
-    AC_MSG_RESULT(support disabled)
1079
+    AC_MSG_RESULT([support disabled])
1080 1080
 elif test -z "$ac_cv_gethostbyname_args"; then
1081 1081
     AC_MSG_RESULT(no)
1082 1082
 else
1083 1083
     if test "$ac_cv_gethostbyname_args" = 3; then
1084
-	AC_DEFINE(HAVE_GETHOSTBYNAME_R_3,1,[gethostbyname_r takes 3 arguments])
1084
+	AC_DEFINE([HAVE_GETHOSTBYNAME_R_3],1,[gethostbyname_r takes 3 arguments])
1085 1085
     elif test "$ac_cv_gethostbyname_args" = 5; then
1086
-	AC_DEFINE(HAVE_GETHOSTBYNAME_R_5,1,[gethostbyname_r takes 5 arguments])
1086
+	AC_DEFINE([HAVE_GETHOSTBYNAME_R_5],1,[gethostbyname_r takes 5 arguments])
1087 1087
     elif test "$ac_cv_gethostbyname_args" = 6; then
1088
-	AC_DEFINE(HAVE_GETHOSTBYNAME_R_6,1,[gethostbyname_r takes 6 arguments])
1088
+	AC_DEFINE([HAVE_GETHOSTBYNAME_R_6],1,[gethostbyname_r takes 6 arguments])
1089 1089
     fi
1090 1090
     AC_MSG_RESULT([yes, and it takes $ac_cv_gethostbyname_args arguments])
1091 1091
 fi
... ...
@@ -1093,7 +1102,7 @@ fi
1093 1093
 dnl Check for readdir_r and number of its arguments
1094 1094
 dnl Code from libwww/configure.in
1095 1095
 
1096
-AC_MSG_CHECKING(for readdir_r)
1096
+AC_MSG_CHECKING([for readdir_r])
1097 1097
 if test -z "$ac_cv_readdir_args"; then
1098 1098
     AC_TRY_COMPILE(
1099 1099
     [
... ...
@@ -1120,7 +1129,7 @@ if test -z "$ac_cv_readdir_args"; then
1120 1120
     ], ac_cv_readdir_args=3)
1121 1121
 fi
1122 1122
 
1123
-AC_ARG_ENABLE(readdir_r,
1123
+AC_ARG_ENABLE([readdir_r],
1124 1124
 [  --enable-readdir_r		    enable support for readdir_r],
1125 1125
 enable_readdir_r=$enableval, enable_readdir_r="no")
1126 1126
 
... ...
@@ -1130,14 +1139,14 @@ elif test -z "$ac_cv_readdir_args"; then
1130 1130
     AC_MSG_RESULT(no)
1131 1131
 else
1132 1132
     if test "$ac_cv_readdir_args" = 2; then
1133
-	AC_DEFINE(HAVE_READDIR_R_2,1,[readdir_r takes 2 arguments])
1133
+	AC_DEFINE([HAVE_READDIR_R_2],1,[readdir_r takes 2 arguments])
1134 1134
     elif test "$ac_cv_readdir_args" = 3; then
1135
-	AC_DEFINE(HAVE_READDIR_R_3,1,[readdir_r takes 3 arguments])
1135
+	AC_DEFINE([HAVE_READDIR_R_3],1,[readdir_r takes 3 arguments])
1136 1136
     fi
1137 1137
     AC_MSG_RESULT([yes, and it takes $ac_cv_readdir_args arguments])
1138 1138
 fi
1139 1139
 
1140
-AC_MSG_CHECKING(for ctime_r)
1140
+AC_MSG_CHECKING([for ctime_r])
1141 1141
 if test "$ac_cv_func_ctime_r" = "yes"; then
1142 1142
     AC_TRY_COMPILE([
1143 1143
 	#include <time.h>
... ...
@@ -1147,18 +1156,18 @@ if test "$ac_cv_func_ctime_r" = "yes"; then
1147 1147
 	ctime_r(&t, buf, 30);
1148 1148
     ],[
1149 1149
 	ac_cv_ctime_args=3
1150
-	AC_DEFINE(HAVE_CTIME_R_3,1,[ctime_r takes 3 arguments])
1150
+	AC_DEFINE([HAVE_CTIME_R_3],1,[ctime_r takes 3 arguments])
1151 1151
     ],[
1152 1152
 	ac_cv_ctime_args=2
1153
-	AC_DEFINE(HAVE_CTIME_R_2,1,[ctime_r takes 2 arguments])
1153
+	AC_DEFINE([HAVE_CTIME_R_2],1,[ctime_r takes 2 arguments])
1154 1154
     ])
1155 1155
 
1156 1156
     AC_MSG_RESULT([yes, and it takes $ac_cv_ctime_args arguments])
1157 1157
 fi
1158 1158
 
1159 1159
 dnl Determine socklen_t type. Code from lftp.
1160
-AC_MSG_CHECKING(for socklen_t)
1161
-AC_CACHE_VAL(ac_cv_socklen_t,
1160
+AC_MSG_CHECKING([for socklen_t])
1161
+AC_CACHE_VAL([ac_cv_socklen_t],
1162 1162
 [
1163 1163
     ac_cv_socklen_t=no
1164 1164
     AC_TRY_COMPILE([
... ...
@@ -1173,10 +1182,10 @@ AC_CACHE_VAL(ac_cv_socklen_t,
1173 1173
 	ac_cv_socklen_t=yes
1174 1174
     ])
1175 1175
 ])
1176
-AC_MSG_RESULT($ac_cv_socklen_t)
1176
+AC_MSG_RESULT([$ac_cv_socklen_t])
1177 1177
     if test $ac_cv_socklen_t = no; then
1178
-    AC_MSG_CHECKING(for socklen_t equivalent)
1179
-    AC_CACHE_VAL(ac_cv_socklen_t_equiv,
1178
+    AC_MSG_CHECKING([for socklen_t equivalent])
1179
+    AC_CACHE_VAL([ac_cv_socklen_t_equiv],
1180 1180
     [
1181 1181
 	ac_cv_socklen_t_equiv=int
1182 1182
         for t in int size_t unsigned long "unsigned long"; do
... ...
@@ -1194,8 +1203,8 @@ AC_MSG_RESULT($ac_cv_socklen_t)
1194 1194
             ])
1195 1195
 	done
1196 1196
     ])
1197
-    AC_MSG_RESULT($ac_cv_socklen_t_equiv)
1198
-    AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_socklen_t_equiv, [Define to "int" if <sys/socket.h> does not define.])
1197
+    AC_MSG_RESULT([$ac_cv_socklen_t_equiv])
1198
+    AC_DEFINE_UNQUOTED([socklen_t], $ac_cv_socklen_t_equiv, [Define to "int" if <sys/socket.h> does not define.])
1199 1199
 fi
1200 1200
 
1201 1201
 dnl Check for clamav in /etc/passwd
... ...
@@ -1204,13 +1213,13 @@ then
1204 1204
     dnl parse /etc/passwd
1205 1205
     if test "$use_id" = "no"
1206 1206
     then
1207
-	AC_MSG_CHECKING(for $clamav_user in /etc/passwd)
1207
+	AC_MSG_CHECKING([for $clamav_user in /etc/passwd])
1208 1208
 	if test -r /etc/passwd; then
1209 1209
 	    clamavuser=`cat /etc/passwd|grep "^$clamav_user:"`
1210 1210
 	    clamavgroup=`cat /etc/group|grep "^$clamav_group:"`
1211 1211
 	fi
1212 1212
     else
1213
-	AC_MSG_CHECKING(for $clamav_user using id)
1213
+	AC_MSG_CHECKING([for $clamav_user using id])
1214 1214
 	id $clamav_user > /dev/null 2>&1
1215 1215
 	if test "$?" = 0 ; then
1216 1216
 	    clamavuser=1
... ...
@@ -1226,11 +1235,11 @@ then
1226 1226
     if test "$use_netinfo" = "yes"
1227 1227
     then
1228 1228
 	if test -x /usr/bin/dscl; then
1229
-	    AC_MSG_CHECKING(for $clamav_user using dscl)
1229
+	    AC_MSG_CHECKING([for $clamav_user using dscl])
1230 1230
 	    clamavuser=`/usr/bin/dscl . -list /Users |grep ${clamav_user}`
1231 1231
 	    clamavgroup=`/usr/bin/dscl . -list /Groups |grep ${clamav_group}`
1232 1232
 	else
1233
-	    AC_MSG_CHECKING(for $clamav_user using netinfo)
1233
+	    AC_MSG_CHECKING([for $clamav_user using netinfo])
1234 1234
 	    clamavuser=`/usr/bin/nidump passwd . |grep ${clamav_user}`
1235 1235
 	    clamavgroup=`/usr/bin/nidump group . |grep ${clamav_group}`
1236 1236
 	fi
... ...
@@ -1238,7 +1247,7 @@ then
1238 1238
 
1239 1239
     if test "$use_yp" = "yes"
1240 1240
     then
1241
-	AC_MSG_CHECKING(for $clamav_user using ypmatch)
1241
+	AC_MSG_CHECKING([for $clamav_user using ypmatch])
1242 1242
         clamavuser=`ypmatch ${clamav_user} passwd`
1243 1243
         clamavgroup=`ypmatch ${clamav_group} group`
1244 1244
     fi
... ...
@@ -1246,38 +1255,29 @@ then
1246 1246
     if test -z "$clamavuser" || test -z "$clamavgroup"
1247 1247
     then
1248 1248
 	AC_MSG_RESULT(no)
1249
-	AC_MSG_ERROR(User $clamav_user (and/or group $clamav_group) doesn't exist. Please read the documentation !)
1249
+	AC_MSG_ERROR([User $clamav_user (and/or group $clamav_group) doesn't exist. Please read the documentation !])
1250 1250
     else
1251 1251
 	AC_MSG_RESULT([yes, user $clamav_user and group $clamav_group])
1252 1252
         CLAMAVUSER="$clamav_user"
1253 1253
         CLAMAVGROUP="$clamav_group"
1254
-        AC_SUBST(CLAMAVUSER)
1255
-        AC_SUBST(CLAMAVGROUP)
1254
+        AC_SUBST([CLAMAVUSER])
1255
+        AC_SUBST([CLAMAVGROUP])
1256 1256
     fi
1257 1257
 fi
1258 1258
 
1259
-AC_C_CONST
1260
-AC_C_INLINE
1261
-AC_C_BIGENDIAN
1262
-if test $ac_cv_c_bigendian = yes; then
1263
-  AC_DEFINE(WORDS_BIGENDIAN,1,endianess)
1264
-else
1265
-  AC_DEFINE(WORDS_BIGENDIAN,0,endianess)
1266
-fi
1267
-
1268 1259
 dnl check for __attribute__((packed))
1269 1260
 AC_MSG_CHECKING([for structure packing via __attribute__((packed))])
1270
-AC_CACHE_VAL(have_attrib_packed,[
1261
+AC_CACHE_VAL([have_attrib_packed],[
1271 1262
 	AC_TRY_COMPILE(,
1272 1263
 		[struct { int i __attribute__((packed)); } s; ],
1273 1264
 		[have_attrib_packed=yes],
1274 1265
 		[have_attrib_packed=no])
1275 1266
 	])
1276
-AC_MSG_RESULT($have_attrib_packed)
1267
+AC_MSG_RESULT([$have_attrib_packed])
1277 1268
 
1278 1269
 if test "$have_attrib_packed" = no; then
1279
-	AC_MSG_CHECKING(for structure packing via pragma)
1280
-	AC_CACHE_VAL(have_pragma_pack,[
1270
+	AC_MSG_CHECKING([for structure packing via pragma])
1271
+	AC_CACHE_VAL([have_pragma_pack],[
1281 1272
 		AC_TRY_RUN([int main(int argc, char **argv) {
1282 1273
 #pragma pack(1)			/* has to be in column 1 ! */
1283 1274
 			struct { char c; long l; } s;
... ...
@@ -1285,12 +1285,12 @@ if test "$have_attrib_packed" = no; then
1285 1285
 			[have_pragma_pack=yes],
1286 1286
 			[have_pragma_pack=no])
1287 1287
 		])
1288
-	AC_MSG_RESULT($have_pragma_pack)
1288
+	AC_MSG_RESULT([$have_pragma_pack])
1289 1289
 	if test "$have_pragma_pack" = yes; then
1290
-		AC_DEFINE(HAVE_PRAGMA_PACK, 1, "pragma pack")
1290
+		AC_DEFINE([HAVE_PRAGMA_PACK], 1, "pragma pack")
1291 1291
 	else
1292
-		AC_MSG_CHECKING(for structure packing via hppa/hp-ux pragma)
1293
-		AC_CACHE_VAL(have_pragma_pack_hpux,[
1292
+		AC_MSG_CHECKING([for structure packing via hppa/hp-ux pragma])
1293
+		AC_CACHE_VAL([have_pragma_pack_hpux],[
1294 1294
 			AC_TRY_RUN([
1295 1295
 			/* hppa/hp-ux wants pragma outside of function */
1296 1296
 #pragma pack 1 /* has to be in column 1 ! */
... ...
@@ -1300,31 +1300,31 @@ if test "$have_attrib_packed" = no; then
1300 1300
 			[have_pragma_pack_hpux=yes],
1301 1301
 			[have_pragma_pack_hpux=no])
1302 1302
 		])
1303
-		AC_MSG_RESULT($have_pragma_pack_hpux)
1304
-		AC_DEFINE(HAVE_PRAGMA_PACK_HPPA, 1, "pragma pack hppa/hp-ux style")
1303
+		AC_MSG_RESULT([$have_pragma_pack_hpux])
1304
+		AC_DEFINE([HAVE_PRAGMA_PACK_HPPA], 1, "pragma pack hppa/hp-ux style")
1305 1305
 	fi
1306 1306
 fi
1307 1307
 
1308 1308
 dnl check for __attribute__((aligned))
1309 1309
 AC_MSG_CHECKING([for type aligning via __attribute__((aligned))])
1310
-AC_CACHE_VAL(have_attrib_aligned,[
1310
+AC_CACHE_VAL([have_attrib_aligned],[
1311 1311
 	AC_TRY_COMPILE(,
1312 1312
 		[typedef int cl_aligned_int __attribute__((aligned));],
1313 1313
 		[have_attrib_aligned=yes],
1314 1314
 		[have_attrib_aligned=no])
1315 1315
 	])
1316
-AC_MSG_RESULT($have_attrib_aligned)
1316
+AC_MSG_RESULT([$have_attrib_aligned])
1317 1317
 
1318 1318
 if test "$have_attrib_packed" = no -a "$have_pragma_pack" = no -a "$have_pragma_pack_hpux" = no; then
1319 1319
 	AC_MSG_ERROR(Need to know how to pack structures with this compiler)
1320 1320
 fi
1321 1321
 
1322 1322
 if test "$have_attrib_packed" = yes; then
1323
-	AC_DEFINE(HAVE_ATTRIB_PACKED, 1, [attrib packed])
1323
+	AC_DEFINE([HAVE_ATTRIB_PACKED], 1, [attrib packed])
1324 1324
 fi
1325 1325
 
1326 1326
 if test "$have_attrib_aligned" = yes; then
1327
-	AC_DEFINE(HAVE_ATTRIB_ALIGNED, 1, [attrib aligned])
1327
+	AC_DEFINE([HAVE_ATTRIB_ALIGNED], 1, [attrib aligned])
1328 1328
 fi
1329 1329
 
1330 1330
 dnl Check if <sys/select.h> needs to be included for fd_set
... ...
@@ -1334,17 +1334,17 @@ AC_TRY_COMPILE([#include <sys/types.h>],
1334 1334
 if test $have_fd_set = yes; then
1335 1335
     AC_MSG_RESULT([yes, found in sys/types.h])
1336 1336
 else
1337
-    AC_HEADER_EGREP(fd_mask, sys/select.h, have_fd_set=yes)
1337
+    AC_HEADER_EGREP([fd_mask], [sys/select.h], [have_fd_set=yes])
1338 1338
     if test $have_fd_set = yes; then
1339
-        AC_DEFINE(HAVE_SYS_SELECT_H, 1, "have <sys/select.h>")
1339
+        AC_DEFINE([HAVE_SYS_SELECT_H], 1, "have <sys/select.h>")
1340 1340
         AC_MSG_RESULT([yes, found in sys/select.h])
1341 1341
     else
1342
-        AC_DEFINE(NO_FD_SET, 1, "no fd_set")
1342
+        AC_DEFINE([NO_FD_SET], 1, "no fd_set")
1343 1343
         AC_MSG_RESULT(no)
1344 1344
     fi
1345 1345
 fi
1346 1346
 
1347
-AC_MSG_CHECKING(default FD_SETSIZE value)
1347
+AC_MSG_CHECKING([default FD_SETSIZE value])
1348 1348
 AC_TRY_RUN([
1349 1349
 #include <stdio.h>
1350 1350
 #include <unistd.h>
... ...
@@ -1363,27 +1363,25 @@ int main(void) {
1363 1363
 		perror("fopen failed");
1364 1364
 		return errno;
1365 1365
 	}
1366
-        exit(0);
1366
+        return EXIT_SUCCESS;
1367 1367
 }
1368 1368
 ],
1369 1369
 DEFAULT_FD_SETSIZE=`cat conftestval`,
1370 1370
 DEFAULT_FD_SETSIZE=256,
1371 1371
 DEFAULT_FD_SETSIZE=256)
1372
-AC_MSG_RESULT($DEFAULT_FD_SETSIZE)
1373
-AC_DEFINE_UNQUOTED(DEFAULT_FD_SETSIZE, $DEFAULT_FD_SETSIZE, "default FD_SETSIZE value")
1372
+AC_MSG_RESULT([$DEFAULT_FD_SETSIZE])
1373
+AC_DEFINE_UNQUOTED([DEFAULT_FD_SETSIZE], $DEFAULT_FD_SETSIZE, "default FD_SETSIZE value")
1374 1374
 
1375 1375
 dnl Check signed right shift implementation
1376
-AC_MSG_CHECKING(whether signed right shift is sign extended)
1376
+AC_MSG_CHECKING([whether signed right shift is sign extended])
1377 1377
 AC_TRY_RUN([int main(void){int a=-1;int b=a>>1;return(a!=b);}],
1378 1378
     [have_signed_rightshift_extended=yes],
1379 1379
     [have_signed_rightshift_extended=no],
1380 1380
     [have_signed_rightshift_extended=no])
1381 1381
 if test $have_signed_rightshift_extended = yes; then
1382
-    AC_DEFINE(HAVE_SAR, 1, Define signed right shift implementation)
1382
+    AC_DEFINE([HAVE_SAR], 1, [Define signed right shift implementation])
1383 1383
 fi
1384
-AC_MSG_RESULT($have_signed_rightshift_extended);
1385
-
1386
-AC_C_FPU_BIGENDIAN
1384
+AC_MSG_RESULT([$have_signed_rightshift_extended]);
1387 1385
 
1388 1386
 AC_OUTPUT([
1389 1387
 libclamunrar/Makefile
... ...
@@ -87,6 +87,7 @@ CYGPATH_W = @CYGPATH_W@
87 87
 DBDIR = @DBDIR@
88 88
 DEFS = @DEFS@
89 89
 DEPDIR = @DEPDIR@
90
+DSYMUTIL = @DSYMUTIL@
90 91
 ECHO = @ECHO@
91 92
 ECHO_C = @ECHO_C@
92 93
 ECHO_N = @ECHO_N@
... ...
@@ -119,6 +120,7 @@ LTLIBOBJS = @LTLIBOBJS@
119 119
 MAINT = @MAINT@
120 120
 MAKEINFO = @MAKEINFO@
121 121
 MKDIR_P = @MKDIR_P@
122
+NMEDIT = @NMEDIT@
122 123
 OBJEXT = @OBJEXT@
123 124
 PACKAGE = @PACKAGE@
124 125
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -92,6 +92,7 @@ CYGPATH_W = @CYGPATH_W@
92 92
 DBDIR = @DBDIR@
93 93
 DEFS = @DEFS@
94 94
 DEPDIR = @DEPDIR@
95
+DSYMUTIL = @DSYMUTIL@
95 96
 ECHO = @ECHO@
96 97
 ECHO_C = @ECHO_C@
97 98
 ECHO_N = @ECHO_N@
... ...
@@ -124,6 +125,7 @@ LTLIBOBJS = @LTLIBOBJS@
124 124
 MAINT = @MAINT@
125 125
 MAKEINFO = @MAKEINFO@
126 126
 MKDIR_P = @MKDIR_P@
127
+NMEDIT = @NMEDIT@
127 128
 OBJEXT = @OBJEXT@
128 129
 PACKAGE = @PACKAGE@
129 130
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -85,6 +85,7 @@ CYGPATH_W = @CYGPATH_W@
85 85
 DBDIR = @DBDIR@
86 86
 DEFS = @DEFS@
87 87
 DEPDIR = @DEPDIR@
88
+DSYMUTIL = @DSYMUTIL@
88 89
 ECHO = @ECHO@
89 90
 ECHO_C = @ECHO_C@
90 91
 ECHO_N = @ECHO_N@
... ...
@@ -117,6 +118,7 @@ LTLIBOBJS = @LTLIBOBJS@
117 117
 MAINT = @MAINT@
118 118
 MAKEINFO = @MAKEINFO@
119 119
 MKDIR_P = @MKDIR_P@
120
+NMEDIT = @NMEDIT@
120 121
 OBJEXT = @OBJEXT@
121 122
 PACKAGE = @PACKAGE@
122 123
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -113,6 +113,7 @@ CYGPATH_W = @CYGPATH_W@
113 113
 DBDIR = @DBDIR@
114 114
 DEFS = @DEFS@ -DCL_NOTHREADS
115 115
 DEPDIR = @DEPDIR@
116
+DSYMUTIL = @DSYMUTIL@
116 117
 ECHO = @ECHO@
117 118
 ECHO_C = @ECHO_C@
118 119
 ECHO_N = @ECHO_N@
... ...
@@ -145,6 +146,7 @@ LTLIBOBJS = @LTLIBOBJS@
145 145
 MAINT = @MAINT@
146 146
 MAKEINFO = @MAKEINFO@
147 147
 MKDIR_P = @MKDIR_P@
148
+NMEDIT = @NMEDIT@
148 149
 OBJEXT = @OBJEXT@
149 150
 PACKAGE = @PACKAGE@
150 151
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -55,7 +55,7 @@ target_triplet = @target@
55 55
 @VERSIONSCRIPT_TRUE@am__append_1 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
56 56
 subdir = libclamav
57 57
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
58
-	$(srcdir)/Makefile.in COPYING
58
+	$(srcdir)/Makefile.in
59 59
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
60 60
 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
61 61
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
... ...
@@ -156,6 +156,7 @@ CYGPATH_W = @CYGPATH_W@
156 156
 DBDIR = @DBDIR@
157 157
 DEFS = @DEFS@
158 158
 DEPDIR = @DEPDIR@
159
+DSYMUTIL = @DSYMUTIL@
159 160
 ECHO = @ECHO@
160 161
 ECHO_C = @ECHO_C@
161 162
 ECHO_N = @ECHO_N@
... ...
@@ -188,6 +189,7 @@ LTLIBOBJS = @LTLIBOBJS@
188 188
 MAINT = @MAINT@
189 189
 MAKEINFO = @MAKEINFO@
190 190
 MKDIR_P = @MKDIR_P@
191
+NMEDIT = @NMEDIT@
191 192
 OBJEXT = @OBJEXT@
192 193
 PACKAGE = @PACKAGE@
193 194
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -105,6 +105,7 @@ CYGPATH_W = @CYGPATH_W@
105 105
 DBDIR = @DBDIR@
106 106
 DEFS = @DEFS@
107 107
 DEPDIR = @DEPDIR@
108
+DSYMUTIL = @DSYMUTIL@
108 109
 ECHO = @ECHO@
109 110
 ECHO_C = @ECHO_C@
110 111
 ECHO_N = @ECHO_N@
... ...
@@ -137,6 +138,7 @@ LTLIBOBJS = @LTLIBOBJS@
137 137
 MAINT = @MAINT@
138 138
 MAKEINFO = @MAKEINFO@
139 139
 MKDIR_P = @MKDIR_P@
140
+NMEDIT = @NMEDIT@
140 141
 OBJEXT = @OBJEXT@
141 142
 PACKAGE = @PACKAGE@
142 143
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -109,6 +109,7 @@ CYGPATH_W = @CYGPATH_W@
109 109
 DBDIR = @DBDIR@
110 110
 DEFS = @DEFS@
111 111
 DEPDIR = @DEPDIR@
112
+DSYMUTIL = @DSYMUTIL@
112 113
 ECHO = @ECHO@
113 114
 ECHO_C = @ECHO_C@
114 115
 ECHO_N = @ECHO_N@
... ...
@@ -141,6 +142,7 @@ LTLIBOBJS = @LTLIBOBJS@
141 141
 MAINT = @MAINT@
142 142
 MAKEINFO = @MAKEINFO@
143 143
 MKDIR_P = @MKDIR_P@
144
+NMEDIT = @NMEDIT@
144 145
 OBJEXT = @OBJEXT@
145 146
 PACKAGE = @PACKAGE@
146 147
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -104,6 +104,7 @@ CYGPATH_W = @CYGPATH_W@
104 104
 DBDIR = @DBDIR@
105 105
 DEFS = @DEFS@
106 106
 DEPDIR = @DEPDIR@
107
+DSYMUTIL = @DSYMUTIL@
107 108
 ECHO = @ECHO@
108 109
 ECHO_C = @ECHO_C@
109 110
 ECHO_N = @ECHO_N@
... ...
@@ -136,6 +137,7 @@ LTLIBOBJS = @LTLIBOBJS@
136 136
 MAINT = @MAINT@
137 137
 MAKEINFO = @MAKEINFO@
138 138
 MKDIR_P = @MKDIR_P@
139
+NMEDIT = @NMEDIT@
139 140
 OBJEXT = @OBJEXT@
140 141
 PACKAGE = @PACKAGE@
141 142
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -112,6 +112,7 @@ DBDIR = @DBDIR@
112 112
 #sigtool_LDADD = $(top_builddir)/clamscan/others.o 
113 113
 DEFS = @DEFS@ -DCL_NOTHREADS
114 114
 DEPDIR = @DEPDIR@
115
+DSYMUTIL = @DSYMUTIL@
115 116
 ECHO = @ECHO@
116 117
 ECHO_C = @ECHO_C@
117 118
 ECHO_N = @ECHO_N@
... ...
@@ -144,6 +145,7 @@ LTLIBOBJS = @LTLIBOBJS@
144 144
 MAINT = @MAINT@
145 145
 MAKEINFO = @MAKEINFO@
146 146
 MKDIR_P = @MKDIR_P@
147
+NMEDIT = @NMEDIT@
147 148
 OBJEXT = @OBJEXT@
148 149
 PACKAGE = @PACKAGE@
149 150
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
... ...
@@ -67,6 +67,7 @@ CYGPATH_W = @CYGPATH_W@
67 67
 DBDIR = @DBDIR@
68 68
 DEFS = @DEFS@
69 69
 DEPDIR = @DEPDIR@
70
+DSYMUTIL = @DSYMUTIL@
70 71
 ECHO = @ECHO@
71 72
 ECHO_C = @ECHO_C@
72 73
 ECHO_N = @ECHO_N@
... ...
@@ -99,6 +100,7 @@ LTLIBOBJS = @LTLIBOBJS@
99 99
 MAINT = @MAINT@
100 100
 MAKEINFO = @MAKEINFO@
101 101
 MKDIR_P = @MKDIR_P@
102
+NMEDIT = @NMEDIT@
102 103
 OBJEXT = @OBJEXT@
103 104
 PACKAGE = @PACKAGE@
104 105
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@