fix build on AIX: for some odd reason `echo target.h` was producing 'x', so don't use `echo ifelse(...`, since ifelse is expanded by aclocal anyway

git-svn: trunk@4365

ChangeLog

@@ -1,3 +1,9 @@
+Mon Nov 10 15:09:19 EET 2008 (edwin)
+------------------------------------
+ * Makefile.in, configure, m4/acinclude.m4: fix build on AIX: for
+ some odd reason target.h was producing 'x', so don't use , since
+ ifelse is expanded by aclocal anyway
+
 Mon Nov 10 11:46:14 EET 2008 (edwin)
 ------------------------------------
  * libclamav/matcher-ac.c, libclamav/matcher-ac.h: reduce memory

Makefile.in

@@ -317,7 +317,8 @@ DISTCLEANFILES = target.h
 @DISTCHECK_ENABLE_FLAGS_TRUE@	-D_FORTIFY_SOURCE=2 \
 @DISTCHECK_ENABLE_FLAGS_TRUE@	-fstack-protector-all \
 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wstack-protector \
-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=padded"
+@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=padded \
+@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=aggregate-return"
 all: clamav-config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 

configure

@@ -2214,7 +2214,7 @@ ac_need_target_h_file_new=true
 
 
 
-ac_need_target_h_file=`echo target.h`
+ac_need_target_h_file=target.h
 ac_need_target_h_prefix=`echo target | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:' -e 's:[^A-Z0-9_]::g'`
 #
 target_os0=`echo "$target_os"  | sed -e 'y:abcdefghijklmnopqrstuvwxyz.-:ABCDEFGHIJKLMNOPQRSTUVWXYZ__:' -e 's:[^A-Z0-9_]::g'`

m4/acinclude.m4

@@ -117,7 +117,7 @@ AC_DEFUN([AC_CREATE_TARGET_H_UPPER],
 [AC_REQUIRE([AC_CANONICAL_CPU_ARCH])
 AC_REQUIRE([AC_CREATE_TARGET_H_FILE])
 changequote({, })dnl
-ac_need_target_h_file=`echo ifelse($1, , target.h, $1)`
+ac_need_target_h_file=ifelse($1, , target.h, $1)
 ac_need_target_h_prefix=`echo ifelse($2, , target, $2) | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:' -e 's:[^A-Z0-9_]::g'`
 #
 target_os0=`echo "$target_os"  | sed -e 'y:abcdefghijklmnopqrstuvwxyz.-:ABCDEFGHIJKLMNOPQRSTUVWXYZ__:' -e 's:[^A-Z0-9_]::g'`