Merge.
1 diff -durN ltrace-0.5.2.orig/Makefile.in ltrace-0.5.2/Makefile.in
2 --- ltrace-0.5.2.orig/Makefile.in 2009-05-21 19:14:54.000000000 +0200
3 +++ ltrace-0.5.2/Makefile.in 2009-06-27 15:30:34.000000000 +0200
8 -#OS := $(shell uname -s)
10 +ARCH := $(shell echo "@HOST_ARCH@" |sed -e s/i.86/i386/ \
11 + -e s/sun4u/sparc64/ \
20 diff -durN ltrace-0.5.2.orig/configure ltrace-0.5.2/configure
21 --- ltrace-0.5.2.orig/configure 2009-05-21 19:14:57.000000000 +0200
22 +++ ltrace-0.5.2/configure 2009-06-27 15:30:34.000000000 +0200
32 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
35 +HOST_ARCH="$host_cpu"
37 linux-gnu*) host_os=linux-gnu
40 host_cpu!$host_cpu$ac_delim
41 host_vendor!$host_vendor$ac_delim
42 host_os!$host_os$ac_delim
43 +HOST_ARCH!$HOST_ARCH$ac_delim
44 HOST_OS!$HOST_OS$ac_delim
46 CFLAGS!$CFLAGS$ac_delim
48 LTLIBOBJS!$LTLIBOBJS$ac_delim
51 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
52 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
54 elif $ac_last_try; then
55 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
56 diff -durN ltrace-0.5.2.orig/configure.ac ltrace-0.5.2/configure.ac
57 --- ltrace-0.5.2.orig/configure.ac 2009-05-21 19:14:54.000000000 +0200
58 +++ ltrace-0.5.2/configure.ac 2009-06-27 15:30:34.000000000 +0200
63 +HOST_ARCH="$host_cpu"
66 dnl Checks for programs.
68 diff -durN ltrace-0.5.2.orig/sysdeps/linux-gnu/Makefile ltrace-0.5.2/sysdeps/linux-gnu/Makefile
69 --- ltrace-0.5.2.orig/sysdeps/linux-gnu/Makefile 2009-05-21 19:14:54.000000000 +0200
70 +++ ltrace-0.5.2/sysdeps/linux-gnu/Makefile 2009-06-27 15:30:34.000000000 +0200
72 -ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
73 - -e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/)
75 CPPFLAGS += -I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH)
77 OBJ = events.o trace.o proc.o breakpoint.o