scripts/addToolsVersion: properly handle .in vs. .in.2
While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).
Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.
So, for each tool, we need to explicitly know what file to munge.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
1 diff -durN strace-4.5.19.orig/configure strace-4.5.19/configure
2 --- strace-4.5.19.orig/configure 2009-10-21 19:41:11.000000000 +0200
3 +++ strace-4.5.19/configure 2009-10-28 18:47:18.000000000 +0100
5 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8 +echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5
9 +echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6
10 +if test "${ac_cv_type_statfs64+set}" = set; then
11 + echo $ECHO_N "(cached) $ECHO_C" >&6
13 + cat >conftest.$ac_ext <<_ACEOF
16 +cat confdefs.h >>conftest.$ac_ext
17 +cat >>conftest.$ac_ext <<_ACEOF
18 +/* end confdefs.h. */
20 +#include <linux/types.h>
21 +#include <sys/statfs.h>
33 +rm -f conftest.$ac_objext
34 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
35 + (eval $ac_compile) 2>conftest.er1
37 + grep -v '^ *+' conftest.er1 >conftest.err
39 + cat conftest.err >&5
40 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
41 + (exit $ac_status); } &&
42 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
43 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
46 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
47 + (exit $ac_status); }; } &&
48 + { ac_try='test -s conftest.$ac_objext'
49 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
52 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
53 + (exit $ac_status); }; }; then
54 + ac_cv_type_statfs64=yes
56 + echo "$as_me: failed program was:" >&5
57 +sed 's/^/| /' conftest.$ac_ext >&5
59 +ac_cv_type_statfs64=no
61 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
64 +echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5
65 +echo "${ECHO_T}$ac_cv_type_statfs64" >&6
66 +if test "$ac_cv_type_statfs64" = yes
69 +cat >>confdefs.h <<\_ACEOF
70 +#define HAVE_STATFS64 1