@@ -1,3 +1,9 @@

+Mon Mar  2 22:11:48 EET 2009 (edwin)

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

+ * clamav-config.h.in, config/ltmain.sh, configure, configure.in,

+ m4/libtool.m4, m4/ltdl.m4: attempt to fix AC_C_BIGENDIAN

+ action-if-universal, regenerate files.

+

 Mon Mar  2 17:57:50 EET 2009 (edwin)

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

  * clamdtop/clamdtop.c: fix use-after-free.

@@ -490,8 +490,17 @@

 /* Version suffix for package */

 #undef VERSION_SUFFIX

-/* endianess */

-#undef WORDS_BIGENDIAN

+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most

+   significant byte first (like Motorola and SPARC, unlike Intel). */

+#if defined AC_APPLE_UNIVERSAL_BUILD

+# if defined __BIG_ENDIAN__

+#  define WORDS_BIGENDIAN 1

+# endif

+#else

+# ifndef WORDS_BIGENDIAN

+#  undef WORDS_BIGENDIAN

+# endif

+#endif

 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */

 #undef _LARGEFILE_SOURCE

@@ -65,7 +65,7 @@

 #       compiler:		$LTCC

 #       compiler flags:		$LTCFLAGS

 #       linker:		$LD (gnu? $with_gnu_ld)

-#       $progname:		(GNU libtool) 2.2.6

+#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-1

 #       automake:		$automake_version

 #       autoconf:		$autoconf_version

 #

@@ -73,7 +73,7 @@

 PROGRAM=ltmain.sh

 PACKAGE=libtool

-VERSION=2.2.6

+VERSION="2.2.6 Debian-2.2.6a-1"

 TIMESTAMP=""

 package_revision=1.3012

@@ -116,15 +116,15 @@ $lt_unset CDPATH

 : ${CP="cp -f"}

 : ${ECHO="echo"}

-: ${EGREP="/usr/bin/grep -E"}

-: ${FGREP="/usr/bin/grep -F"}

-: ${GREP="/usr/bin/grep"}

+: ${EGREP="/bin/grep -E"}

+: ${FGREP="/bin/grep -F"}

+: ${GREP="/bin/grep"}

 : ${LN_S="ln -s"}

 : ${MAKE="make"}

 : ${MKDIR="mkdir"}

 : ${MV="mv -f"}

 : ${RM="rm -f"}

-: ${SED="/opt/local/bin/gsed"}

+: ${SED="/bin/sed"}

 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}

 : ${Xsed="$SED -e 1s/^X//"}

@@ -5033,7 +5033,10 @@ func_mode_link ()

 	case $pass in

 	dlopen) libs="$dlfiles" ;;

 	dlpreopen) libs="$dlprefiles" ;;

-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;

+	link)

+	  libs="$deplibs %DEPLIBS%"

+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"

+	  ;;

 	esac

       fi

       if test "$linkmode,$pass" = "lib,dlpreopen"; then

@@ -6207,6 +6210,9 @@ func_mode_link ()

 	    revision="$number_minor"

 	    lt_irix_increment=no

 	    ;;

+	  *)

+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"

+	    ;;

 	  esac

 	  ;;

 	no)

@@ -5375,7 +5375,7 @@ linux* | k*bsd*-gnu)

   lt_cv_deplibs_check_method=pass_all

   ;;

-netbsd*)

+netbsd* | netbsdelf*-gnu)

   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then

     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'

   else

@@ -8767,7 +8767,7 @@ _LT_EOF

       fi

       ;;

-    netbsd*)

+    netbsd* | netbsdelf*-gnu)

       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

 	wlarc=

@@ -8942,6 +8942,7 @@ _LT_EOF

 	if test "$aix_use_runtimelinking" = yes; then

 	  shared_flag="$shared_flag "'${wl}-G'

 	fi

+	link_all_deplibs=no

       else

 	# not using gcc

 	if test "$host_cpu" = ia64; then

@@ -9356,7 +9357,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

       link_all_deplibs=yes

       ;;

-    netbsd*)

+    netbsd* | netbsdelf*-gnu)

       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out

       else

@@ -10333,6 +10334,18 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

   dynamic_linker='GNU/Linux ld.so'

   ;;

+netbsdelf*-gnu)

+  version_type=linux

+  need_lib_prefix=no

+  need_version=no

+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

+  soname_spec='${libname}${release}${shared_ext}$major'

+  shlibpath_var=LD_LIBRARY_PATH

+  shlibpath_overrides_runpath=no

+  hardcode_into_libs=yes

+  dynamic_linker='NetBSD ld.elf_so'

+  ;;

+

 netbsd*)

   version_type=sunos

   need_lib_prefix=no

@@ -11266,7 +11279,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11269 "configure"

+#line 11282 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -11362,7 +11375,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11365 "configure"

+#line 11378 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -12513,7 +12526,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 12516 "configure"

+#line 12529 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -12661,7 +12674,7 @@ else

     # at 6.2 and later dlopen does load deplibs.

     lt_cv_sys_dlopen_deplibs=yes

     ;;

-  netbsd*)

+  netbsd* | netbsdelf*-gnu)

     lt_cv_sys_dlopen_deplibs=yes

     ;;

   openbsd*)

@@ -14704,19 +14717,6 @@ $as_echo "$as_me: error: unknown endianness

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

  esac

-if test $ac_cv_c_bigendian = yes; then

-

-cat >>confdefs.h <<\_ACEOF

-#define WORDS_BIGENDIAN 1

-_ACEOF

-

-else

-

-cat >>confdefs.h <<\_ACEOF

-#define WORDS_BIGENDIAN 0

-_ACEOF

-

-fi

 # Check whether --enable-gcc-vcheck was given.

 if test "${enable_gcc_vcheck+set}" = set; then

@@ -70,11 +70,8 @@ AC_C_CONST

 AC_C_INLINE

 AC_C_FPU_BIGENDIAN

 AC_C_BIGENDIAN

-if test $ac_cv_c_bigendian = yes; then

-  AC_DEFINE([WORDS_BIGENDIAN],1,endianess)

-else

-  AC_DEFINE([WORDS_BIGENDIAN],0,endianess)

-fi

+dnl don't define WORDS_BIGENDIAN ourselves, AC_C_BIGENDIAN's default action is

+dnl to define it appropriately. If we do define it we break universal builds.

 AC_ARG_ENABLE([gcc-vcheck],

 [  --disable-gcc-vcheck	  do not check for buggy gcc version ],

@@ -2485,6 +2485,18 @@ linux* | k*bsd*-gnu)

   dynamic_linker='GNU/Linux ld.so'

   ;;

+netbsdelf*-gnu)

+  version_type=linux

+  need_lib_prefix=no

+  need_version=no

+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

+  soname_spec='${libname}${release}${shared_ext}$major'

+  shlibpath_var=LD_LIBRARY_PATH

+  shlibpath_overrides_runpath=no

+  hardcode_into_libs=yes

+  dynamic_linker='NetBSD ld.elf_so'

+  ;;

+

 netbsd*)

   version_type=sunos

   need_lib_prefix=no

@@ -3076,7 +3088,7 @@ linux* | k*bsd*-gnu)

   lt_cv_deplibs_check_method=pass_all

   ;;

-netbsd*)

+netbsd* | netbsdelf*-gnu)

   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then

     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'

   else

@@ -3757,7 +3769,7 @@ m4_if([$1], [CXX], [

 	    ;;

 	esac

 	;;

-      netbsd*)

+      netbsd* | netbsdelf*-gnu)

 	;;

       *qnx* | *nto*)

         # QNX uses GNU C++, but need to define -shared option too, otherwise

@@ -4182,6 +4194,9 @@ m4_if([$1], [CXX], [

   cygwin* | mingw* | cegcc*)

     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'

   ;;

+  linux* | k*bsd*-gnu)

+    _LT_TAGVAR(link_all_deplibs, $1)=no

+  ;;

   *)

     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

   ;;

@@ -4428,7 +4443,7 @@ _LT_EOF

       fi

       ;;

-    netbsd*)

+    netbsd* | netbsdelf*-gnu)

       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

 	wlarc=

@@ -4603,6 +4618,7 @@ _LT_EOF

 	if test "$aix_use_runtimelinking" = yes; then

 	  shared_flag="$shared_flag "'${wl}-G'

 	fi

+	_LT_TAGVAR(link_all_deplibs, $1)=no

       else

 	# not using gcc

 	if test "$host_cpu" = ia64; then

@@ -4841,7 +4857,7 @@ _LT_EOF

       _LT_TAGVAR(link_all_deplibs, $1)=yes

       ;;

-    netbsd*)

+    netbsd* | netbsdelf*-gnu)

       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then

 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out

       else

@@ -487,7 +487,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],

     # at 6.2 and later dlopen does load deplibs.

     lt_cv_sys_dlopen_deplibs=yes

     ;;

-  netbsd*)

+  netbsd* | netbsdelf*-gnu)

     lt_cv_sys_dlopen_deplibs=yes

     ;;

   openbsd*)