git-svn: trunk@4365
Török Edvin authored on 2008/11/10 23:09:31... | ... |
@@ -1,3 +1,9 @@ |
1 |
+Mon Nov 10 15:09:19 EET 2008 (edwin) |
|
2 |
+------------------------------------ |
|
3 |
+ * Makefile.in, configure, m4/acinclude.m4: fix build on AIX: for |
|
4 |
+ some odd reason target.h was producing 'x', so don't use , since |
|
5 |
+ ifelse is expanded by aclocal anyway |
|
6 |
+ |
|
1 | 7 |
Mon Nov 10 11:46:14 EET 2008 (edwin) |
2 | 8 |
------------------------------------ |
3 | 9 |
* libclamav/matcher-ac.c, libclamav/matcher-ac.h: reduce memory |
... | ... |
@@ -317,7 +317,8 @@ DISTCLEANFILES = target.h |
317 | 317 |
@DISTCHECK_ENABLE_FLAGS_TRUE@ -D_FORTIFY_SOURCE=2 \ |
318 | 318 |
@DISTCHECK_ENABLE_FLAGS_TRUE@ -fstack-protector-all \ |
319 | 319 |
@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wstack-protector \ |
320 |
-@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=padded" |
|
320 |
+@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=padded \ |
|
321 |
+@DISTCHECK_ENABLE_FLAGS_TRUE@ -Wno-error=aggregate-return" |
|
321 | 322 |
all: clamav-config.h |
322 | 323 |
$(MAKE) $(AM_MAKEFLAGS) all-recursive |
323 | 324 |
|
... | ... |
@@ -2214,7 +2214,7 @@ ac_need_target_h_file_new=true |
2214 | 2214 |
|
2215 | 2215 |
|
2216 | 2216 |
|
2217 |
-ac_need_target_h_file=`echo target.h` |
|
2217 |
+ac_need_target_h_file=target.h |
|
2218 | 2218 |
ac_need_target_h_prefix=`echo target | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:' -e 's:[^A-Z0-9_]::g'` |
2219 | 2219 |
# |
2220 | 2220 |
target_os0=`echo "$target_os" | sed -e 'y:abcdefghijklmnopqrstuvwxyz.-:ABCDEFGHIJKLMNOPQRSTUVWXYZ__:' -e 's:[^A-Z0-9_]::g'` |
... | ... |
@@ -117,7 +117,7 @@ AC_DEFUN([AC_CREATE_TARGET_H_UPPER], |
117 | 117 |
[AC_REQUIRE([AC_CANONICAL_CPU_ARCH]) |
118 | 118 |
AC_REQUIRE([AC_CREATE_TARGET_H_FILE]) |
119 | 119 |
changequote({, })dnl |
120 |
-ac_need_target_h_file=`echo ifelse($1, , target.h, $1)` |
|
120 |
+ac_need_target_h_file=ifelse($1, , target.h, $1) |
|
121 | 121 |
ac_need_target_h_prefix=`echo ifelse($2, , target, $2) | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:' -e 's:[^A-Z0-9_]::g'` |
122 | 122 |
# |
123 | 123 |
target_os0=`echo "$target_os" | sed -e 'y:abcdefghijklmnopqrstuvwxyz.-:ABCDEFGHIJKLMNOPQRSTUVWXYZ__:' -e 's:[^A-Z0-9_]::g'` |