git-svn: trunk@1773
Tomasz Kojm authored on 2005/11/29 04:49:57... | ... |
@@ -1,3 +1,8 @@ |
1 |
+Mon Nov 28 20:45:20 CET 2005 (tk) |
|
2 |
+--------------------------------- |
|
3 |
+ * configure.in: check for hardware acceleration library (--disable-hwaccel |
|
4 |
+ disables the check) |
|
5 |
+ |
|
1 | 6 |
Sat Nov 26 23:32:35 CET 2005 (tk) |
2 | 7 |
--------------------------------- |
3 | 8 |
* libclamav/pe.[ch]: add support for PE32+ executables (used on win64) |
... | ... |
@@ -1019,6 +1019,7 @@ Optional Features: |
1019 | 1019 |
(and sometimes confusing) to the casual installer |
1020 | 1020 |
--disable-zlib-vcheck do not check for buggy zlib version |
1021 | 1021 |
--disable-bzip2 disable bzip2 support |
1022 |
+ --disable-hwaccel disable support for hardware acceleration |
|
1022 | 1023 |
--disable-dns disable support for database verification through |
1023 | 1024 |
DNS |
1024 | 1025 |
--disable-clamuko disable clamuko support (Linux, DragonFly and FreeBSD only) |
... | ... |
@@ -5036,7 +5037,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes |
5036 | 5036 |
case $host in |
5037 | 5037 |
*-*-irix6*) |
5038 | 5038 |
# Find out which ABI we are using. |
5039 |
- echo '#line 5039 "configure"' > conftest.$ac_ext |
|
5039 |
+ echo '#line 5040 "configure"' > conftest.$ac_ext |
|
5040 | 5040 |
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
5041 | 5041 |
(eval $ac_compile) 2>&5 |
5042 | 5042 |
ac_status=$? |
... | ... |
@@ -5627,7 +5628,7 @@ chmod -w . |
5627 | 5627 |
save_CFLAGS="$CFLAGS" |
5628 | 5628 |
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" |
5629 | 5629 |
compiler_c_o=no |
5630 |
-if { (eval echo configure:5630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then |
|
5630 |
+if { (eval echo configure:5631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then |
|
5631 | 5631 |
# The compiler can only warn and ignore the option if not recognized |
5632 | 5632 |
# So say no if there are warnings |
5633 | 5633 |
if test -s out/conftest.err; then |
... | ... |
@@ -7561,7 +7562,7 @@ else |
7561 | 7561 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
7562 | 7562 |
lt_status=$lt_dlunknown |
7563 | 7563 |
cat > conftest.$ac_ext <<EOF |
7564 |
-#line 7564 "configure" |
|
7564 |
+#line 7565 "configure" |
|
7565 | 7565 |
#include "confdefs.h" |
7566 | 7566 |
|
7567 | 7567 |
#if HAVE_DLFCN_H |
... | ... |
@@ -7659,7 +7660,7 @@ else |
7659 | 7659 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
7660 | 7660 |
lt_status=$lt_dlunknown |
7661 | 7661 |
cat > conftest.$ac_ext <<EOF |
7662 |
-#line 7662 "configure" |
|
7662 |
+#line 7663 "configure" |
|
7663 | 7663 |
#include "confdefs.h" |
7664 | 7664 |
|
7665 | 7665 |
#if HAVE_DLFCN_H |
... | ... |
@@ -10750,6 +10751,89 @@ fi |
10750 | 10750 |
|
10751 | 10751 |
fi |
10752 | 10752 |
|
10753 |
+# Check whether --enable-hwaccel or --disable-hwaccel was given. |
|
10754 |
+if test "${enable_hwaccel+set}" = set; then |
|
10755 |
+ enableval="$enable_hwaccel" |
|
10756 |
+ want_hwaccel=$enableval |
|
10757 |
+else |
|
10758 |
+ want_hwaccel="yes" |
|
10759 |
+fi; |
|
10760 |
+ |
|
10761 |
+if test "$want_hwaccel" = "yes" |
|
10762 |
+then |
|
10763 |
+ echo "$as_me:$LINENO: checking for sn_sigscan_initdb in -lsn_sigscan" >&5 |
|
10764 |
+echo $ECHO_N "checking for sn_sigscan_initdb in -lsn_sigscan... $ECHO_C" >&6 |
|
10765 |
+if test "${ac_cv_lib_sn_sigscan_sn_sigscan_initdb+set}" = set; then |
|
10766 |
+ echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
10767 |
+else |
|
10768 |
+ ac_check_lib_save_LIBS=$LIBS |
|
10769 |
+LIBS="-lsn_sigscan $LIBS" |
|
10770 |
+cat >conftest.$ac_ext <<_ACEOF |
|
10771 |
+/* confdefs.h. */ |
|
10772 |
+_ACEOF |
|
10773 |
+cat confdefs.h >>conftest.$ac_ext |
|
10774 |
+cat >>conftest.$ac_ext <<_ACEOF |
|
10775 |
+/* end confdefs.h. */ |
|
10776 |
+ |
|
10777 |
+/* Override any gcc2 internal prototype to avoid an error. */ |
|
10778 |
+#ifdef __cplusplus |
|
10779 |
+extern "C" |
|
10780 |
+#endif |
|
10781 |
+/* We use char because int might match the return type of a gcc2 |
|
10782 |
+ builtin and then its argument prototype would still apply. */ |
|
10783 |
+char sn_sigscan_initdb (); |
|
10784 |
+int |
|
10785 |
+main () |
|
10786 |
+{ |
|
10787 |
+sn_sigscan_initdb (); |
|
10788 |
+ ; |
|
10789 |
+ return 0; |
|
10790 |
+} |
|
10791 |
+_ACEOF |
|
10792 |
+rm -f conftest.$ac_objext conftest$ac_exeext |
|
10793 |
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 |
|
10794 |
+ (eval $ac_link) 2>conftest.er1 |
|
10795 |
+ ac_status=$? |
|
10796 |
+ grep -v '^ *+' conftest.er1 >conftest.err |
|
10797 |
+ rm -f conftest.er1 |
|
10798 |
+ cat conftest.err >&5 |
|
10799 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
10800 |
+ (exit $ac_status); } && |
|
10801 |
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' |
|
10802 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
10803 |
+ (eval $ac_try) 2>&5 |
|
10804 |
+ ac_status=$? |
|
10805 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
10806 |
+ (exit $ac_status); }; } && |
|
10807 |
+ { ac_try='test -s conftest$ac_exeext' |
|
10808 |
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 |
|
10809 |
+ (eval $ac_try) 2>&5 |
|
10810 |
+ ac_status=$? |
|
10811 |
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
|
10812 |
+ (exit $ac_status); }; }; then |
|
10813 |
+ ac_cv_lib_sn_sigscan_sn_sigscan_initdb=yes |
|
10814 |
+else |
|
10815 |
+ echo "$as_me: failed program was:" >&5 |
|
10816 |
+sed 's/^/| /' conftest.$ac_ext >&5 |
|
10817 |
+ |
|
10818 |
+ac_cv_lib_sn_sigscan_sn_sigscan_initdb=no |
|
10819 |
+fi |
|
10820 |
+rm -f conftest.err conftest.$ac_objext \ |
|
10821 |
+ conftest$ac_exeext conftest.$ac_ext |
|
10822 |
+LIBS=$ac_check_lib_save_LIBS |
|
10823 |
+fi |
|
10824 |
+echo "$as_me:$LINENO: result: $ac_cv_lib_sn_sigscan_sn_sigscan_initdb" >&5 |
|
10825 |
+echo "${ECHO_T}$ac_cv_lib_sn_sigscan_sn_sigscan_initdb" >&6 |
|
10826 |
+if test $ac_cv_lib_sn_sigscan_sn_sigscan_initdb = yes; then |
|
10827 |
+ |
|
10828 |
+cat >>confdefs.h <<\_ACEOF |
|
10829 |
+#define HAVE_HWACCEL 1 |
|
10830 |
+_ACEOF |
|
10831 |
+ |
|
10832 |
+fi |
|
10833 |
+ |
|
10834 |
+fi |
|
10835 |
+ |
|
10753 | 10836 |
# Check whether --enable-dns or --disable-dns was given. |
10754 | 10837 |
if test "${enable_dns+set}" = set; then |
10755 | 10838 |
enableval="$enable_dns" |
... | ... |
@@ -137,6 +137,15 @@ then |
137 | 137 |
AC_CHECK_HEADER(bzlib.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lbz2"; AC_DEFINE(HAVE_BZLIB_H,1,have bzip2)], AC_MSG_WARN([****** bzip2 support disabled])) |
138 | 138 |
fi |
139 | 139 |
|
140 |
+AC_ARG_ENABLE(hwaccel, |
|
141 |
+[ --disable-hwaccel disable support for hardware acceleration], |
|
142 |
+want_hwaccel=$enableval, want_hwaccel="yes") |
|
143 |
+ |
|
144 |
+if test "$want_hwaccel" = "yes" |
|
145 |
+then |
|
146 |
+ AC_CHECK_LIB(sn_sigscan, sn_sigscan_initdb, AC_DEFINE(HAVE_HWACCEL,1,hardware acceleration),) |
|
147 |
+fi |
|
148 |
+ |
|
140 | 149 |
AC_ARG_ENABLE(dns, |
141 | 150 |
AC_HELP_STRING([--disable-dns], [disable support for database verification through DNS]), |
142 | 151 |
[want_dns=$enableval], [want_dns=yes] |