# major/minor/release must be numbers
m4_define([hivex_major], [1])
m4_define([hivex_minor], [2])
-m4_define([hivex_release], [5])
+m4_define([hivex_release], [7])
# extra can be any string
m4_define([hivex_extra], [])
gl_EARLY
gl_INIT
-AC_PROG_LIBTOOL
+AM_PROG_LIBTOOL
dnl Check for basic C environment.
AC_PROG_CC_STDC
AC_PROG_OCAML
AC_PROG_FINDLIB
AM_CONDITIONAL([HAVE_OCAML],[test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno"])
+AM_CONDITIONAL([HAVE_OCAMLOPT], [test "x$OCAMLOPT" != "xno" -a "x$OCAMLFIND" != "xno"])
if test "x$OCAMLC" != "xno"; then
dnl Check if we have caml/unixsupport.h header (OCaml bindings only).
echo "char $f (); char foo() { return $f (); }" > conftest.c
rm -f conftest_ml.ml
touch conftest_ml.ml
- if $OCAMLOPT -c conftest.c 2>/dev/null && \
- $OCAMLOPT -c conftest_ml.ml 2>/dev/null && \
- $OCAMLOPT conftest.o conftest_ml.cmx -o conftest 2>/dev/null ; then
+ if $OCAMLC -c conftest.c 2>/dev/null && \
+ $OCAMLC -c conftest_ml.ml 2>/dev/null && \
+ $OCAMLC conftest.o conftest_ml.cmo -o conftest 2>/dev/null ; then
AC_DEFINE([HAVE_CAML_RAISE_WITH_ARGS],[1],
[Defined if function caml_raise_with_args exists.])
AC_MSG_RESULT([found])
AC_MSG_CHECKING([for Python site-packages path])
if test -z "$PYTHON_SITE_PACKAGES"; then
PYTHON_SITE_PACKAGES=`$PYTHON -c "import distutils.sysconfig; \
- print (distutils.sysconfig.get_python_lib(0,0));"`
+ print (distutils.sysconfig.get_python_lib(1,0));"`
fi
AC_MSG_RESULT([$PYTHON_SITE_PACKAGES])