X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=595dafe25623ed48b822b095bbc281b59e6f21e3;hb=f44f7e61a37f0b42dc06e85278b0b152ddc70ab2;hp=fbf269e8a0679007db23923c0a4302b699104ae4;hpb=818df9f8ec3d035eb52292286469ba03521a51b3;p=libsigrok.git diff --git a/configure.ac b/configure.ac index fbf269e8..595dafe2 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,9 @@ AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([autostuff]) AC_CONFIG_AUX_DIR([autostuff]) +# We require this to know the target settings if we're cross-compiling. +AC_CANONICAL_SYSTEM + # We require at least automake 1.11 (needed for 'silent rules'). AM_INIT_AUTOMAKE([1.11 -Wall -Werror subdir-objects check-news color-tests]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -114,6 +117,7 @@ DRIVER([Center 3xx], [center-3xx]) DRIVER([ChronoVu LA], [chronovu-la]) DRIVER([Colead SLM], [colead-slm]) DRIVER([Conrad DIGI 35 CPU], [conrad-digi-35-cpu]) +DRIVER([DER EE DE-5000], [deree-de5000]) DRIVER([demo], [demo]) DRIVER([Fluke DMM], [fluke-dmm]) DRIVER([fx2lafw], [fx2lafw]) @@ -259,8 +263,8 @@ AM_CONDITIONAL(NEED_RPC, test "x$have_rpc" != "x0") # libglib-2.0 is always needed. Abort if it's not found. # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement). -# We require at least 2.34.0 due to e.g. g_slist_deep_copy(). -AM_PATH_GLIB_2_0([2.34.0], +# We require at least 2.32.0 due to e.g. g_variant_new_fixed_array(). +AM_PATH_GLIB_2_0([2.32.0], [LIB_CFLAGS="$LIB_CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) # libzip is always needed. Abort if it's not found. @@ -286,9 +290,10 @@ if test "x$have_libserialport" = "xno"; then HW_AGILENT_DMM="no"; HW_APPA_55II="no"; HW_ATTEN_PPS3XXX="no"; HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no"; HW_CENTER_3XX="no"; HW_COLEAD_SLM="no"; HW_CONRAD_DIGI_35_CPU="no"; - HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no"; - HW_MANSON_HCS_3XXX="no"; HW_MIC_985XX="no"; HW_MOTECH_LPS_30X="no"; - HW_NORMA_DMM="no"; HW_OPENBENCH_LOGIC_SNIFFER="no"; HW_SERIAL_DMM="no"; + HW_DEREE_DE5000="no"; HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; + HW_HAMEG_HMO="no"; HW_MANSON_HCS_3XXX="no"; HW_MIC_985XX="no"; + HW_MOTECH_LPS_30X="no"; HW_NORMA_DMM="no"; + HW_OPENBENCH_LOGIC_SNIFFER="no"; HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"; else # Define HAVE_LIBSERIALPORT in config.h if we found libserialport. @@ -300,7 +305,7 @@ fi AM_CONDITIONAL(NEED_SERIAL, test "x$have_libserialport" != xno) # The VISA SCPI backend is only compiled in if librevisa was found. -PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130812], +PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130412], [have_librevisa="yes"; LIB_CFLAGS="$LIB_CFLAGS $librevisa_CFLAGS"; LIBS="$LIBS $librevisa_LIBS"; SR_PKGLIBS="$SR_PKGLIBS librevisa"], @@ -394,7 +399,7 @@ PKG_CHECK_MODULES([glibmm], [glibmm-2.4 >= 2.32.0], [BINDINGS_CXX="no"; cxx_msg="glibmm required"]) # C++ bindings want stoi and stod. -if test "x$BINDINGS_CXX" == "xyes"; then +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 ], @@ -421,14 +426,6 @@ PKG_CHECK_MODULES([check], [check >= 0.9.4], [have_check="yes"], [have_check="no"]) AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") -# The OLS driver uses serial port file descriptors directly, and therefore -# will not currently work on Windows. -case "$host" in -*mingw*) - HW_OPENBENCH_LOGIC_SNIFFER="no" - ;; -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"]) @@ -436,11 +433,11 @@ AC_CHECK_HEADERS([sys/mman.h sys/ioctl.h], [], [HW_BEAGLELOGIC="no"]) AC_SUBST(SR_PKGLIBS) 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" +CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibindings/cxx/include/libsigrokcxx -I${srcdir}/bindings/cxx/include $LIB_CFLAGS" # Find Java compiler and JNI includes for Java bindings. AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no]) -if test "x$HAVE_JAVAC" = "xyes"; then +if test "x$HAVE_JAVAC" = "xyes" && test "x$BINDINGS_JAVA" = "xyes"; then AX_PROG_JAVAC if test "x$JNI_INCLUDE_DIRS" = "xauto"; then if test "x$cross_compiling" = "xyes"; then @@ -485,6 +482,7 @@ DRIVER2([HW_CHRONOVU_LA], [$HW_CHRONOVU_LA], [HAVE_HW_CHRONOVU_LA]) DRIVER2([HW_COLEAD_SLM], [$HW_COLEAD_SLM], [HAVE_HW_COLEAD_SLM]) DRIVER2([HW_CONRAD_DIGI_35_CPU], [$HW_CONRAD_DIGI_35_CPU], [HAVE_HW_CONRAD_DIGI_35_CPU]) DRIVER2([HW_DEMO], [$HW_DEMO], [HAVE_HW_DEMO]) +DRIVER2([HW_DEREE_DE5000], [$HW_DEREE_DE5000], [HAVE_HW_DEREE_DE5000]) DRIVER2([HW_FLUKE_DMM], [$HW_FLUKE_DMM], [HAVE_HW_FLUKE_DMM]) DRIVER2([HW_FX2LAFW], [$HW_FX2LAFW], [HAVE_HW_FX2LAFW]) DRIVER2([HW_GMC_MH_1X_2X], [$HW_GMC_MH_1X_2X], [HAVE_HW_GMC_MH_1X_2X]) @@ -542,7 +540,7 @@ AC_SUBST(SR_PACKAGE_VERSION_MICRO) AC_SUBST(SR_PACKAGE_VERSION) AC_CONFIG_FILES([Makefile include/libsigrok/version.h libsigrok.pc - bindings/cxx/libsigrokxx.pc]) + bindings/cxx/libsigrokcxx.pc]) AC_OUTPUT @@ -559,13 +557,13 @@ echo "Detected libraries:" echo # Note: This only works for libs with pkg-config integration. -for lib in "glib-2.0 >= 2.34.0" "libzip >= 0.10" "libserialport >= 0.2.0" \ - "librevisa >= 0.0.20130812" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" \ +for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.2.0" \ + "librevisa >= 0.0.20130412" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" \ "libftdi1 >= 1.0" "libgpib" "glibmm-2.4 >= 2.32.0" \ "pygobject-3.0 >= 3.0.0" "check >= 0.9.4" do optional="OPTIONAL" - if test "x$lib" = "xglib-2.0 >= 2.34.0"; then optional="REQUIRED"; fi + 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 if `$PKG_CONFIG --exists $lib`; then ver=`$PKG_CONFIG --modversion $lib`