git.annexia.org
/
hivex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint: use "test x = x", not "test x == x"
[hivex.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
5805ddd
..
1d929b4
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-18,7
+18,7
@@
# major/minor/release must be numbers
m4_define([hivex_major], [1])
m4_define([hivex_minor], [2])
# 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], [])
# extra can be any string
m4_define([hivex_extra], [])
@@
-40,7
+40,7
@@
AC_DEFINE([PACKAGE_VERSION_EXTRA],["hivex_extra"],[Extra version string])
gl_EARLY
gl_INIT
gl_EARLY
gl_INIT
-A
C
_PROG_LIBTOOL
+A
M
_PROG_LIBTOOL
dnl Check for basic C environment.
AC_PROG_CC_STDC
dnl Check for basic C environment.
AC_PROG_CC_STDC
@@
-174,6
+174,7
@@
dnl Check for OCaml (optional, for OCaml bindings).
AC_PROG_OCAML
AC_PROG_FINDLIB
AM_CONDITIONAL([HAVE_OCAML],[test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno"])
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).
if test "x$OCAMLC" != "xno"; then
dnl Check if we have caml/unixsupport.h header (OCaml bindings only).
@@
-192,9
+193,9
@@
if test "x$OCAMLC" != "xno"; then
echo "char $f (); char foo() { return $f (); }" > conftest.c
rm -f conftest_ml.ml
touch conftest_ml.ml
echo "char $f (); char foo() { return $f (); }" > conftest.c
rm -f conftest_ml.ml
touch conftest_ml.ml
- if $OCAML
OPT
-c conftest.c 2>/dev/null && \
- $OCAML
OPT
-c conftest_ml.ml 2>/dev/null && \
- $OCAML
OPT conftest.o conftest_ml.cmx
-o conftest 2>/dev/null ; then
+ if $OCAML
C
-c conftest.c 2>/dev/null && \
+ $OCAML
C
-c conftest_ml.ml 2>/dev/null && \
+ $OCAML
C 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_DEFINE([HAVE_CAML_RAISE_WITH_ARGS],[1],
[Defined if function caml_raise_with_args exists.])
AC_MSG_RESULT([found])
@@
-248,7
+249,7
@@
if test "x$PYTHON" != "xno"; then
AC_MSG_CHECKING([for Python site-packages path])
if test -z "$PYTHON_SITE_PACKAGES"; then
PYTHON_SITE_PACKAGES=`$PYTHON -c "import distutils.sysconfig; \
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])
fi
AC_MSG_RESULT([$PYTHON_SITE_PACKAGES])