From 27cea5d68b4e04f11fab075d82b0d771b845c4f8 Mon Sep 17 00:00:00 2001 From: Jerome Soumagne Date: Wed, 11 Dec 2013 13:44:53 -0500 Subject: [svn-r24530] Fix autotools to find/include numpy headers --- Makefile.in | 4 + acinclude.m4 | 1 + c++/Makefile.in | 4 + c++/examples/Makefile.in | 4 + c++/src/Makefile.in | 4 + c++/test/Makefile.in | 4 + configure | 238 ++++++++++++++++++++++++++++++++++++++++ configure.ac | 22 +++- examples/Makefile.in | 4 + fortran/Makefile.in | 4 + fortran/examples/Makefile.in | 4 + fortran/src/Makefile.in | 4 + fortran/test/Makefile.in | 4 + fortran/testpar/Makefile.in | 4 + hl/Makefile.in | 4 + hl/c++/Makefile.in | 4 + hl/c++/examples/Makefile.in | 4 + hl/c++/src/Makefile.in | 4 + hl/c++/test/Makefile.in | 4 + hl/examples/Makefile.in | 4 + hl/fortran/Makefile.in | 4 + hl/fortran/examples/Makefile.in | 4 + hl/fortran/src/Makefile.in | 4 + hl/fortran/test/Makefile.in | 4 + hl/src/Makefile.in | 4 + hl/test/Makefile.in | 4 + hl/tools/Makefile.in | 4 + hl/tools/gif2h5/Makefile.in | 4 + m4/ax_python.m4 | 98 +++++++++++++++++ perform/Makefile.in | 4 + src/H5config.h.in | 6 + src/Makefile.in | 4 + test/Makefile.in | 4 + testpar/Makefile.in | 4 + tools/Makefile.in | 4 + tools/h5copy/Makefile.in | 4 + tools/h5diff/Makefile.in | 4 + tools/h5dump/Makefile.in | 4 + tools/h5import/Makefile.in | 4 + tools/h5jam/Makefile.in | 4 + tools/h5ls/Makefile.in | 4 + tools/h5repack/Makefile.in | 4 + tools/h5stat/Makefile.in | 4 + tools/lib/Makefile.in | 4 + tools/misc/Makefile.in | 4 + 45 files changed, 524 insertions(+), 1 deletion(-) create mode 100644 m4/ax_python.m4 diff --git a/Makefile.in b/Makefile.in index a2ecac5..0e7a030 100644 --- a/Makefile.in +++ b/Makefile.in @@ -94,6 +94,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -327,10 +328,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/acinclude.m4 b/acinclude.m4 index fe5aeb7..0f59e42 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,2 +1,3 @@ +m4_include([m4/ax_python.m4]) m4_include([m4/ax_python_devel.m4]) diff --git a/c++/Makefile.in b/c++/Makefile.in index 52181cf..62cb272 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -74,6 +74,7 @@ TESTS = subdir = c++ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -292,10 +293,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 181bdc8..279d5de 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -80,6 +80,7 @@ TESTS = $(TEST_SCRIPT) subdir = c++/examples ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -259,10 +260,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index a5bbf2f..a300831 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -82,6 +82,7 @@ TESTS = subdir = c++/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -335,10 +336,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index cb0c48b..cdd159d 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -79,6 +79,7 @@ TESTS = $(am__EXEEXT_1) subdir = c++/test ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -295,10 +296,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/configure b/configure index c93f8aa..a6649c7 100755 --- a/configure +++ b/configure @@ -693,6 +693,9 @@ PYTHON_SITE_PKG PYTHON_LDFLAGS PYTHON_CPPFLAGS PYTHON_VERSION +PYTHON_LIB +PYTHON_INCLUDE_DIR +PYTHON_BIN CLEARFILEBUF INSTRUMENT_LIBRARY TRACE_API @@ -28997,6 +29000,185 @@ fi case "X-$enableval" in X-yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python build information" >&5 +$as_echo_n "checking for python build information... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } +for python in python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do +for ac_prog in $python +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PYTHON_BIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PYTHON_BIN"; then + ac_cv_prog_PYTHON_BIN="$PYTHON_BIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_PYTHON_BIN="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +PYTHON_BIN=$ac_cv_prog_PYTHON_BIN +if test -n "$PYTHON_BIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_BIN" >&5 +$as_echo "$PYTHON_BIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$PYTHON_BIN" && break +done + +ax_python_bin=$PYTHON_BIN +if test x$ax_python_bin != x; then + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_python_bin''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$ax_python_bin" >&5 +$as_echo_n "checking for main in -l$ax_python_bin... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_python_bin $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#ifdef FC_DUMMY_MAIN +#ifndef FC_DUMMY_MAIN_EQ_F77 +# ifdef __cplusplus + extern "C" +# endif + int FC_DUMMY_MAIN() { return 1; } +#endif +#endif +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + ax_python_lib=$ax_python_bin +else + ax_python_lib=no +fi + + if test x$ax_python_lib == xno; then + as_ac_Lib=`$as_echo "ac_cv_lib_${ax_python_bin}m''_main" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l${ax_python_bin}m" >&5 +$as_echo_n "checking for main in -l${ax_python_bin}m... " >&6; } +if eval \${$as_ac_Lib+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l${ax_python_bin}m $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#ifdef FC_DUMMY_MAIN +#ifndef FC_DUMMY_MAIN_EQ_F77 +# ifdef __cplusplus + extern "C" +# endif + int FC_DUMMY_MAIN() { return 1; } +#endif +#endif +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + ax_python_lib=${ax_python_bin}m +else + ax_python_lib=no +fi + + fi + if test x$ax_python_lib != xno; then + ax_python_header=`$ax_python_bin -c "from distutils.sysconfig import *; print(get_config_var('CONFINCLUDEPY'))"` + if test x$ax_python_header != x; then + break; + fi + fi +fi +done +if test x$ax_python_bin = x; then + ax_python_bin=no +fi +if test x$ax_python_header = x; then + ax_python_header=no +fi +if test x$ax_python_lib = x; then + ax_python_lib=no +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: results of the Python check:" >&5 +$as_echo " results of the Python check:" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Binary: $ax_python_bin" >&5 +$as_echo " Binary: $ax_python_bin" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Library: $ax_python_lib" >&5 +$as_echo " Library: $ax_python_lib" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Include Dir: $ax_python_header" >&5 +$as_echo " Include Dir: $ax_python_header" >&6; } + +if test x$ax_python_header != xno; then + PYTHON_INCLUDE_DIR=$ax_python_header + +fi +if test x$ax_python_lib != xno; then + PYTHON_LIB=$ax_python_lib + +fi + # # Allow the use of a (user set) custom python version @@ -29367,6 +29549,7 @@ $as_echo_n "checking for Python support... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include + #ifdef FC_DUMMY_MAIN #ifndef FC_DUMMY_MAIN_EQ_F77 # ifdef __cplusplus @@ -29400,6 +29583,61 @@ fi done + # Get NumPy header + PYTHON_NUMPY_INCLUDE_DIR=`$PYTHON_BIN -c 'import numpy; print numpy.get_include()'` + CPPFLAGS="$CPPFLAGS -I$PYTHON_NUMPY_INCLUDE_DIR" + AM_CPPFLAGS="$AM_CPPFLAGS -I$PYTHON_NUMPY_INCLUDE_DIR" + for ac_header in numpy/ndarrayobject.h +do : + ac_fn_c_check_header_compile "$LINENO" "numpy/ndarrayobject.h" "ac_cv_header_numpy_ndarrayobject_h" "#include + +" +if test "x$ac_cv_header_numpy_ndarrayobject_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NUMPY_NDARRAYOBJECT_H 1 +_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python NumPy support" >&5 +$as_echo_n "checking for Python NumPy support... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + +#ifdef FC_DUMMY_MAIN +#ifndef FC_DUMMY_MAIN_EQ_F77 +# ifdef __cplusplus + extern "C" +# endif + int FC_DUMMY_MAIN() { return 1; } +#endif +#endif +int +main () +{ +Py_Initialize(); import_array(); Py_Finalize(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +$as_echo "#define HAVE_PYTHON_NUMPY 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + PYTHON_NUMPY="yes" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PYTHON_NUMPY="no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + as_fn_error $? "Could not find or include numpy/ndarrayobject.h" "$LINENO" 5 +fi + +done + ;; X-no|*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 diff --git a/configure.ac b/configure.ac index eb2e739..a9ed5b4 100644 --- a/configure.ac +++ b/configure.ac @@ -2935,6 +2935,7 @@ AC_ARG_ENABLE([python], [enableval=no]) case "X-$enableval" in X-yes) + AX_PYTHON AX_PYTHON_DEVEL CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS" AM_CPPFLAGS="$AM_CPPFLAGS $PYTHON_CPPFLAGS" @@ -2942,7 +2943,8 @@ case "X-$enableval" in AM_LDFLAGS="$AM_LDFLAGS $PYTHON_LDFLAGS" AC_CHECK_HEADERS([Python.h], [AC_MSG_CHECKING([for Python support]) - AC_TRY_COMPILE([#include ], + AC_TRY_COMPILE([#include + ], [Py_Initialize(); Py_Finalize();], [AC_DEFINE([HAVE_PYTHON], [1], [Define if we have Python support]) @@ -2950,6 +2952,24 @@ case "X-$enableval" in PYTHON="yes"], [AC_MSG_RESULT([no]) PYTHON="no"])]) + # Get NumPy header + PYTHON_NUMPY_INCLUDE_DIR=`$PYTHON_BIN -c 'import numpy; print numpy.get_include()'` + CPPFLAGS="$CPPFLAGS -I$PYTHON_NUMPY_INCLUDE_DIR" + AM_CPPFLAGS="$AM_CPPFLAGS -I$PYTHON_NUMPY_INCLUDE_DIR" + AC_CHECK_HEADERS([numpy/ndarrayobject.h], [AC_MSG_CHECKING([for Python NumPy support]) + AC_TRY_COMPILE([#include + #include + ], + [Py_Initialize(); import_array(); Py_Finalize();], + [AC_DEFINE([HAVE_PYTHON_NUMPY], [1], + [Define if we have Python NumPy support]) + AC_MSG_RESULT([yes]) + PYTHON_NUMPY="yes"], + [AC_MSG_RESULT([no]) + PYTHON_NUMPY="no"])], + [AC_MSG_ERROR([Could not find or include numpy/ndarrayobject.h])], + [#include + ]) ;; X-no|*) AC_MSG_RESULT([no]) diff --git a/examples/Makefile.in b/examples/Makefile.in index bb1f3be..4574df3 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -80,6 +80,7 @@ TESTS = $(TEST_SCRIPT) subdir = examples ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -259,10 +260,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index c7ec5b6..1c11cc8 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -78,6 +78,7 @@ TESTS = subdir = fortran ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -296,10 +297,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index a94e7cb..44b967a 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -88,6 +88,7 @@ TESTS = $(TEST_SCRIPT) subdir = fortran/examples ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -267,10 +268,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 08963e5..1c3ed55 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -85,6 +85,7 @@ TESTS = subdir = fortran/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -386,10 +387,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 5fb4ae0..49e5876 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -82,6 +82,7 @@ TESTS = $(am__EXEEXT_2) subdir = fortran/test ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -370,10 +371,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index c472279..437b216 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -82,6 +82,7 @@ TESTS = subdir = fortran/testpar ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -294,10 +295,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/Makefile.in b/hl/Makefile.in index 93ca102..14b06d2 100644 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -78,6 +78,7 @@ TESTS = subdir = hl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -296,10 +297,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index c7115ab..9d1da3c 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -74,6 +74,7 @@ TESTS = subdir = hl/c++ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -292,10 +293,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 8ed0196..f41a933 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -79,6 +79,7 @@ TESTS = subdir = hl/c++/examples ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -258,10 +259,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index e8af175..dafd53b 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -81,6 +81,7 @@ TESTS = subdir = hl/c++/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -326,10 +327,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 844dfb2..211c7ae 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -78,6 +78,7 @@ TESTS = $(am__EXEEXT_1) subdir = hl/c++/test ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -291,10 +292,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 6ed04f9..9c305d8 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -79,6 +79,7 @@ TESTS = subdir = hl/examples ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -258,10 +259,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 38fc034..7eaf5ad 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -78,6 +78,7 @@ TESTS = subdir = hl/fortran ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -296,10 +297,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 628bad7..b27bae5 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -80,6 +80,7 @@ TESTS = subdir = hl/fortran/examples ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -259,10 +260,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 3560b7d..0f5deca 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -81,6 +81,7 @@ TESTS = subdir = hl/fortran/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -342,10 +343,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 60a24f6..35ca3e5 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -80,6 +80,7 @@ TESTS = $(am__EXEEXT_1) subdir = hl/fortran/test ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -305,10 +306,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 88aa410..da7f5ce 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -78,6 +78,7 @@ TESTS = subdir = hl/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -325,10 +326,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index bcc320f..d3b3576 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -80,6 +80,7 @@ TESTS = $(am__EXEEXT_1) subdir = hl/test ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -332,10 +333,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 704970e..33cfabe 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -74,6 +74,7 @@ TESTS = subdir = hl/tools ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -293,10 +294,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 8c4f6ae..9b60537 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -78,6 +78,7 @@ TESTS = $(TEST_SCRIPT) subdir = hl/tools/gif2h5 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -307,10 +308,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/m4/ax_python.m4 b/m4/ax_python.m4 new file mode 100644 index 0000000..ebfb8d6 --- /dev/null +++ b/m4/ax_python.m4 @@ -0,0 +1,98 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_python.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PYTHON +# +# DESCRIPTION +# +# This macro does a complete Python development environment check. +# +# It recurses through several python versions (from 2.1 to 2.6 in this +# version), looking for an executable. When it finds an executable, it +# looks to find the header files and library. +# +# It sets PYTHON_BIN to the name of the python executable, +# PYTHON_INCLUDE_DIR to the directory holding the header files, and +# PYTHON_LIB to the name of the Python library. +# +# This macro calls AC_SUBST on PYTHON_BIN (via AC_CHECK_PROG), +# PYTHON_INCLUDE_DIR and PYTHON_LIB. +# +# LICENSE +# +# Copyright (c) 2008 Michael Tindal +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 14 + +AC_DEFUN([AX_PYTHON], +[AC_MSG_CHECKING(for python build information) +AC_MSG_RESULT([]) +for python in python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do +AC_CHECK_PROGS(PYTHON_BIN, [$python]) +ax_python_bin=$PYTHON_BIN +if test x$ax_python_bin != x; then + AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no) + if test x$ax_python_lib == xno; then + AC_CHECK_LIB(${ax_python_bin}m, main, ax_python_lib=${ax_python_bin}m, ax_python_lib=no) + fi + if test x$ax_python_lib != xno; then + ax_python_header=`$ax_python_bin -c "from distutils.sysconfig import *; print(get_config_var('CONFINCLUDEPY'))"` + if test x$ax_python_header != x; then + break; + fi + fi +fi +done +if test x$ax_python_bin = x; then + ax_python_bin=no +fi +if test x$ax_python_header = x; then + ax_python_header=no +fi +if test x$ax_python_lib = x; then + ax_python_lib=no +fi + +AC_MSG_RESULT([ results of the Python check:]) +AC_MSG_RESULT([ Binary: $ax_python_bin]) +AC_MSG_RESULT([ Library: $ax_python_lib]) +AC_MSG_RESULT([ Include Dir: $ax_python_header]) + +if test x$ax_python_header != xno; then + PYTHON_INCLUDE_DIR=$ax_python_header + AC_SUBST(PYTHON_INCLUDE_DIR) +fi +if test x$ax_python_lib != xno; then + PYTHON_LIB=$ax_python_lib + AC_SUBST(PYTHON_LIB) +fi +])dnl diff --git a/perform/Makefile.in b/perform/Makefile.in index 65d9e4c..52213f4 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -83,6 +83,7 @@ TESTS = $(am__EXEEXT_3) subdir = perform ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -333,10 +334,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/src/H5config.h.in b/src/H5config.h.in index dda2388..d99c709 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -301,6 +301,9 @@ /* Define if `MPI_Info_c2f' and `MPI_Info_f2c' exists */ #undef HAVE_MPI_MULTI_LANG_Info +/* Define to 1 if you have the header file. */ +#undef HAVE_NUMPY_NDARRAYOBJECT_H + /* Define if we have parallel support */ #undef HAVE_PARALLEL @@ -316,6 +319,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_PYTHON_H +/* Define if we have Python NumPy support */ +#undef HAVE_PYTHON_NUMPY + /* Define to 1 if you have the `random' function. */ #undef HAVE_RANDOM diff --git a/src/Makefile.in b/src/Makefile.in index eb72ace..5b1679a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -82,6 +82,7 @@ TESTS = subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -393,10 +394,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/test/Makefile.in b/test/Makefile.in index 2713816..d880d3c 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -87,6 +87,7 @@ TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT) subdir = test ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -725,10 +726,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 4701dcc..f2b1953 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -76,6 +76,7 @@ TESTS = subdir = testpar ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -320,10 +321,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 4cbb588..7bceadf 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -74,6 +74,7 @@ TESTS = subdir = tools ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -293,10 +294,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index 56401ce..7b6f427 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -78,6 +78,7 @@ TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT) subdir = tools/h5copy ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -299,10 +300,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index cfc97e7..ed937e8 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -78,6 +78,7 @@ TESTS = $(am__EXEEXT_2) $(TEST_SCRIPT) subdir = tools/h5diff ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -306,10 +307,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 21ae6a4..6ac07ce 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -79,6 +79,7 @@ TESTS = $(am__EXEEXT_1) $(am__EXEEXT_1) subdir = tools/h5dump ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -301,10 +302,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 0338bff..bf1c054 100644 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -78,6 +78,7 @@ TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT) subdir = tools/h5import ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -299,10 +300,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 695fb51..2233375 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -78,6 +78,7 @@ TESTS = $(TEST_SCRIPT) subdir = tools/h5jam ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -313,10 +314,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 5fc61e9..6904d57 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -77,6 +77,7 @@ TESTS = $(TEST_SCRIPT) subdir = tools/h5ls ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -293,10 +294,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index c272c7f..f2ad08c 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -81,6 +81,7 @@ TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT) subdir = tools/h5repack ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -349,10 +350,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index 0f6bc50..8fa7e2b 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -79,6 +79,7 @@ TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT) subdir = tools/h5stat ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -328,10 +329,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index a2064b5..a57ca0a 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -76,6 +76,7 @@ TESTS = $(am__EXEEXT_1) subdir = tools/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -291,10 +292,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index ddf1427..ed84fa5 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -80,6 +80,7 @@ TESTS = $(am__EXEEXT_1) $(TEST_SCRIPT) subdir = tools/misc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/ax_python.m4 \ $(top_srcdir)/m4/ax_python_devel.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -353,10 +354,13 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PYTHON = @PYTHON@ +PYTHON_BIN = @PYTHON_BIN@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ +PYTHON_INCLUDE_DIR = @PYTHON_INCLUDE_DIR@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIB = @PYTHON_LIB@ PYTHON_SITE_PKG = @PYTHON_SITE_PKG@ PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ -- cgit v0.12