Browse code

bump autoconf, make test files on make check (bb#2339)

aCaB authored on 2010/11/04 08:22:34
Showing 10 changed files
... ...
@@ -18,7 +18,7 @@
18 18
 
19 19
 ACLOCAL_AMFLAGS=-I m4
20 20
 
21
-SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test unit_tests clamdtop clambc
21
+SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
22 22
 EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32
23 23
 
24 24
 bin_SCRIPTS=clamav-config
... ...
@@ -341,7 +341,7 @@ top_build_prefix = @top_build_prefix@
341 341
 top_builddir = @top_builddir@
342 342
 top_srcdir = @top_srcdir@
343 343
 ACLOCAL_AMFLAGS = -I m4
344
-SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test unit_tests clamdtop clambc
344
+SUBDIRS = libltdl libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
345 345
 EXTRA_DIST = FAQ examples BUGS shared libclamav.pc.in libclamunrar_iface/Makefile.am libclamunrar_iface/Makefile.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.sha256 platform.h.in clamdscan/clamdscan.map win32
346 346
 bin_SCRIPTS = clamav-config
347 347
 pkgconfigdir = $(libdir)/pkgconfig
... ...
@@ -96,7 +96,7 @@
96 96
 /* file i/o buffer size */
97 97
 #undef FILEBUFF
98 98
 
99
-/* FPU byte ordering is little endian */
99
+/* FPU byte ordering matches CPU */
100 100
 #undef FPU_WORDS_BIGENDIAN
101 101
 
102 102
 /* enable workaround for broken DNS servers */
... ...
@@ -1,10 +1,10 @@
1 1
 #! /bin/sh
2 2
 # Attempt to guess a canonical system name.
3 3
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
4
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
5 5
 #   Free Software Foundation, Inc.
6 6
 
7
-timestamp='2009-06-10'
7
+timestamp='2009-12-30'
8 8
 
9 9
 # This file is free software; you can redistribute it and/or modify it
10 10
 # under the terms of the GNU General Public License as published by
... ...
@@ -27,16 +27,16 @@ timestamp='2009-06-10'
27 27
 # the same distribution terms that you use for the rest of that program.
28 28
 
29 29
 
30
-# Originally written by Per Bothner <per@bothner.com>.
31
-# Please send patches to <config-patches@gnu.org>.  Submit a context
32
-# diff and a properly formatted ChangeLog entry.
30
+# Originally written by Per Bothner.  Please send patches (context
31
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
32
+# entry.
33 33
 #
34 34
 # This script attempts to guess a canonical system name similar to
35 35
 # config.sub.  If it succeeds, it prints the system name on stdout, and
36 36
 # exits with 0.  Otherwise, it exits with 1.
37 37
 #
38
-# The plan is that this can be called by configure scripts if you
39
-# don't specify an explicit build system type.
38
+# You can get the latest version of this script from:
39
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
40 40
 
41 41
 me=`echo "$0" | sed -e 's,.*/,,'`
42 42
 
... ...
@@ -56,8 +56,9 @@ version="\
56 56
 GNU config.guess ($timestamp)
57 57
 
58 58
 Originally written by Per Bothner.
59
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
60
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
59
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
60
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
61
+Software Foundation, Inc.
61 62
 
62 63
 This is free software; see the source for copying conditions.  There is NO
63 64
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
... ...
@@ -333,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
333 333
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
334 334
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
335 335
 	exit ;;
336
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
337
+	echo i386-pc-auroraux${UNAME_RELEASE}
338
+	exit ;;
336 339
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
337 340
 	eval $set_cc_for_build
338 341
 	SUN_ARCH="i386"
... ...
@@ -807,12 +811,12 @@ EOF
807 807
     i*:PW*:*)
808 808
 	echo ${UNAME_MACHINE}-pc-pw32
809 809
 	exit ;;
810
-    *:Interix*:[3456]*)
810
+    *:Interix*:*)
811 811
     	case ${UNAME_MACHINE} in
812 812
 	    x86)
813 813
 		echo i586-pc-interix${UNAME_RELEASE}
814 814
 		exit ;;
815
-	    EM64T | authenticamd | genuineintel)
815
+	    authenticamd | genuineintel | EM64T)
816 816
 		echo x86_64-unknown-interix${UNAME_RELEASE}
817 817
 		exit ;;
818 818
 	    IA64)
... ...
@@ -854,6 +858,20 @@ EOF
854 854
     i*86:Minix:*:*)
855 855
 	echo ${UNAME_MACHINE}-pc-minix
856 856
 	exit ;;
857
+    alpha:Linux:*:*)
858
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
859
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
860
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
861
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
862
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
863
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
864
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
865
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
866
+        esac
867
+	objdump --private-headers /bin/sh | grep -q ld.so.1
868
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
869
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
870
+	exit ;;
857 871
     arm*:Linux:*:*)
858 872
 	eval $set_cc_for_build
859 873
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
... ...
@@ -876,6 +894,17 @@ EOF
876 876
     frv:Linux:*:*)
877 877
     	echo frv-unknown-linux-gnu
878 878
 	exit ;;
879
+    i*86:Linux:*:*)
880
+	LIBC=gnu
881
+	eval $set_cc_for_build
882
+	sed 's/^	//' << EOF >$dummy.c
883
+	#ifdef __dietlibc__
884
+	LIBC=dietlibc
885
+	#endif
886
+EOF
887
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
888
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
889
+	exit ;;
879 890
     ia64:Linux:*:*)
880 891
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
881 892
 	exit ;;
... ...
@@ -901,39 +930,18 @@ EOF
901 901
 	#endif
902 902
 	#endif
903 903
 EOF
904
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
905
-	    /^CPU/{
906
-		s: ::g
907
-		p
908
-	    }'`"
904
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
909 905
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
910 906
 	;;
911 907
     or32:Linux:*:*)
912 908
 	echo or32-unknown-linux-gnu
913 909
 	exit ;;
914
-    ppc:Linux:*:*)
915
-	echo powerpc-unknown-linux-gnu
916
-	exit ;;
917
-    ppc64:Linux:*:*)
918
-	echo powerpc64-unknown-linux-gnu
919
-	exit ;;
920
-    alpha:Linux:*:*)
921
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
922
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
923
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
924
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
925
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
926
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
927
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
928
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
929
-        esac
930
-	objdump --private-headers /bin/sh | grep -q ld.so.1
931
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
932
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
933
-	exit ;;
934 910
     padre:Linux:*:*)
935 911
 	echo sparc-unknown-linux-gnu
936 912
 	exit ;;
913
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
914
+	echo hppa64-unknown-linux-gnu
915
+	exit ;;
937 916
     parisc:Linux:*:* | hppa:Linux:*:*)
938 917
 	# Look for CPU level
939 918
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
... ...
@@ -942,8 +950,11 @@ EOF
942 942
 	  *)    echo hppa-unknown-linux-gnu ;;
943 943
 	esac
944 944
 	exit ;;
945
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
946
-	echo hppa64-unknown-linux-gnu
945
+    ppc64:Linux:*:*)
946
+	echo powerpc64-unknown-linux-gnu
947
+	exit ;;
948
+    ppc:Linux:*:*)
949
+	echo powerpc-unknown-linux-gnu
947 950
 	exit ;;
948 951
     s390:Linux:*:* | s390x:Linux:*:*)
949 952
 	echo ${UNAME_MACHINE}-ibm-linux
... ...
@@ -966,58 +977,6 @@ EOF
966 966
     xtensa*:Linux:*:*)
967 967
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
968 968
 	exit ;;
969
-    i*86:Linux:*:*)
970
-	# The BFD linker knows what the default object file format is, so
971
-	# first see if it will tell us. cd to the root directory to prevent
972
-	# problems with other programs or directories called `ld' in the path.
973
-	# Set LC_ALL=C to ensure ld outputs messages in English.
974
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
975
-			 | sed -ne '/supported targets:/!d
976
-				    s/[ 	][ 	]*/ /g
977
-				    s/.*supported targets: *//
978
-				    s/ .*//
979
-				    p'`
980
-        case "$ld_supported_targets" in
981
-	  elf32-i386)
982
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
983
-		;;
984
-	esac
985
-	# Determine whether the default compiler is a.out or elf
986
-	eval $set_cc_for_build
987
-	sed 's/^	//' << EOF >$dummy.c
988
-	#include <features.h>
989
-	#ifdef __ELF__
990
-	# ifdef __GLIBC__
991
-	#  if __GLIBC__ >= 2
992
-	LIBC=gnu
993
-	#  else
994
-	LIBC=gnulibc1
995
-	#  endif
996
-	# else
997
-	LIBC=gnulibc1
998
-	# endif
999
-	#else
1000
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
1001
-	LIBC=gnu
1002
-	#else
1003
-	LIBC=gnuaout
1004
-	#endif
1005
-	#endif
1006
-	#ifdef __dietlibc__
1007
-	LIBC=dietlibc
1008
-	#endif
1009
-EOF
1010
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1011
-	    /^LIBC/{
1012
-		s: ::g
1013
-		p
1014
-	    }'`"
1015
-	test x"${LIBC}" != x && {
1016
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1017
-		exit
1018
-	}
1019
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
1020
-	;;
1021 969
     i*86:DYNIX/ptx:4*:*)
1022 970
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1023 971
 	# earlier versions are messed up and put the nodename in both
... ...
@@ -1247,6 +1206,16 @@ EOF
1247 1247
     *:Darwin:*:*)
1248 1248
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1249 1249
 	case $UNAME_PROCESSOR in
1250
+	    i386)
1251
+		eval $set_cc_for_build
1252
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1253
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1254
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1255
+		      grep IS_64BIT_ARCH >/dev/null
1256
+		  then
1257
+		      UNAME_PROCESSOR="x86_64"
1258
+		  fi
1259
+		fi ;;
1250 1260
 	    unknown) UNAME_PROCESSOR=powerpc ;;
1251 1261
 	esac
1252 1262
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
... ...
@@ -1,10 +1,10 @@
1 1
 #! /bin/sh
2 2
 # Configuration validation subroutine script.
3 3
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
4
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
5 5
 #   Free Software Foundation, Inc.
6 6
 
7
-timestamp='2009-06-11'
7
+timestamp='2010-01-22'
8 8
 
9 9
 # This file is (in principle) common to ALL GNU software.
10 10
 # The presence of a machine in this file suggests that SOME GNU software
... ...
@@ -32,13 +32,16 @@ timestamp='2009-06-11'
32 32
 
33 33
 
34 34
 # Please send patches to <config-patches@gnu.org>.  Submit a context
35
-# diff and a properly formatted ChangeLog entry.
35
+# diff and a properly formatted GNU ChangeLog entry.
36 36
 #
37 37
 # Configuration subroutine to validate and canonicalize a configuration type.
38 38
 # Supply the specified configuration type as an argument.
39 39
 # If it is invalid, we print an error message on stderr and exit with code 1.
40 40
 # Otherwise, we print the canonical config type on stdout and succeed.
41 41
 
42
+# You can get the latest version of this script from:
43
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
44
+
42 45
 # This file is supposed to be the same for all GNU packages
43 46
 # and recognize all the CPU types, system types and aliases
44 47
 # that are meaningful with *any* GNU software.
... ...
@@ -72,8 +75,9 @@ Report bugs and patches to <config-patches@gnu.org>."
72 72
 version="\
73 73
 GNU config.sub ($timestamp)
74 74
 
75
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
76
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
75
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
76
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
77
+Software Foundation, Inc.
77 78
 
78 79
 This is free software; see the source for copying conditions.  There is NO
79 80
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
... ...
@@ -149,7 +153,7 @@ case $os in
149 149
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
150 150
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
151 151
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
152
-	-apple | -axis | -knuth | -cray)
152
+	-apple | -axis | -knuth | -cray | -microblaze)
153 153
 		os=
154 154
 		basic_machine=$1
155 155
 		;;
... ...
@@ -284,6 +288,7 @@ case $basic_machine in
284 284
 	| pdp10 | pdp11 | pj | pjl \
285 285
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
286 286
 	| pyramid \
287
+	| rx \
287 288
 	| score \
288 289
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
289 290
 	| sh64 | sh64le \
... ...
@@ -291,13 +296,14 @@ case $basic_machine in
291 291
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
292 292
 	| spu | strongarm \
293 293
 	| tahoe | thumb | tic4x | tic80 | tron \
294
+	| ubicom32 \
294 295
 	| v850 | v850e \
295 296
 	| we32k \
296 297
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
297 298
 	| z8k | z80)
298 299
 		basic_machine=$basic_machine-unknown
299 300
 		;;
300
-	m6811 | m68hc11 | m6812 | m68hc12)
301
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
301 302
 		# Motorola 68HC11/12.
302 303
 		basic_machine=$basic_machine-unknown
303 304
 		os=-none
... ...
@@ -340,7 +346,7 @@ case $basic_machine in
340 340
 	| lm32-* \
341 341
 	| m32c-* | m32r-* | m32rle-* \
342 342
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
343
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
343
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
344 344
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
345 345
 	| mips16-* \
346 346
 	| mips64-* | mips64el-* \
... ...
@@ -368,15 +374,17 @@ case $basic_machine in
368 368
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
369 369
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
370 370
 	| pyramid-* \
371
-	| romp-* | rs6000-* \
371
+	| romp-* | rs6000-* | rx-* \
372 372
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
373 373
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
374 374
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
375 375
 	| sparclite-* \
376 376
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
377 377
 	| tahoe-* | thumb-* \
378
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
378
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
379
+	| tile-* | tilegx-* \
379 380
 	| tron-* \
381
+	| ubicom32-* \
380 382
 	| v850-* | v850e-* | vax-* \
381 383
 	| we32k-* \
382 384
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
... ...
@@ -726,6 +734,9 @@ case $basic_machine in
726 726
 		basic_machine=ns32k-utek
727 727
 		os=-sysv
728 728
 		;;
729
+        microblaze)
730
+		basic_machine=microblaze-xilinx
731
+		;;
729 732
 	mingw32)
730 733
 		basic_machine=i386-pc
731 734
 		os=-mingw32
... ...
@@ -1076,6 +1087,11 @@ case $basic_machine in
1076 1076
 		basic_machine=tic6x-unknown
1077 1077
 		os=-coff
1078 1078
 		;;
1079
+        # This must be matched before tile*.
1080
+        tilegx*)
1081
+		basic_machine=tilegx-unknown
1082
+		os=-linux-gnu
1083
+		;;
1079 1084
 	tile*)
1080 1085
 		basic_machine=tile-unknown
1081 1086
 		os=-linux-gnu
... ...
@@ -1247,6 +1263,9 @@ case $os in
1247 1247
         # First match some system type aliases
1248 1248
         # that might get confused with valid system types.
1249 1249
 	# -solaris* is a basic system type, with this one exception.
1250
+        -auroraux)
1251
+	        os=-auroraux
1252
+		;;
1250 1253
 	-solaris1 | -solaris1.*)
1251 1254
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
1252 1255
 		;;
... ...
@@ -1268,8 +1287,8 @@ case $os in
1268 1268
 	# -sysv* is not here because it comes later, after sysvr4.
1269 1269
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1270 1270
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1271
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1272
-	      | -kopensolaris* \
1271
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1272
+	      | -sym* | -kopensolaris* \
1273 1273
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1274 1274
 	      | -aos* | -aros* \
1275 1275
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
... ...
@@ -1290,7 +1309,7 @@ case $os in
1290 1290
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1291 1291
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1292 1292
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1293
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
1293
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1294 1294
 	# Remember, each alternative MUST END IN *, to match a version number.
1295 1295
 		;;
1296 1296
 	-qnx*)
... ...
@@ -1423,6 +1442,8 @@ case $os in
1423 1423
 	-dicos*)
1424 1424
 		os=-dicos
1425 1425
 		;;
1426
+        -nacl*)
1427
+	        ;;
1426 1428
 	-none)
1427 1429
 		;;
1428 1430
 	*)
... ...
@@ -11191,7 +11191,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
11191 11191
 
11192 11192
 
11193 11193
 LIBADD_DLOPEN=
11194
-lt_save_LIBS="$LIBS"
11195 11194
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
11196 11195
 $as_echo_n "checking for library containing dlopen... " >&6; }
11197 11196
 if test "${ac_cv_search_dlopen+set}" = set; then :
... ...
@@ -11326,6 +11325,7 @@ fi
11326 11326
 
11327 11327
 if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
11328 11328
 then
11329
+  lt_save_LIBS="$LIBS"
11329 11330
   LIBS="$LIBS $LIBADD_DLOPEN"
11330 11331
   for ac_func in dlerror
11331 11332
 do :
... ...
@@ -11338,8 +11338,8 @@ _ACEOF
11338 11338
 fi
11339 11339
 done
11340 11340
 
11341
+  LIBS="$lt_save_LIBS"
11341 11342
 fi
11342
-LIBS="$lt_save_LIBS"
11343 11343
 
11344 11344
 
11345 11345
 LIBADD_SHL_LOAD=
... ...
@@ -1,5 +1,8 @@
1 1
 /* clamavcxx-config.h.in.  Generated from configure.ac by autoheader.  */
2 2
 
3
+/* Define if building universal (internal helper macro) */
4
+#undef AC_APPLE_UNIVERSAL_BUILD
5
+
3 6
 /* Define to 1 if you have the <dlfcn.h> header file. */
4 7
 #undef HAVE_DLFCN_H
5 8
 
... ...
@@ -54,3 +57,15 @@
54 54
 
55 55
 /* Define to 1 if you have the ANSI C header files. */
56 56
 #undef STDC_HEADERS
57
+
58
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
59
+   significant byte first (like Motorola and SPARC, unlike Intel). */
60
+#if defined AC_APPLE_UNIVERSAL_BUILD
61
+# if defined __BIG_ENDIAN__
62
+#  define WORDS_BIGENDIAN 1
63
+# endif
64
+#else
65
+# ifndef WORDS_BIGENDIAN
66
+#  undef WORDS_BIGENDIAN
67
+# endif
68
+#endif
... ...
@@ -637,7 +637,6 @@ AC_SUBST([LT_DLLOADERS])
637 637
 AC_LANG_PUSH([C])
638 638
 
639 639
 LIBADD_DLOPEN=
640
-lt_save_LIBS="$LIBS"
641 640
 AC_SEARCH_LIBS([dlopen], [dl],
642 641
 	[AC_DEFINE([HAVE_LIBDL], [1],
643 642
 		   [Define if you have the libdl library or equivalent.])
... ...
@@ -661,10 +660,11 @@ AC_SEARCH_LIBS([dlopen], [dl],
661 661
 		LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])])
662 662
 if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
663 663
 then
664
+  lt_save_LIBS="$LIBS"
664 665
   LIBS="$LIBS $LIBADD_DLOPEN"
665 666
   AC_CHECK_FUNCS([dlerror])
667
+  LIBS="$lt_save_LIBS"
666 668
 fi
667
-LIBS="$lt_save_LIBS"
668 669
 AC_SUBST([LIBADD_DLOPEN])
669 670
 
670 671
 LIBADD_SHL_LOAD=
... ...
@@ -19,3 +19,5 @@ clean-local:
19 19
 	rm -f $(FILES)
20 20
 
21 21
 EXTRA_DIST = .split
22
+
23
+check: all
... ...
@@ -429,6 +429,8 @@ $(FILES) :
429 429
 clean-local:
430 430
 	rm -f $(FILES)
431 431
 
432
+check: all
433
+
432 434
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
433 435
 # Otherwise a system limit (for SysV at least) may be exceeded.
434 436
 .NOEXPORT: