From: Richard W.M. Jones <rich@annexia.org>
Date: Fri, 8 Jan 2010 15:10:04 +0000 (+0000)
Subject: Fix handling of OCAML_PKG_* macros for new OCaml autoconf.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;ds=sidebyside;h=3d83aa1b97a0eb15ee4e9d5eb27df12dfeee4852;p=ocaml-bitstring.git

Fix handling of OCAML_PKG_* macros for new OCaml autoconf.
---

diff --git a/Makefile.in b/Makefile.in
index a324882..3f626ba 100644
--- 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
--- 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)