@@ -1,24 +1,29 @@
-dnl  AUTOCONF configuration for CALLBACK
-dnl  Bruno Haible 2000-04-02
+dnl AUTOCONF configuration for CALLBACK
+dnl Bruno Haible 2000-04-02
+dnl Sam Steingold 2008-2010
 dnl
-AC_INIT(trampoline_r/trampoline_r.h.in)
+AC_INIT(libffcall/callback,m4_normalize(m4_esyscmd([cat ../VERSION])))
+AC_CONFIG_SRCDIR(callback.h.in)
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([callback.h],
+[sed "s/@LIBFFCALL_VERSION@/${LIBFFCALL_VERSION}/" callback.h > tmp
+mv -f tmp callback.h],[LIBFFCALL_VERSION=$PACKAGE_VERSION])
+AC_CONFIG_FILES(Makefile)
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_GCC_TRADITIONAL
 CL_CC_GCC
-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
+FFCALL_COMMON_LIBTOOL
 dnl This piece of sed script replaces every line containing '@subdir@'
 dnl by several consecutive lines, each referencing one subdir.
 extrasub="$extrasub"'
 /@subdir@/{
 h
@@ -30,6 +35,6 @@
 p
 d
 }
 '
 CL_CONFIG_SUBDIRS(vacall_r trampoline_r)
-AC_OUTPUT(Makefile)
+AC_OUTPUT