X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=68fa273b1fb762cabc296aa35bd81a76c60e6aca;hb=0ab0cb942f59e2232921c10d79ed43cad6cf3153;hp=496f96f9f1900ced9e6eed4a449cf64b71dc66b0;hpb=7dc55d930f87433fb35ebf6f18f767eddb7e8a17;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 496f96f9..68fa273b 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,7 @@ AC_ARG_ENABLE(agilent-dmm, AC_HELP_STRING([--enable-agilent-dmm], [HW_AGILENT_DMM=yes]) AM_CONDITIONAL(HW_AGILENT_DMM, test x$HW_AGILENT_DMM = xyes) if test "x$HW_AGILENT_DMM" = "xyes"; then - AC_DEFINE(HAVE_HW_AGILENT_DMM, 1, [Agilent DMM driver support]) + AC_DEFINE(HAVE_HW_AGILENT_DMM, 1, [Agilent DMM support]) fi # Disabled by default, unfinished. @@ -114,6 +114,15 @@ if test "x$LA_CHRONOVU_LA8" = "xyes"; then AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support]) fi +AC_ARG_ENABLE(colead-slm, AC_HELP_STRING([--enable-colead-slm], + [enable Colead SLM support [default=yes]]), + [HW_COLEAD_SLM="$enableval"], + [HW_COLEAD_SLM=yes]) +AM_CONDITIONAL(HW_COLEAD_SLM, test x$HW_COLEAD_SLM = xyes) +if test "x$HW_COLEAD_SLM" = "xyes"; then + AC_DEFINE(HAVE_HW_COLEAD_SLM, 1, [Colead SLM support]) +fi + AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo], [enable demo driver support [default=yes]]), [LA_DEMO="$enableval"], @@ -124,7 +133,7 @@ if test "x$LA_DEMO" = "xyes"; then fi AC_ARG_ENABLE(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm], - [enable Fluke DMM support. [default=yes]]), + [enable Fluke DMM support [default=yes]]), [HW_FLUKE_DMM="$enableval"], [HW_FLUKE_DMM=yes]) AM_CONDITIONAL(HW_FLUKE_DMM, test x$HW_FLUKE_DMM = xyes) @@ -142,7 +151,7 @@ if test "x$LA_FX2LAFW" = "xyes"; then fi AC_ARG_ENABLE(genericdmm, AC_HELP_STRING([--enable-genericdmm], - [enable genericdmm support (for most DMMs). [default=yes]]), + [enable genericdmm support (for most DMMs) [default=yes]]), [HW_GENERICDMM="$enableval"], [HW_GENERICDMM=yes]) AM_CONDITIONAL(HW_GENERICDMM, test x$HW_GENERICDMM = xyes) @@ -150,8 +159,7 @@ if test "x$HW_GENERICDMM" = "xyes"; then AC_DEFINE(HAVE_HW_GENERICDMM, 1, [Generic DMM support]) fi -AC_ARG_ENABLE(hantek-dso, - AC_HELP_STRING([--enable-hantek-dso], +AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso], [enable Hantek DSO support [default=yes]]), [HW_HANTEK_DSO="$enableval"], [HW_HANTEK_DSO=yes]) @@ -180,7 +188,7 @@ if test "x$LA_OLS" = "xyes"; then fi AC_ARG_ENABLE(radioshack-dmm, AC_HELP_STRING([--enable-radioshack-dmm], - [enable RadioShack DMM support. [default=yes]]), + [enable RadioShack DMM support [default=yes]]), [HW_RADIOSHACK_DMM="$enableval"], [HW_RADIOSHACK_DMM=yes]) AM_CONDITIONAL(HW_RADIOSHACK_DMM, test x$HW_RADIOSHACK_DMM = xyes) @@ -189,14 +197,23 @@ if test "x$HW_RADIOSHACK_DMM" = "xyes"; then fi AC_ARG_ENABLE(tekpower-dmm, AC_HELP_STRING([--enable-tekpower-dmm], - [enable Tekpower DMM support. [default=yes]]), - [HW_TEKPOWER_DMM="$enableval"], - [HW_TEKPOWER_DMM=yes]) + [enable TekPower DMM support [default=yes]]), + [HW_TEKPOWER_DMM="$enableval"], + [HW_TEKPOWER_DMM=yes]) AM_CONDITIONAL(HW_TEKPOWER_DMM, test x$HW_TEKPOWER_DMM = xyes) if test "x$HW_TEKPOWER_DMM" = "xyes"; then AC_DEFINE(HAVE_HW_TEKPOWER_DMM, 1, [TekPower DMM support]) fi +AC_ARG_ENABLE(uni-t-dmm, AC_HELP_STRING([--enable-uni-t-dmm], + [enable UNI-T DMM support [default=yes]]), + [HW_UNI_T_DMM="$enableval"], + [HW_UNI_T_DMM=yes]) +AM_CONDITIONAL(HW_UNI_T_DMM, test x$HW_UNI_T_DMM = xyes) +if test "x$HW_UNI_T_DMM" = "xyes"; then + AC_DEFINE(HAVE_HW_UNI_T_DMM, 1, [UNI-T DMM support]) +fi + AC_ARG_ENABLE(zeroplus-logic-cube, AC_HELP_STRING([--enable-zeroplus-logic-cube], [enable ZEROPLUS Logic Cube support [default=yes]]), @@ -216,7 +233,7 @@ SR_PKGLIBS="" # libglib-2.0 is always needed. # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement). -AM_PATH_GLIB_2_0([2.28.0], +AM_PATH_GLIB_2_0([2.32.0], [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) # libgthread-2.0 is always needed (e.g. for the demo hardware driver). @@ -274,13 +291,13 @@ if test "x$LA_ALSA" != xno; then SR_PKGLIBS="$SR_PKGLIBS alsa"]) fi -# EZUSB FX2 firmware helpers only needed for some hardware drivers +# EZUSB FX2 firmware helper code is only needed for some hardware drivers. AM_CONDITIONAL(NEED_EZUSB, \ test "x$LA_FX2LAFW" != xno \ -o "x$HW_HANTEK_DSO" != xno \ ) -# Serial port helpers only needed for some hardware drivers +# Serial port helper code is only needed for some hardware drivers. AM_CONDITIONAL(NEED_SERIAL, \ test "x$LA_OLS" != xno \ -o "x$HW_AGILENT_DMM" != xno \ @@ -327,7 +344,9 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/alsa/Makefile hardware/asix-sigma/Makefile hardware/chronovu-la8/Makefile + hardware/colead-slm/Makefile hardware/common/Makefile + hardware/common/dmm/Makefile hardware/demo/Makefile hardware/fluke-dmm/Makefile hardware/fx2lafw/Makefile @@ -337,6 +356,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile hardware/openbench-logic-sniffer/Makefile hardware/radioshack-dmm/Makefile hardware/tekpower-dmm/Makefile + hardware/uni-t-dmm/Makefile hardware/zeroplus-logic-cube/Makefile input/Makefile output/Makefile @@ -372,6 +392,7 @@ echo -e "\nEnabled hardware drivers:\n" echo " - Agilent DMM..................... $HW_AGILENT_DMM" echo " - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA" echo " - ChronoVu LA8.................... $LA_CHRONOVU_LA8" +echo " - Colead SLM...................... $HW_COLEAD_SLM" echo " - Demo driver..................... $LA_DEMO" echo " - Fluke DMM....................... $HW_FLUKE_DMM" echo " - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW" @@ -380,7 +401,8 @@ echo " - Hantek DSO...................... $HW_HANTEK_DSO" echo " - Link MSO-19..................... $LA_LINK_MSO19" echo " - Openbench Logic Sniffer......... $LA_OLS" echo " - Radioshack DMM.................. $HW_RADIOSHACK_DMM" -echo " - Tekpower DMM.................... $HW_TEKPOWER_DMM" +echo " - TekPower DMM.................... $HW_TEKPOWER_DMM" +echo " - UNI-T DMM....................... $HW_UNI_T_DMM" echo " - ZEROPLUS Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE" echo