@@ -1,23 +1,28 @@
-dnl  AUTOCONF configuration for VACALL
-dnl  Bruno Haible 2000-04-02
+dnl AUTOCONF configuration for VACALL
+dnl Bruno Haible 2000-04-02
+dnl Sam Steingold 2008-2010
 dnl
-AC_INIT(vacall.h.in)
-AC_CONFIG_HEADER(vacall.h config.h)
+AC_INIT(libffcall/vacall,m4_normalize(m4_esyscmd([cat ../VERSION])))
+AC_CONFIG_SRCDIR(vacall.h.in)
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([vacall.h],
+[sed "s/@LIBFFCALL_VERSION@/${LIBFFCALL_VERSION}/" vacall.h > tmp
+mv -f tmp vacall.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_CANONICAL_HOST(../autoconf)
-CL_CANONICAL_HOST_CPU_FOR_FFCALL
-CL_PCC_STRUCT_RETURN
-CL_SMALL_STRUCT_RETURN
-CL_IREG_FLOAT_RETURN
-CL_LONGLONG
+gl_HOST_CPU_C_ABI
+FFCALL_PCC_STRUCT_RETURN
+FFCALL_SMALL_STRUCT_RETURN
+FFCALL_IREG_FLOAT_RETURN
+AC_TYPE_LONG_LONG_INT
 AC_C_CHAR_UNSIGNED
-AC_OUTPUT(Makefile)
+AC_OUTPUT