@@ -1,62 +1,54 @@
-dnl  AUTOCONF configuration for TRAMPOLINE
-dnl  Bruno Haible 2001-01-27
+dnl AUTOCONF configuration for TRAMPOLINE_R
+dnl Bruno Haible 2001-01-27
+dnl Sam Steingold 2008-2010
 dnl
-AC_INIT(trampoline_r.h.in)
-AC_CONFIG_HEADER(config.h)
+AC_INIT(libffcall/trampoline_r,m4_normalize(m4_esyscmd([cat ../../VERSION])))
+AC_CONFIG_SRCDIR(trampoline_r.h.in)
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([trampoline_r.h],
+[sed "s/@LIBFFCALL_VERSION@/${LIBFFCALL_VERSION}/" trampoline_r.h > tmp
+mv -f tmp trampoline_r.h],[LIBFFCALL_VERSION=$PACKAGE_VERSION])
+AC_CONFIG_FILES(Makefile)
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_GCC_TRADITIONAL
 CL_CC_GCC
 CL_AS_UNDERSCORE
-CL_PROG_RANLIB
+AC_PROG_RANLIB
 AC_PROG_MAKE_SET
-CL_PROG_INSTALL
-CL_PROG_CP
+AC_CONFIG_AUX_DIR(../../build-aux)
+AC_PROG_INSTALL
 CL_PROG_LN
 CL_PROG_LN_S
-CL_CANONICAL_HOST(../../autoconf)
-CL_CANONICAL_HOST_CPU_FOR_FFCALL
+gl_HOST_CPU_C_ABI
 PACKAGE=callback
-AM_DISABLE_SHARED
-AM_PROG_LIBTOOL
-CL_VOID
-CL_STDC_HEADERS
+FFCALL_COMMON_LIBTOOL
 AC_CHECK_HEADERS(unistd_h)
-CL_GETPAGESIZE
-CL_MACH_VM
-CL_OPENFLAGS
-CL_MMAP
-CL_MPROTECT
-CL_SHM_H
-CL_SHM
-dnl See above. Avoid duplicate warning.
-dnl CL_CANONICAL_HOST(../../autoconf)
-dnl CL_CANONICAL_HOST_CPU_FOR_FFCALL
-CL_CODEEXEC
+FFCALL_COMMON_TRAMPOLINE
 CPU_OBJECTS=''
-if test ${host_cpu} = hppa -o ${host_cpu} = ia64; then
+if test ${HOST_CPU_C_ABI} = hppa -o ${HOST_CPU_C_ABI} = powerpc64 -o ${HOST_CPU_C_ABI} = ia64; then
   CPU_OBJECTS="$CPU_OBJECTS "'tramp-$(CPU).lo'
 fi
-if test ${host_cpu} = rs6000; then
+if test ${HOST_CPU_C_ABI} = powerpc; then
   case "${host_os}" in
     aix*) CPU_OBJECTS="$CPU_OBJECTS "'tramp-$(CPU).lo' ;;
     *) ;;
   esac
 fi
-if test ${host_cpu} = sparc -o ${host_cpu} = sparc64 -o ${host_cpu} = alpha -o ${host_cpu} = hppa -o ${host_cpu} = convex; then
+if test ${HOST_CPU_C_ABI} = sparc -o ${HOST_CPU_C_ABI} = sparc64 -o ${HOST_CPU_C_ABI} = alpha -o ${HOST_CPU_C_ABI} = hppa -o ${HOST_CPU_C_ABI} = convex -o ${HOST_CPU_C_ABI} = arm -o ${HOST_CPU_C_ABI} = armel; then
   CPU_OBJECTS="$CPU_OBJECTS "'cache-$(CPU).lo'
 fi
-if test ${host_cpu} = rs6000; then
+if test ${HOST_CPU_C_ABI} = powerpc; then
   case "${host_os}" in
     aix*) ;;
     *) CPU_OBJECTS="$CPU_OBJECTS "'cache-$(CPU).lo' ;;
   esac
 fi
 AC_SUBST(CPU_OBJECTS)
-if test ${host_cpu} = mips -o ${host_cpu} = mipsn32 -o ${host_cpu} = mips64; then
+if test ${HOST_CPU_C_ABI} = mips -o ${HOST_CPU_C_ABI} = mipsn32 -o ${HOST_CPU_C_ABI} = mips64; then
 AC_CHECK_HEADERS(sys/cachectl.h)
 fi
-if test ${host_cpu} = m88k; then
+if test ${HOST_CPU_C_ABI} = m88k; then
 AC_CHECK_HEADERS(sys/m88kbcs.h)
 fi
-AC_OUTPUT(Makefile)
+AC_OUTPUT