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 Original patch from gentoo: ../../dev/crosstool-NG/ct-ng.trunk/patches/strace/4.5.17/100-autoreconf.patch
2 -= BEGIN original header =-
3 diff -dur strace-4.5.16.orig/configure strace-4.5.16/configure
4 -= END original header =-
5 diff -durN strace-4.5.17.orig/configure strace-4.5.17/configure
6 --- strace-4.5.17.orig/configure 2008-07-22 02:43:21.000000000 +0200
7 +++ strace-4.5.17/configure 2008-10-24 21:30:13.000000000 +0200
12 +echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5
13 +echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6
14 +if test "${ac_cv_type_statfs64+set}" = set; then
15 + echo $ECHO_N "(cached) $ECHO_C" >&6
17 + cat >conftest.$ac_ext <<_ACEOF
20 +cat confdefs.h >>conftest.$ac_ext
21 +cat >>conftest.$ac_ext <<_ACEOF
22 +/* end confdefs.h. */
24 +#include <linux/types.h>
25 +#include <sys/statfs.h>
37 +rm -f conftest.$ac_objext
38 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
39 + (eval $ac_compile) 2>conftest.er1
41 + grep -v '^ *+' conftest.er1 >conftest.err
43 + cat conftest.err >&5
44 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
45 + (exit $ac_status); } &&
46 + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
47 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
50 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
51 + (exit $ac_status); }; } &&
52 + { ac_try='test -s conftest.$ac_objext'
53 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
56 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
57 + (exit $ac_status); }; }; then
58 + ac_cv_type_statfs64=yes
60 + echo "$as_me: failed program was:" >&5
61 +sed 's/^/| /' conftest.$ac_ext >&5
63 +ac_cv_type_statfs64=no
65 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
68 +echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5
69 +echo "${ECHO_T}$ac_cv_type_statfs64" >&6
70 +if test "$ac_cv_type_statfs64" = yes
73 +cat >>confdefs.h <<\_ACEOF
74 +#define HAVE_STATFS64 1
80 { echo "$as_me:$LINENO: checking return type of signal handlers" >&5
81 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }