X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=dce87872c34710f68826087dc8b7358b1f044959;hb=0e1a7fe91a9132ad586337bdd29d93eff4344edd;hp=d2f8926a3b1d4ecb79fdab777747a0fceb9283f7;hpb=3532ed01256b986ecaf37ea5bb29d81465e2aa89;p=libsigrok.git diff --git a/configure.ac b/configure.ac index d2f8926a..dce87872 100644 --- a/configure.ac +++ b/configure.ac @@ -200,7 +200,10 @@ fi PKG_CHECK_MODULES([python], [python >= 2.7], [CXXFLAGS="$CXXFLAGS $python_CFLAGS"; CXXLIBS="$CXXLIBS $python_LIBS"], - [BINDINGS_PYTHON="no"; python_msg="Python headers required"]) +[PKG_CHECK_MODULES([python27], [python-2.7 >= 2.7], + [CXXFLAGS="$CXXFLAGS $python27_CFLAGS"; + CXXLIBS="$CXXLIBS $python27_LIBS"], + [BINDINGS_PYTHON="no"; python_msg="Python headers required"])]) # The Python bindings need the setuptools Python module. m4_ifdef([AX_PYTHON_MODULE], [AX_PYTHON_MODULE([setuptools])], @@ -404,8 +407,8 @@ AC_CHECK_HEADERS([sys/mman.h sys/ioctl.h], [], [HW_BEAGLELOGIC="no"]) AC_SUBST(SR_PKGLIBS) -CFLAGS="$CFLAGS -I./include/libsigrok $LIB_CFLAGS" -CXXFLAGS="$CXXFLAGS -I./include -I./bindings/cxx/include $LIB_CFLAGS" +CFLAGS="$CFLAGS -Iinclude/libsigrok -I${srcdir}/include/libsigrok $LIB_CFLAGS" +CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibindings/cxx/include/libsigrok -I${srcdir}/bindings/cxx/include $LIB_CFLAGS" # Find Java compiler and JNI includes for Java bindings.