output/gnuplot: Support getting samplerate from meta packets.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b76110fe5f6d13223deea4ec3af06641ca2a9874..8e97f9e75fa4ce2c1b57d59803867e7ec9cb52d2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,8 @@ AH_BOTTOM([#endif /* SR_CONFIG_H */])
 
 # Enable more compiler warnings via -Wall and -Wextra. Add -fvisibility=hidden
 # and enforce use of SR_API to explicitly mark all public API functions.
-CFLAGS="$CFLAGS -Wall -Wextra -Wmissing-prototypes -fvisibility=hidden"
+COMMON_FLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden"
+CFLAGS="$COMMON_FLAGS -Wmissing-prototypes"
 
 # Checks for programs.
 AC_PROG_CC
@@ -89,11 +90,6 @@ AC_ARG_ENABLE(agilent-dmm, AC_HELP_STRING([--enable-agilent-dmm],
        [HW_AGILENT_DMM="$enableval"],
        [HW_AGILENT_DMM=$HW_ENABLED_DEFAULT])
 
-AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa],
-       [enable ALSA driver support [default=yes]]),
-       [HW_ALSA="$enableval"],
-       [HW_ALSA=$HW_ENABLED_DEFAULT])
-
 AC_ARG_ENABLE(appa-55ii, AC_HELP_STRING([--enable-appa-55ii],
        [enable APPA 55II support [default=yes]]),
        [HW_APPA_55II="$enableval"],
@@ -297,17 +293,17 @@ AM_CONDITIONAL(NEED_RPC, test "x$have_rpc" != "x0")
 # 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().
 AM_PATH_GLIB_2_0([2.32.0],
-       [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
+       [LIB_CFLAGS="$LIB_CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # libzip is always needed. Abort if it's not found.
 PKG_CHECK_MODULES([libzip], [libzip >= 0.10],
-       [CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
+       [LIB_CFLAGS="$LIB_CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
        SR_PKGLIBS="$SR_PKGLIBS libzip"])
 
 # libserialport is only needed for some hardware drivers. Disable the
 # respective drivers if it is not found.
 PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0],
-       [have_libserialport="yes"; CFLAGS="$CFLAGS $libserialport_CFLAGS";
+       [have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS";
        LIBS="$LIBS $libserialport_LIBS";
        SR_PKGLIBS="$SR_PKGLIBS libserialport"],
        [have_libserialport="no"; HW_AGILENT_DMM="no"; HW_APPA_55II="no";
@@ -327,7 +323,7 @@ fi
 AM_CONDITIONAL(NEED_SERIAL, test "x$have_libserialport" != xno)
 
 PKG_CHECK_MODULES([librevisa], [librevisa >= 0.0.20130812],
-       [have_librevisa="yes"; CFLAGS="$CFLAGS $librevisa_CFLAGS";
+       [have_librevisa="yes"; LIB_CFLAGS="$LIB_CFLAGS $librevisa_CFLAGS";
        LIBS="$LIBS $librevisa_LIBS";
        SR_PKGLIBS="$SR_PKGLIBS librevisa"],
        [have_librevisa="no"])
@@ -353,7 +349,7 @@ case "$host" in
        ;;
 *)
        PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16],
-               [have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS";
+               [have_libusb1_0="yes"; LIB_CFLAGS="$LIB_CFLAGS $libusb_CFLAGS";
                LIBS="$LIBS $libusb_LIBS";
                SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
                [have_libusb1_0="no"; HW_BRYMEN_BM86X="no"; HW_FX2LAFW="no";
@@ -376,26 +372,20 @@ AM_CONDITIONAL(NEED_USB, test "x$have_libusb1_0" != xno)
 
 # libftdi is only needed for some hardware drivers. Disable them if not found.
 PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
-       [CFLAGS="$CFLAGS $libftdi_CFLAGS";
+       [LIB_CFLAGS="$LIB_CFLAGS $libftdi_CFLAGS";
        LIBS="$LIBS $libftdi_LIBS";
        SR_PKGLIBS="$SR_PKGLIBS libftdi"],
        [HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no"])
 
 # libudev is only needed for some hardware drivers. Disable them if not found.
 PKG_CHECK_MODULES([libudev], [libudev >= 151],
-       [CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
+       [LIB_CFLAGS="$LIB_CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
        SR_PKGLIBS="$SR_PKGLIBS libudev"],
        [HW_LINK_MSO19="no"])
 
-# ALSA is only needed for some hardware drivers. Disable them if not found.
-PKG_CHECK_MODULES([alsa], [alsa >= 1.0],
-       [CFLAGS="$CFLAGS $alsa_CFLAGS"; LIBS="$LIBS $alsa_LIBS";
-       SR_PKGLIBS="$SR_PKGLIBS alsa"],
-       [HW_ALSA="no"])
-
 # The Check unit testing framework is optional. Disable if not found.
 PKG_CHECK_MODULES([check], [check >= 0.9.4],
-       [have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS";
+       [have_check="yes"; LIB_CFLAGS="$LIB_CFLAGS $check_CFLAGS";
        LIBS="$LIBS $check_LIBS"], [have_check="no"])
 AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 
@@ -409,6 +399,8 @@ esac
 
 AC_SUBST(SR_PKGLIBS)
 
+CFLAGS="$CFLAGS $LIB_CFLAGS"
+
 # Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers.
 
 AM_CONDITIONAL(HW_AGILENT_DMM, test x$HW_AGILENT_DMM = xyes)
@@ -416,11 +408,6 @@ if test "x$HW_AGILENT_DMM" = "xyes"; then
        AC_DEFINE(HAVE_HW_AGILENT_DMM, 1, [Agilent DMM support])
 fi
 
-AM_CONDITIONAL(HW_ALSA, test x$HW_ALSA = xyes)
-if test "x$HW_ALSA" = "xyes"; then
-       AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver support])
-fi
-
 AM_CONDITIONAL(HW_APPA_55II, test x$HW_APPA_55II = xyes)
 if test "x$HW_APPA_55II" = "xyes"; then
        AC_DEFINE(HAVE_HW_APPA_55II, 1, [APPA 55II support])
@@ -628,19 +615,21 @@ 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" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do
+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" "libudev >= 151" "check >= 0.9.4"; 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
        if `$PKG_CONFIG --exists $lib`; then
                ver=`$PKG_CONFIG --modversion $lib`
                answer="yes ($ver)"
        else
                answer="no"
        fi
-       echo "  - $lib: $answer"
+       echo "  - ($optional) $lib: $answer"
 done
 
 echo -e "\nEnabled hardware drivers:\n"
 echo "  - agilent-dmm..................... $HW_AGILENT_DMM"
-echo "  - alsa............................ $HW_ALSA"
 echo "  - appa-55ii....................... $HW_APPA_55II"
 echo "  - asix-sigma...................... $HW_ASIX_SIGMA"
 echo "  - atten-pps3xxx................... $HW_ATTEN_PPS3XXX"