jocke@1671: diff -ruN strace-4.5.19.orig/config.h.in strace-4.5.19/config.h.in
jocke@1671: --- strace-4.5.19.orig/config.h.in	2009-10-21 19:41:12.000000000 +0200
jocke@1671: +++ strace-4.5.19/config.h.in	2010-01-01 10:39:36.000000000 +0100
jocke@1671: @@ -161,6 +161,9 @@
jocke@1671:  /* Define if stat64 is available in asm/stat.h. */
jocke@1671:  #undef HAVE_STAT64
jocke@1671:  
jocke@1671: +/* Define if statfs64 is available in sys/statfs.h or sys/vfs.h. */
jocke@1671: +#undef HAVE_STATFS64
jocke@1671: +
jocke@1671:  /* Define to 1 if stdbool.h conforms to C99. */
jocke@1671:  #undef HAVE_STDBOOL_H
jocke@1671:  
jocke@1671: diff -ruN strace-4.5.19.orig/configure strace-4.5.19/configure
jocke@1671: --- strace-4.5.19.orig/configure	2010-01-01 10:38:49.000000000 +0100
jocke@1671: +++ strace-4.5.19/configure	2010-01-01 10:39:36.000000000 +0100
jocke@1671: @@ -5374,6 +5374,44 @@
jocke@1671:  
jocke@1671:  fi
jocke@1671:  
jocke@1671: +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for statfs64 in sys/(statfs|vfs).h" >&5
jocke@1671: +$as_echo_n "checking for statfs64 in sys/(statfs|vfs).h... " >&6; }
jocke@1671: +if test "${ac_cv_type_statfs64+set}" = set; then :
jocke@1671: +  $as_echo_n "(cached) " >&6
jocke@1671: +else
jocke@1671: +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
jocke@1671: +/* end confdefs.h.  */
jocke@1671: +#ifdef LINUX
jocke@1671: +#include <linux/types.h>
jocke@1671: +#include <sys/statfs.h>
jocke@1671: +#else
jocke@1671: +#include <sys/vfs.h>
jocke@1671: +#endif
jocke@1671: +int
jocke@1671: +main ()
jocke@1671: +{
jocke@1671: +struct statfs64 st;
jocke@1671: +  ;
jocke@1671: +  return 0;
jocke@1671: +}
jocke@1671: +_ACEOF
jocke@1671: +if ac_fn_c_try_compile "$LINENO"; then :
jocke@1671: +  ac_cv_type_statfs64=yes
jocke@1671: +else
jocke@1671: +  ac_cv_type_statfs64=no
jocke@1671: +fi
jocke@1671: +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
jocke@1671: +fi
jocke@1671: +
jocke@1671: +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_statfs64" >&5
jocke@1671: +$as_echo "$ac_cv_type_statfs64" >&6; }
jocke@1671: +if test "$ac_cv_type_statfs64" = yes
jocke@1671: +then
jocke@1671: +
jocke@1671: +$as_echo "#define HAVE_STATFS64 1" >>confdefs.h
jocke@1671: +
jocke@1671: +fi
jocke@1671: +
jocke@1671:  
jocke@1671:  { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
jocke@1671:  $as_echo_n "checking return type of signal handlers... " >&6; }
jocke@1671: @@ -5773,73 +5811,6 @@
jocke@1671:  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
jocke@1671:  /* end confdefs.h.  */
jocke@1671:  
jocke@1671: -echo "$as_me:$LINENO: checking for statfs64 in sys/(statfs|vfs).h" >&5
jocke@1671: -echo $ECHO_N "checking for statfs64 in sys/(statfs|vfs).h... $ECHO_C" >&6
jocke@1671: -if test "${ac_cv_type_statfs64+set}" = set; then
jocke@1671: -  echo $ECHO_N "(cached) $ECHO_C" >&6
jocke@1671: -else
jocke@1671: -  cat >conftest.$ac_ext <<_ACEOF
jocke@1671: -/* confdefs.h.  */
jocke@1671: -_ACEOF
jocke@1671: -cat confdefs.h >>conftest.$ac_ext
jocke@1671: -cat >>conftest.$ac_ext <<_ACEOF
jocke@1671: -/* end confdefs.h.  */
jocke@1671: -#ifdef LINUX
jocke@1671: -#include <linux/types.h>
jocke@1671: -#include <sys/statfs.h>
jocke@1671: -#else
jocke@1671: -#include <sys/vfs.h>
jocke@1671: -#endif
jocke@1671: -int
jocke@1671: -main ()
jocke@1671: -{
jocke@1671: -struct statfs64 st;
jocke@1671: -  ;
jocke@1671: -  return 0;
jocke@1671: -}
jocke@1671: -_ACEOF
jocke@1671: -rm -f conftest.$ac_objext
jocke@1671: -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
jocke@1671: -  (eval $ac_compile) 2>conftest.er1
jocke@1671: -  ac_status=$?
jocke@1671: -  grep -v '^ *+' conftest.er1 >conftest.err
jocke@1671: -  rm -f conftest.er1
jocke@1671: -  cat conftest.err >&5
jocke@1671: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
jocke@1671: -  (exit $ac_status); } &&
jocke@1671: -	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
jocke@1671: -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
jocke@1671: -  (eval $ac_try) 2>&5
jocke@1671: -  ac_status=$?
jocke@1671: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
jocke@1671: -  (exit $ac_status); }; } &&
jocke@1671: -	 { ac_try='test -s conftest.$ac_objext'
jocke@1671: -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
jocke@1671: -  (eval $ac_try) 2>&5
jocke@1671: -  ac_status=$?
jocke@1671: -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
jocke@1671: -  (exit $ac_status); }; }; then
jocke@1671: -  ac_cv_type_statfs64=yes
jocke@1671: -else
jocke@1671: -  echo "$as_me: failed program was:" >&5
jocke@1671: -sed 's/^/| /' conftest.$ac_ext >&5
jocke@1671: -
jocke@1671: -ac_cv_type_statfs64=no
jocke@1671: -fi
jocke@1671: -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
jocke@1671: -fi
jocke@1671: -
jocke@1671: -echo "$as_me:$LINENO: result: $ac_cv_type_statfs64" >&5
jocke@1671: -echo "${ECHO_T}$ac_cv_type_statfs64" >&6
jocke@1671: -if test "$ac_cv_type_statfs64" = yes
jocke@1671: -then
jocke@1671: -
jocke@1671: -cat >>confdefs.h <<\_ACEOF
jocke@1671: -#define HAVE_STATFS64 1
jocke@1671: -_ACEOF
jocke@1671: -
jocke@1671: -fi
jocke@1671: -
jocke@1671:  
jocke@1671:  int
jocke@1671:  main ()
jocke@1671: @@ -5947,7 +5918,7 @@
jocke@1671:  do :
jocke@1671:    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
jocke@1671:  ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <stddef.h>
jocke@1671: -#include <linux/socket.h>
jocke@1671: +#include <sys/socket.h>
jocke@1671:  "
jocke@1671:  eval as_val=\$$as_ac_Header
jocke@1671:     if test "x$as_val" = x""yes; then :
jocke@1671: diff -ruN strace-4.5.19.orig/Makefile.in strace-4.5.19/Makefile.in
jocke@1671: --- strace-4.5.19.orig/Makefile.in	2009-10-21 19:41:14.000000000 +0200
jocke@1671: +++ strace-4.5.19/Makefile.in	2010-01-01 10:39:36.000000000 +0100
jocke@1671: @@ -42,8 +42,9 @@
jocke@1671:  subdir = .
jocke@1671:  DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
jocke@1671:  	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
jocke@1671: -	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS INSTALL \
jocke@1671: -	NEWS TODO config.guess config.sub depcomp install-sh missing
jocke@1671: +	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS \
jocke@1671: +	ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \
jocke@1671: +	install-sh missing
jocke@1671:  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
jocke@1671:  am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
jocke@1671:  	$(top_srcdir)/configure.ac