X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=7e109fde6baf34fa3ff5d2bd5d97483875b7ed28;hb=effb9dd1c22dd10e1f276544bdadf4d3acf7dcc3;hp=90bd73b0d5b6a3b524eae2208b00195969893706;hpb=271cdfd267d027f9b31b8be07a964d4bdb0c7165;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 90bd73b0..7e109fde 100644 --- a/configure.ac +++ b/configure.ac @@ -129,8 +129,10 @@ DRIVER([MIC 985xx], [mic-985xx]) DRIVER([Motech LPS 30x], [motech-lps-30x]) DRIVER([Norma DMM], [norma-dmm]) DRIVER([OpenBench Logic Sniffer], [openbench-logic-sniffer]) +DRIVER([Pipistrello-OLS], [pipistrello-ols]) DRIVER([Rigol DS], [rigol-ds]) DRIVER([Saleae Logic16], [saleae-logic16]) +DRIVER([SCPI PPS], [scpi-pps]) DRIVER([serial DMM], [serial-dmm]) DRIVER([Sysclk LWLA], [sysclk-lwla]) DRIVER([Teleinfo], [teleinfo]) @@ -139,6 +141,7 @@ DRIVER([Tondaj SL-814], [tondaj-sl-814]) DRIVER([UNI-T DMM], [uni-t-dmm]) DRIVER([UNI-T UT32x], [uni-t-ut32x]) DRIVER([Victor DMM], [victor-dmm]) +DRIVER([Yokogawa DL/DLM], [yokogawa-dlm]) DRIVER([ZEROPLUS Logic Cube], [zeroplus-logic-cube]) AC_ARG_ENABLE(libserialport, @@ -175,43 +178,57 @@ AC_ARG_ENABLE(java, [build Java bindings [default=yes]]), [BINDINGS_JAVA="$enableval"], [BINDINGS_JAVA=$BINDINGS_ALL]) +AC_ARG_WITH(jni-include-path, + AC_HELP_STRING([--with-jni-include-path=path], + [specify include path for JNI [default=autodetect]]), + [JNI_INCLUDE_DIRS="$withval"], [JNI_INCLUDE_DIRS=auto]) + # Check if the C++ compiler supports the C++11 standard. m4_ifdef([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX_11(,[optional])], [AC_MSG_NOTICE([Missing macro m4_toupper(aX_CXX_COMPILE_STDCXX_11), no C++11 check])]) if test "x$HAVE_CXX11" != "x1"; then - BINDINGS_CXX="no" + BINDINGS_CXX="no"; cxx_msg="C++11 compiler required" +fi + +# The C++ bindings use doxygen to parse libsigrok symbols. +AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [yes]) +if test "x$HAVE_DOXYGEN" != "xyes"; then + BINDINGS_CXX="no"; cxx_msg="doxygen required" fi -# The C++ bindings use gccxml to parse libsigrok symbols. -AC_CHECK_PROG([HAVE_GCCXML], [gccxml], [yes]) -if test "x$HAVE_GCCXML" != "xyes"; then - BINDINGS_CXX="no" +# Python is needed for the C++ bindings. +AC_CHECK_PROG([HAVE_PYTHON], [python], [yes]) +if test "x$HAVE_PYTHON" != "xyes"; then + BINDINGS_CXX="no"; cxx_msg="Python required" fi -# Python is needed for the C++ (and Python) bindings. -PKG_CHECK_MODULES([python], [python3 >= 2.7], +# The Python bindings need Python development files +PKG_CHECK_MODULES([python], [python >= 2.7], [CXXFLAGS="$CXXFLAGS $python_CFLAGS"; CXXLIBS="$CXXLIBS $python_LIBS"], - [BINDINGS_CXX="no"]) +[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 C++ bindings need the pygccxml Python module. -m4_ifdef([AX_PYTHON_MODULE], [AX_PYTHON_MODULE([pygccxml])], +# The Python bindings need the setuptools Python module. +m4_ifdef([AX_PYTHON_MODULE], [AX_PYTHON_MODULE([setuptools])], # We'll let it go through even if the macro wasn't found, the python # module may still be there. - [HAVE_PYTHON_PYGCCXML="yes"; - AC_MSG_NOTICE([Missing macro m4_toupper(aX_PYTHON_MODULE), no pygccxml check])] + [HAVE_PYTHON_SETUPTOOLS="yes"; + AC_MSG_NOTICE([Missing macro m4_toupper(aX_PYTHON_MODULE), no setuptools check])] ) -if test "x$HAVE_PYMOD_PYGCCXML" != "xyes"; then - BINDINGS_CXX="no" +if test "x$HAVE_PYMOD_SETUPTOOLS" != "xyes"; then + BINDINGS_PYTHON="no"; python_msg="Python setuptools module required" fi -# Python and Java bindings depend on C++ bindings. - -if test "x$BINDINGS_CXX" != "xyes"; then - BINDINGS_PYTHON="no" - BINDINGS_JAVA="no" +# The Python and Java bindings use swig to generate code. +AC_CHECK_PROG([HAVE_SWIG], [swig], [yes]) +if test "x$HAVE_SWIG" != "xyes"; then + BINDINGS_PYTHON="no"; python_msg="swig required" + BINDINGS_JAVA="no"; java_msg="swig required" fi # Checks for libraries. @@ -256,7 +273,7 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.10], # libserialport is only needed for some hardware drivers. Disable the # respective drivers if it is not found. if test "x$enable_libserialport" != "xno"; then - PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0], + PKG_CHECK_MODULES([libserialport], [libserialport >= 0.2.0], [have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS"; LIBS="$LIBS $libserialport_LIBS"; SR_PKGLIBS="$SR_PKGLIBS libserialport"], @@ -285,13 +302,12 @@ fi # Serial port helper code is only compiled in if libserialport was found. AM_CONDITIONAL(NEED_SERIAL, test "x$have_libserialport" != xno) +# VISA SCPI backend is only compiled in if librevisa was found. PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130812], [have_librevisa="yes"; LIB_CFLAGS="$LIB_CFLAGS $librevisa_CFLAGS"; LIBS="$LIBS $librevisa_LIBS"; SR_PKGLIBS="$SR_PKGLIBS librevisa"], [have_librevisa="no"]) - -# VISA SCPI backend is only compiled in if librevisa was found. AM_CONDITIONAL(NEED_VISA, test "x$have_librevisa" != xno) # Define HAVE_LIBREVISA in config.h if we found librevisa. @@ -300,6 +316,20 @@ if test "x$have_librevisa" != "xno"; then [Specifies whether we have librevisa.]) fi +# GPIB backend is only compiled in if libgpib headers found. +PKG_CHECK_MODULES([libgpib], [libgpib], + [have_libgpib="yes"; LIB_CFLAGS="$LIB_CFLAGS $libgpib_CFLAGS"; + LIBS="$LIBS $libgpib_LIBS"; + SR_PKGLIBS="$SR_PKGLIBS libgpib"], + [have_libgpib="no"]) +AM_CONDITIONAL(NEED_GPIB, test "x$have_libgpib" != xno) + +# Define HAVE_LIBGPIB in config.h if we found libgpib. +if test "x$have_libgpib" != "xno"; then + AC_DEFINE_UNQUOTED(HAVE_LIBGPIB, [1], + [Specifies whether we have libgpib.]) +fi + # libusb-1.0 is only needed for some hardware drivers. Disable the respective # drivers if it is not found. if test "x$enable_libusb" != "xno"; then @@ -361,12 +391,27 @@ fi if test "x$have_libftdi" = "xno"; then HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no"; + HW_PIPISTRELLO_OLS="no"; fi # glibmm-2.4 is needed for the C++ bindings. PKG_CHECK_MODULES([glibmm], [glibmm-2.4 >= 2.32.0], [CXXFLAGS="$CXXFLAGS $glibmm_CFLAGS"; - CXXLIBS="$CXXLIBS $glibmm_LIBS"], [BINDINGS_CXX="no"]) + CXXLIBS="$CXXLIBS $glibmm_LIBS"], + [BINDINGS_CXX="no"; cxx_msg="glibmm required"]) + +# C++ bindings want stoi and stod +if test "x$BINDINGS_CXX" == "xyes"; then + AC_LANG_PUSH([C++]) + AC_MSG_CHECKING([for stoi and stod]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], + [{ return std::stoi("1")+std::stod("1.0"); }])], + [AC_MSG_RESULT([yes]); + AC_DEFINE_UNQUOTED(HAVE_STOI_STOD, [1], + [Specifies whether we have the stoi and stod functions.])], + [AC_MSG_RESULT([no])]) + AC_LANG_POP([C++]) +fi # PyGObject is needed for the Python bindings. PKG_CHECK_MODULES([pygobject], [pygobject-3.0 >= 3.0.0], @@ -376,7 +421,7 @@ PKG_CHECK_MODULES([pygobject], [pygobject-3.0 >= 3.0.0], [pyg_flags_signed=0], [pyg_flags_signed=1]); AC_DEFINE_UNQUOTED(PYGOBJECT_FLAGS_SIGNED, [$pyg_flags_signed], [Whether last argument to pyg_flags_get_value() is signed])], - [BINDINGS_PYTHON="no"]) + [BINDINGS_PYTHON="no"; python_msg="Python pygobject module required"]) # The Check unit testing framework is optional. Disable if not found. PKG_CHECK_MODULES([check], [check >= 0.9.4], @@ -391,10 +436,14 @@ case "$host" in ;; esac +# The BeagleLogic driver needs sys/mman.h and sys/ioctl.h. Don't try to +# build it if these headers aren't available. +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. @@ -402,12 +451,27 @@ AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no]) if test "x$HAVE_JAVAC" = "xyes"; then AX_PROG_JAVAC - AX_JNI_INCLUDE_DIR + if test "x$JNI_INCLUDE_DIRS" = "xauto"; then + if test "x$cross_compiling" = "xyes"; then + JNI_INCLUDE_DIRS= + else + AX_JNI_INCLUDE_DIR + fi + fi for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS; do CXXFLAGS="$CXXFLAGS -I$JNI_INCLUDE_DIR" done + AC_LANG_PUSH([C++]) + AC_CHECK_HEADERS([jni.h], [], [BINDINGS_JAVA="no"; java_msg="Java JNI headers required"]) + AC_LANG_POP([C++]) else - BINDINGS_JAVA="no" + BINDINGS_JAVA="no"; java_msg="Java compiler required" +fi + +# Python and Java bindings depend on C++ bindings. +if test "x$BINDINGS_CXX" != "xyes"; then + BINDINGS_PYTHON="no"; python_msg="C++ bindings required" + BINDINGS_JAVA="no"; java_msg="C++ bindings required" fi # Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers. @@ -547,6 +611,11 @@ if test "x$HW_OPENBENCH_LOGIC_SNIFFER" = "xyes"; then AC_DEFINE(HAVE_HW_OPENBENCH_LOGIC_SNIFFER, 1, [OpenBench Logic Sniffer (OLS) support]) fi +AM_CONDITIONAL(HW_PIPISTRELLO_OLS, test x$HW_PIPISTRELLO_OLS = xyes) +if test "x$HW_PIPISTRELLO_OLS" = "xyes"; then + AC_DEFINE(HAVE_HW_PIPISTRELLO_OLS, 1, [Pipistrello OLS support]) +fi + AM_CONDITIONAL(HW_RIGOL_DS, test x$HW_RIGOL_DS = xyes) if test "x$HW_RIGOL_DS" = "xyes"; then AC_DEFINE(HAVE_HW_RIGOL_DS, 1, [Rigol DS support]) @@ -557,6 +626,11 @@ if test "x$HW_SALEAE_LOGIC16" = "xyes"; then AC_DEFINE(HAVE_HW_SALEAE_LOGIC16, 1, [Saleae Logic16 support]) fi +AM_CONDITIONAL(HW_SCPI_PPS, test x$HW_SCPI_PPS = xyes) +if test "x$HW_SCPI_PPS" = "xyes"; then + AC_DEFINE(HAVE_HW_SCPI_PPS, 1, [SCPI PPS support]) +fi + AM_CONDITIONAL(HW_SERIAL_DMM, test x$HW_SERIAL_DMM = xyes) if test "x$HW_SERIAL_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_SERIAL_DMM, 1, [Serial DMM support]) @@ -597,6 +671,11 @@ if test "x$HW_VICTOR_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_VICTOR_DMM, 1, [Victor DMM support]) fi +AM_CONDITIONAL(HW_YOKOGAWA_DLM, test x$HW_YOKOGAWA_DLM = xyes) +if test "x$HW_YOKOGAWA_DLM" = "xyes"; then + AC_DEFINE(HAVE_HW_YOKOGAWA_DLM, 1, [Yokogawa DL/DLM support]) +fi + AM_CONDITIONAL(HW_ZEROPLUS_LOGIC_CUBE, test x$HW_ZEROPLUS_LOGIC_CUBE = xyes) if test "x$HW_ZEROPLUS_LOGIC_CUBE" = "xyes"; then AC_DEFINE(HAVE_HW_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support]) @@ -609,7 +688,8 @@ AM_CONDITIONAL(BINDINGS_PYTHON, test x$BINDINGS_PYTHON = xyes) AM_CONDITIONAL(BINDINGS_JAVA, test x$BINDINGS_JAVA = xyes) # Checks for header files. -# These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h. +# These are already implicitly checked: inttypes.h stdint.h stdlib.h string.h +# unistd.h memory.h strings.h dlfcn.h sys/types.h sys/stat.h. # Checks for typedefs, structures, and compiler characteristics. AC_C_BIGENDIAN @@ -646,7 +726,11 @@ echo "Detected libraries:" echo # Note: This only works for libs with pkg-config integration. -for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libftdi1 >= 1.0" "glibmm-2.4 >= 2.32.0" "pygobject-3.0 >= 3.0.0" "check >= 0.9.4"; do +for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.2.0" \ + "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" \ + "libftdi1 >= 1.0" "glibmm-2.4 >= 2.32.0" "pygobject-3.0 >= 3.0.0" \ + "check >= 0.9.4" "libgpib" +do optional="OPTIONAL" if test "x$lib" = "xglib-2.0 >= 2.32.0"; then optional="REQUIRED"; fi if test "x$lib" = "xlibzip >= 0.10"; then optional="REQUIRED"; fi @@ -661,8 +745,34 @@ done eval echo -e "@Enabled hardware drivers:@@${driver_summary}" | tr @ \\n +# Prepare final bindings report messages +final_cxx="" +final_python="" +final_java="" +if test "$enable_bindings" = "no"; then + final_cxx=" (disabled)" + final_python=" (disabled)" + final_java=" (disabled)" +else + if test "$enable_cxx" = "no"; then + final_cxx=" (disabled)" + elif test "$BINDINGS_CXX" = "no"; then + final_cxx=" ($cxx_msg)" + fi + if test "$enable_python" = "no"; then + final_python=" (disabled)" + elif test "$BINDINGS_PYTHON" = "no"; then + final_python=" ($python_msg)" + fi + if test "$enable_java" = "no"; then + final_java=" (disabled)" + elif test "$BINDINGS_JAVA" = "no"; then + final_java=" ($java_msg)" + fi +fi + echo -e "Enabled language bindings:\n" -echo " - C++............................. $BINDINGS_CXX" -echo " - Python.......................... $BINDINGS_PYTHON" -echo " - Java............................ $BINDINGS_JAVA" +echo " - C++............................. $BINDINGS_CXX$final_cxx" +echo " - Python.......................... $BINDINGS_PYTHON$final_python" +echo " - Java............................ $BINDINGS_JAVA$final_java" echo