Use PRIu64 for format in pretty-printer.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 128a782c4b78c5f5d0af7f27f7fe5c57a74fa7e9..af571791693d3b09eaed1095ddb53e98e0337e80 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -108,10 +108,6 @@ AC_ARG_ENABLE(atten-pps3xxx, AC_HELP_STRING([--enable-atten-pps3xxx],
        [enable Atten PPS3xxx support [default=yes]]),
        [HW_ATTEN_PPS3XXX="$enableval"],
        [HW_ATTEN_PPS3XXX=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(HW_ATTEN_PPS3XXX, test x$HW_ATTEN_PPS3XXX = xyes)
-if test "x$HW_ATTEN_PPS3XXX" = "xyes"; then
-       AC_DEFINE(HAVE_HW_ATTEN_PPS3XXX, 1, [Atten PPS3xxx support])
-fi
 
 AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm],
        [enable Brymen DMM support [default=yes]]),
@@ -270,6 +266,18 @@ SR_PKGLIBS=""
 # libm (the standard math library) is always needed.
 AC_SEARCH_LIBS([pow], [m])
 
+# RPC is only needed for VXI support
+AC_MSG_CHECKING([for RPC support])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <rpc/rpc.h>],
+                                [CLIENT *rpc_test(void)],
+                                [{ return clnt_create("", 0, 0, ""); }])],
+               [AC_MSG_RESULT([yes]); have_rpc=1],
+               [AC_MSG_RESULT([no]);  have_rpc=0])
+# Define HAVE_RPC in config.h if we found RPC support.
+AC_DEFINE_UNQUOTED(HAVE_RPC, [$have_rpc],[Specifies whether we have RPC support.])
+# VXI support is only compiled if RPC support was found.
+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.32.0 due to e.g. g_variant_new_fixed_array().
@@ -288,10 +296,10 @@ PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0],
        LIBS="$LIBS $libserialport_LIBS";
        SR_PKGLIBS="$SR_PKGLIBS libserialport"],
        [have_libserialport="no"; HW_AGILENT_DMM="no"; HW_APPA_55II="no";
-       HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no"; HW_CENTER_3XX="no";
-       HW_COLEAD_SLM="no"; HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no";
-       HW_HAMEG_HMO="no"; HW_LINK_MSO19="no"; HW_MIC_985XX="no";
-       HW_NORMA_DMM="no"; HW_OLS="no"; HW_RIGOL_DS="no";
+       HW_ATTEN_PPS3XXX="no"; HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no";
+       HW_CENTER_3XX="no"; HW_COLEAD_SLM="no"; HW_FLUKE_DMM="no";
+       HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no"; HW_LINK_MSO19="no";
+       HW_MIC_985XX="no"; HW_NORMA_DMM="no"; HW_OLS="no";
        HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"])
 
 # Define HAVE_LIBSERIALPORT in config.h if we found libserialport.
@@ -392,6 +400,11 @@ if test "x$HW_ASIX_SIGMA" = "xyes"; then
        AC_DEFINE(HAVE_HW_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
 fi
 
+AM_CONDITIONAL(HW_ATTEN_PPS3XXX, test x$HW_ATTEN_PPS3XXX = xyes)
+if test "x$HW_ATTEN_PPS3XXX" = "xyes"; then
+       AC_DEFINE(HAVE_HW_ATTEN_PPS3XXX, 1, [Atten PPS3xxx support])
+fi
+
 AM_CONDITIONAL(HW_BRYMEN_DMM, test x$HW_BRYMEN_DMM = xyes)
 if test "x$HW_BRYMEN_DMM" = "xyes"; then
        AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [Brymen DMM support])