Fix handling of OCAML_PKG_* macros for new OCaml autoconf.

diff --git a/Makefile.in b/Makefile.in
index a324882..3f626ba 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,8 +33,8 @@ BYTESWAP_H    = @BYTESWAP_H@
 OCAMLLIB       = @OCAMLLIB@
 top_srcdir     = @top_srcdir@
 
-pkg_cil                = @pkg_cil@
-pkg_extlib     = @pkg_extlib@
+pkg_cil                = @OCAML_PKG_cil@
+pkg_extlib     = @OCAML_PKG_extlib@
 
 enable_coverage = @enable_coverage@
 

diff --git a/configure.ac b/configure.ac
index a943d59..09edb90 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,11 +66,9 @@ fi
 
 dnl Check for Extlib (optional)
 AC_CHECK_OCAML_PKG(extlib)
-AC_SUBST(pkg_extlib)
 
 dnl Check for CIL (optional)
 AC_CHECK_OCAML_PKG(cil)
-AC_SUBST(pkg_cil)
 
 dnl Check for /usr/bin/time and get full path.
 AC_PATH_PROG(TIME,time,no)