X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=6c38cb1521e3b212025f20a3cdae136d4bd800a9;hb=98d83de9444c893fded2e92a3c454ffbda4bd4ad;hp=533f91951ba475820dd8e8992df597c5904691c4;hpb=cf71add9b40824f8acc0fab263b1ec0aa9352ff4;p=hivex.git diff --git a/configure.ac b/configure.ac index 533f919..6c38cb1 100644 --- 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]) -m4_define([hivex_release], [5]) +m4_define([hivex_release], [8]) # 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 -AC_PROG_LIBTOOL +AM_PROG_LIBTOOL dnl Check for basic C environment. AC_PROG_CC_STDC @@ -173,7 +173,10 @@ AC_SUBST([LIBXML2_LIBS]) 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"]) +AM_CONDITIONAL([HAVE_OCAML], + [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) +AM_CONDITIONAL([HAVE_OCAMLOPT], + [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"]) if test "x$OCAMLC" != "xno"; then dnl Check if we have caml/unixsupport.h header (OCaml bindings only). @@ -192,9 +195,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 - 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]) @@ -225,54 +228,32 @@ if test "x$missing_perl_modules" = "xyes"; then fi AM_CONDITIONAL([HAVE_PERL], - [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"]) + [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"]) dnl Check for Python (optional, for Python bindings). AC_CHECK_PROG([PYTHON],[python],[python],[no]) PYTHON_PREFIX= PYTHON_VERSION= -PYTHON_INCLUDEDIR= -PYTHON_SITE_PACKAGES= if test "x$PYTHON" != "xno"; then PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"` PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` - for d in \ - $PYTHON_PREFIX/include/python$PYTHON_VERSION \ - /usr/include/python$PYTHON_VERSION \ - /usr/local/include/python$PYTHON_VERSION - do - AC_MSG_CHECKING([Python.h in $d]) - if test -r "$d/Python.h"; then - AC_MSG_RESULT([found]) - PYTHON_INCLUDEDIR=$d - break - fi - AC_MSG_RESULT([not found]) - done - if test "x$PYTHON_INCLUDEDIR" = "x"; then - AC_MSG_WARN([Python include directory not found]) + + AC_MSG_CHECKING([for Python include path]) + if test -z "$PYTHON_INCLUDEDIR"; then + python_path=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_inc ());"` + PYTHON_INCLUDEDIR=$python_path fi + AC_MSG_RESULT([$PYTHON_INCLUDEDIR]) - for d in \ - $PYTHON_PREFIX/lib64/python$PYTHON_VERSION/site-packages \ - $PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages \ - /usr/lib64/python$PYTHON_VERSION/site-packages \ - /usr/lib/python$PYTHON_VERSION/site-packages \ - /usr/local/lib/python$PYTHON_VERSION/site-packages - do - AC_MSG_CHECKING([for $d]) - if test -d "$d"; then - AC_MSG_RESULT([found]) - PYTHON_SITE_PACKAGES=$d - break - fi - AC_MSG_RESULT([not found]) - done - if test "x$PYTHON_SITE_PACKAGES" = "x"; then - AC_MSG_WARN([Python site-packages directory not 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(1,0));"` fi + AC_MSG_RESULT([$PYTHON_SITE_PACKAGES]) old_LIBS="$LIBS" LIBS="$LIBS -lpython$PYTHON_VERSION" @@ -286,14 +267,14 @@ AC_SUBST(PYTHON_INCLUDEDIR) AC_SUBST(PYTHON_SITE_PACKAGES) AM_CONDITIONAL([HAVE_PYTHON], - [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x"]) + [test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_SITE_PACKAGES" != "x"]) dnl dnl Check for Ruby and rake (optional, for Ruby bindings). dnl AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0]) dnl AC_CHECK_PROG([RAKE],[rake],[rake],[no]) dnl AM_CONDITIONAL([HAVE_RUBY], -dnl [test "x$RAKE" != "xno" -a -n "$HAVE_LIBRUBY"]) +dnl [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"]) dnl dnl Check for Java. dnl AC_ARG_WITH(java_home, @@ -303,7 +284,7 @@ dnl [], dnl [with_java_home=check]) dnl if test "x$with_java_home" != "xno"; then -dnl if test "x$with_java_home" != "xyes" -a "x$with_java_home" != "xcheck" +dnl if test "x$with_java_home" != "xyes" && test "x$with_java_home" != "xcheck" dnl then dnl # Reject unsafe characters in $JAVA_HOME dnl jh_lf=' @@ -325,7 +306,7 @@ dnl for d in \ dnl /usr/lib/jvm/java \ dnl /usr/lib/jvm/java-6-openjdk dnl do -dnl if test -d $d -a -f $d/bin/java; then +dnl if test -d $d && test -f $d/bin/java; then dnl JAVA_HOME=$d dnl break dnl fi @@ -444,6 +425,7 @@ dnl [test "x$GHC" != "xno"]) dnl Produce output files. AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile + generator/Makefile gnulib/lib/Makefile gnulib/tests/Makefile hivex.pc @@ -457,6 +439,7 @@ AC_CONFIG_FILES([Makefile regedit/Makefile sh/Makefile xml/Makefile]) +AC_CONFIG_FILES([python/run-python-tests], [chmod +x python/run-python-tests]) AC_OUTPUT dnl Produce summary.