]> sigrok.org Git - libsigrok.git/blobdiff - configure.ac
configure.ac: Improve pkg-config related checks.
[libsigrok.git] / configure.ac
index 356debf46509e4e6f74663fa4367b757dc13f519..3db681c3b31ff0da2ebf5058b81867308104f9bb 100644 (file)
@@ -34,7 +34,7 @@ AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
 # We require at least automake 1.11 (needed for 'silent rules').
-AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options])
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news color-tests])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
@@ -47,12 +47,14 @@ AH_BOTTOM([#endif /* SR_CONFIG_H */])
 CFLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden"
 
 # Checks for programs.
-AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
+# Required for per-target flags or subdir-objects with C sources.
+AM_PROG_CC_C_O
+
 # Initialize libtool.
 LT_INIT
 
@@ -109,6 +111,15 @@ if test "x$LA_ASIX_SIGMA" = "xyes"; then
        AC_DEFINE(HAVE_LA_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
 fi
 
+AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm],
+       [enable Brymen DMM support [default=yes]]),
+       [HW_BRYMEN_DMM="$enableval"],
+       [HW_BRYMEN_DMM=$HW_ENABLED_DEFAULT])
+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])
+fi
+
 AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8],
        [enable ChronoVu LA8 support [default=yes]]),
        [LA_CHRONOVU_LA8="$enableval"],
@@ -181,6 +192,15 @@ if test "x$LA_LINK_MSO19" = "xyes"; then
        AC_DEFINE(HAVE_LA_LINK_MSO19, 1, [Link Instruments MSO-19 support])
 fi
 
+AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx],
+       [enable MIC 985xx support [default=yes]]),
+       [HW_MIC_985XX="$enableval"],
+       [HW_MIC_985XX=$HW_ENABLED_DEFAULT])
+AM_CONDITIONAL(HW_MIC_985XX, test x$HW_MIC_985XX = xyes)
+if test "x$HW_MIC_985XX" = "xyes"; then
+       AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx support])
+fi
+
 AC_ARG_ENABLE(nexus-osciprime, AC_HELP_STRING([--enable-nexus-osciprime],
        [enable Nexus Osciprime support [default=yes]]),
        [HW_NEXUS_OSCIPRIME="$enableval"],
@@ -261,64 +281,68 @@ fi
 # libsigrok.pc file.
 SR_PKGLIBS=""
 
-# libglib-2.0 is always needed.
+# 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).
 AM_PATH_GLIB_2_0([2.28.0],
        [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
-# libusb-1.0 is only needed for some hardware drivers.
-if test "x$LA_ASIX_SIGMA" != xno \
-   -o "x$LA_CHRONOVU_LA8" != xno \
-   -o "x$LA_FX2LAFW" != xno \
-   -o "x$HW_HANTEK_DSO" != xno \
-   -o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno; then
-       case "$build" in
-       *freebsd*)
-               # FreeBSD comes with an "integrated" libusb-1.0-style USB API.
-               AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
-                       [Specifies whether we have a libusb.h header.])
-               ;;
-       *)
-               PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9],
-                       [CFLAGS="$CFLAGS $libusb_CFLAGS";
-                       LIBS="$LIBS $libusb_LIBS";
-                       SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"])
-               # Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
-               if test "x$libusb_CFLAGS" != "x"; then
-                       AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
-                               [Specifies whether we have a libusb.h header.])
-               fi
-               ;;
-       esac
-fi
-
-# libzip is always needed.
+# libzip is always needed. Abort if it's not found.
 PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
        [CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
        SR_PKGLIBS="$SR_PKGLIBS libzip"])
 
-# libftdi is only needed for some hardware drivers.
-if test "x$LA_ASIX_SIGMA" != xno \
-     -o "x$LA_CHRONOVU_LA8" != xno; then
-       PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
-               [CFLAGS="$CFLAGS $libftdi_CFLAGS";
-               LIBS="$LIBS $libftdi_LIBS";
-               SR_PKGLIBS="$SR_PKGLIBS libftdi"])
-fi
-
-# libudev is only needed for some hardware drivers.
-if test "x$LA_LINK_MSO19" != xno; then
-       PKG_CHECK_MODULES([libudev], [libudev >= 151],
-               [CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
-               SR_PKGLIBS="$SR_PKGLIBS libudev"])
-fi
-
-# ALSA is only needed for some hardware drivers.
-if test "x$HW_ALSA" != xno; then
-       PKG_CHECK_MODULES([alsa], [alsa >= 1.0],
-               [CFLAGS="$CFLAGS $alsa_CFLAGS"; LIBS="$LIBS $alsa_LIBS";
-               SR_PKGLIBS="$SR_PKGLIBS alsa"])
-fi
+# libusb-1.0 is only needed for some hardware drivers. Disable the respective
+# drivers if it is not found.
+case "$build" in
+*freebsd*)
+       # FreeBSD comes with an "integrated" libusb-1.0-style USB API.
+       # This means libusb-1.0 is always available, no need to check for it,
+       # and no need to (potentially) disable any drivers if it's not found.
+       AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
+               [Specifies whether we have a libusb.h header.])
+       ;;
+*)
+       PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9],
+               [have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS";
+               LIBS="$LIBS $libusb_LIBS";
+               SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
+               [have_libusb1_0="no"; LA_FX2LAFW="no"; HW_HANTEK_DSO="no";
+               HW_LASCAR_EL_USB="no"; HW_NEXUS_OSCIPRIME="no";
+               HW_UNI_T_DMM="no"; HW_VICTOR_DMM="no";
+               LA_ZEROPLUS_LOGIC_CUBE="no"])
+
+       # Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
+       if test "x$libusb_CFLAGS" != "x"; then
+               AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
+                       [Specifies whether we have a libusb.h header.])
+       fi
+       ;;
+esac
+
+# libftdi is only needed for some hardware drivers. Disable them if not found.
+PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
+       [CFLAGS="$CFLAGS $libftdi_CFLAGS";
+       LIBS="$LIBS $libftdi_LIBS";
+       SR_PKGLIBS="$SR_PKGLIBS libftdi"],
+       [LA_ASIX_SIGMA="no"; LA_CHRONOVU_LA8="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";
+       SR_PKGLIBS="$SR_PKGLIBS libudev"],
+       [LA_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";
+       LIBS="$LIBS $check_LIBS"], [have_check="no"])
+AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 
 # EZUSB FX2 firmware helper code is only needed for some hardware drivers.
 AM_CONDITIONAL(NEED_EZUSB, \
@@ -376,10 +400,12 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
                 hardware/agilent-dmm/Makefile
                 hardware/alsa/Makefile
                 hardware/asix-sigma/Makefile
+                hardware/brymen-dmm/Makefile
                 hardware/chronovu-la8/Makefile
                 hardware/colead-slm/Makefile
                 hardware/common/Makefile
                 hardware/lascar-el-usb/Makefile
+                hardware/mic-985xx/Makefile
                 hardware/nexus-osciprime/Makefile
                 hardware/rigol-ds1xx2/Makefile
                 hardware/tondaj-sl-814/Makefile
@@ -399,6 +425,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
                 output/text/Makefile
                 libsigrok.pc
                 contrib/Makefile
+                tests/Makefile
                ])
 
 AC_OUTPUT
@@ -414,7 +441,7 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "alsa"; do
+for lib in "glib-2.0" "libzip" "libusb-1.0" "libftdi" "libudev" "alsa" "check"; do
        if `$PKG_CONFIG --exists $lib`; then
                ver=`$PKG_CONFIG --modversion $lib`
                answer="yes ($ver)"
@@ -428,6 +455,7 @@ echo -e "\nEnabled hardware drivers:\n"
 echo "  - Agilent DMM..................... $HW_AGILENT_DMM"
 echo "  - ALSA............................ $HW_ALSA"
 echo "  - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA"
+echo "  - Brymen DMM...................... $HW_BRYMEN_DMM"
 echo "  - ChronoVu LA8.................... $LA_CHRONOVU_LA8"
 echo "  - Colead SLM...................... $HW_COLEAD_SLM"
 echo "  - Demo driver..................... $LA_DEMO"
@@ -436,6 +464,7 @@ echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
 echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
 echo "  - Lascar EL-USB................... $HW_LASCAR_EL_USB"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"
+echo "  - MIC 985xx....................... $HW_MIC_985XX"
 echo "  - Nexus Osciprime................. $HW_NEXUS_OSCIPRIME"
 echo "  - Openbench Logic Sniffer......... $LA_OLS"
 echo "  - Rigol DS1xx2.................... $HW_RIGOL_DS1XX2"