[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b
Török Edvin
edwin at clamav.net
Sun Apr 4 01:22:48 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 66d21c0b76b2d08e354f7bfbcde7a7a982a3cf6b
Author: Török Edvin <edwin at clamav.net>
Date: Thu Mar 11 23:43:51 2010 +0200
Solaris needs Solaris.h! (bb #1878).
diff --git a/libclamav/c++/configure b/libclamav/c++/configure
index 35e2332..179c3be 100755
--- a/libclamav/c++/configure
+++ b/libclamav/c++/configure
@@ -3781,6 +3781,13 @@ if test "$cxxset" != set; then
# don't use the default -O2 -g because -g bloats the C++ binaries too much
CXXFLAGS="-O2"
fi
+case "$target_os" in
+solaris*)
+ CXXFLAGS="$CXXFLAGS -include llvm/System/Solaris.h"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Building on Solaris" >&5
+$as_echo "$as_me: Building on Solaris" >&6;}
+ ;;
+esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
@@ -5081,13 +5088,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5084: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5091: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5087: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5094: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5090: output\"" >&5)
+ (eval echo "\"\$as_me:5097: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6293,7 +6300,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6296 "configure"' > conftest.$ac_ext
+ echo '#line 6303 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8349,11 +8356,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8352: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8359: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8356: \$? = $ac_status" >&5
+ echo "$as_me:8363: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8688,11 +8695,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8691: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8698: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8695: \$? = $ac_status" >&5
+ echo "$as_me:8702: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8793,11 +8800,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8796: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8803: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8800: \$? = $ac_status" >&5
+ echo "$as_me:8807: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8848,11 +8855,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8851: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8858: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8855: \$? = $ac_status" >&5
+ echo "$as_me:8862: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11232,7 +11239,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11235 "configure"
+#line 11242 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11328,7 +11335,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11331 "configure"
+#line 11338 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13284,11 +13291,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13287: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13294: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13291: \$? = $ac_status" >&5
+ echo "$as_me:13298: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13383,11 +13390,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13386: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13393: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13390: \$? = $ac_status" >&5
+ echo "$as_me:13397: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13435,11 +13442,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13438: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13445: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13442: \$? = $ac_status" >&5
+ echo "$as_me:13449: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
diff --git a/libclamav/c++/configure.ac b/libclamav/c++/configure.ac
index d142789..c48bcee 100644
--- a/libclamav/c++/configure.ac
+++ b/libclamav/c++/configure.ac
@@ -30,6 +30,12 @@ if test "$cxxset" != set; then
# don't use the default -O2 -g because -g bloats the C++ binaries too much
CXXFLAGS="-O2"
fi
+case "$target_os" in
+solaris*)
+ CXXFLAGS="$CXXFLAGS -include llvm/System/Solaris.h"
+ AC_MSG_NOTICE([Building on Solaris])
+ ;;
+esac
AM_MAINTAINER_MODE
LT_INIT([disable-static])
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list