X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=75d14e8b2f58444b26ebd9027996c2158052c158;hb=9fd504b9eb37502b4cd2d5d105f9f24ad1b5adf9;hp=89f8888627c4c68c2d0400faea6f10a4c6442551;hpb=bdd7618cd1f0645e3446814a9438965863d859f6;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 89f88886..75d14e8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,6 @@ 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
@@ -77,37 +76,42 @@ AC_SUBST(SR_LIB_LDFLAGS)
 
 # Hardware support '--enable' options.
 
+AC_ARG_ENABLE(all-drivers, AC_HELP_STRING([--enable-all-drivers],
+	[enable all drivers by default [default=yes]]),
+	[HW_ENABLED_DEFAULT="$enableval"],
+	[HW_ENABLED_DEFAULT="yes"])
+
 AC_ARG_ENABLE(agilent-dmm, AC_HELP_STRING([--enable-agilent-dmm],
-	      [enable Agilent DMM support [default=yes]]),
-	      [HW_AGILENT_DMM="$enableval"],
-	      [HW_AGILENT_DMM=yes])
+	[enable Agilent DMM support [default=yes]]),
+	[HW_AGILENT_DMM="$enableval"],
+	[HW_AGILENT_DMM=$HW_ENABLED_DEFAULT])
 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 support])
 fi
 
 AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa],
-	      [enable ALSA driver support [default=yes]]),
-	      [HW_ALSA="$enableval"],
-	      [HW_ALSA=yes])
+	[enable ALSA driver support [default=yes]]),
+	[HW_ALSA="$enableval"],
+	[HW_ALSA=$HW_ENABLED_DEFAULT])
 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
 
 AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma],
-	      [enable ASIX SIGMA/SIGMA2 support [default=yes]]),
-	      [LA_ASIX_SIGMA="$enableval"],
-	      [LA_ASIX_SIGMA=yes])
+	[enable ASIX SIGMA/SIGMA2 support [default=yes]]),
+	[LA_ASIX_SIGMA="$enableval"],
+	[LA_ASIX_SIGMA=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(LA_ASIX_SIGMA, test x$LA_ASIX_SIGMA = xyes)
 if test "x$LA_ASIX_SIGMA" = "xyes"; then
 	AC_DEFINE(HAVE_LA_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
 fi
 
 AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8],
-	      [enable ChronoVu LA8 support [default=yes]]),
-	      [LA_CHRONOVU_LA8="$enableval"],
-	      [LA_CHRONOVU_LA8=yes])
+	[enable ChronoVu LA8 support [default=yes]]),
+	[LA_CHRONOVU_LA8="$enableval"],
+	[LA_CHRONOVU_LA8=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(LA_CHRONOVU_LA8, test x$LA_CHRONOVU_LA8 = xyes)
 if test "x$LA_CHRONOVU_LA8" = "xyes"; then
 	AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
@@ -116,62 +120,61 @@ 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])
+	[HW_COLEAD_SLM=$HW_ENABLED_DEFAULT])
 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"],
-	      [LA_DEMO=yes])
+	[enable demo driver support [default=yes]]),
+	[LA_DEMO="$enableval"],
+	[LA_DEMO=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(LA_DEMO, test x$LA_DEMO = xyes)
 if test "x$LA_DEMO" = "xyes"; then
 	AC_DEFINE(HAVE_LA_DEMO, 1, [Demo driver support])
 fi
 
 AC_ARG_ENABLE(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm],
-	      [enable Fluke DMM support [default=yes]]),
-	      [HW_FLUKE_DMM="$enableval"],
-	      [HW_FLUKE_DMM=yes])
+	[enable Fluke DMM support [default=yes]]),
+	[HW_FLUKE_DMM="$enableval"],
+	[HW_FLUKE_DMM=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(HW_FLUKE_DMM, test x$HW_FLUKE_DMM = xyes)
 if test "x$HW_FLUKE_DMM" = "xyes"; then
 	AC_DEFINE(HAVE_HW_FLUKE_DMM, 1, [Fluke DMM support])
 fi
 
 AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw],
-	      [enable fx2lafw support (for FX2 LAs). [default=yes]]),
-	      [LA_FX2LAFW="$enableval"],
-	      [LA_FX2LAFW=yes])
+	[enable fx2lafw support (for FX2 LAs). [default=yes]]),
+	[LA_FX2LAFW="$enableval"],
+	[LA_FX2LAFW=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(LA_FX2LAFW, test x$LA_FX2LAFW = xyes)
 if test "x$LA_FX2LAFW" = "xyes"; then
 	AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw support])
 fi
 
 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])
+	[enable Hantek DSO support [default=yes]]),
+	[HW_HANTEK_DSO="$enableval"],
+	[HW_HANTEK_DSO=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes)
 if test "x$HW_HANTEK_DSO" = "xyes"; then
 	AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support])
 fi
 
-# Disabled by default, unfinished.
 AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb],
 	[enable Lascar EL-USB support [default=yes]]),
 	[HW_LASCAR_EL_USB="$enableval"],
-	[HW_LASCAR_EL_USB=yes])
+	[HW_LASCAR_EL_USB=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(HW_LASCAR_EL_USB, test x$HW_LASCAR_EL_USB = xyes)
 if test "x$HW_LASCAR_EL_USB" = "xyes"; then
 	AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [Lascar EL-USB support])
 fi
 
 AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19],
-	      [enable Link Instruments MSO-19 support [default=no]]),
-	      [LA_LINK_MSO19="$enableval"],
-	      [LA_LINK_MSO19=no])
+	[enable Link Instruments MSO-19 support [default=yes]]),
+	[LA_LINK_MSO19="$enableval"],
+	[LA_LINK_MSO19=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(LA_LINK_MSO19, test x$LA_LINK_MSO19 = xyes)
 if test "x$LA_LINK_MSO19" = "xyes"; then
 	AC_DEFINE(HAVE_LA_LINK_MSO19, 1, [Link Instruments MSO-19 support])
@@ -180,25 +183,34 @@ fi
 AC_ARG_ENABLE(nexus-osciprime, AC_HELP_STRING([--enable-nexus-osciprime],
 	[enable Nexus Osciprime support [default=yes]]),
 	[HW_NEXUS_OSCIPRIME="$enableval"],
-	[HW_NEXUS_OSCIPRIME=yes])
+	[HW_NEXUS_OSCIPRIME=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(HW_NEXUS_OSCIPRIME, test x$HW_NEXUS_OSCIPRIME = xyes)
 if test "x$HW_NEXUS_OSCIPRIME" = "xyes"; then
 	AC_DEFINE(HAVE_HW_NEXUS_OSCIPRIME, 1, [Nexus Osciprime support])
 fi
 
 AC_ARG_ENABLE(ols, AC_HELP_STRING([--enable-ols],
-	      [enable OpenBench Logic Sniffer (OLS) support [default=yes]]),
-	      [LA_OLS="$enableval"],
-	      [LA_OLS=yes])
+	[enable OpenBench Logic Sniffer (OLS) support [default=yes]]),
+	[LA_OLS="$enableval"],
+	[LA_OLS=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(LA_OLS, test x$LA_OLS = xyes)
 if test "x$LA_OLS" = "xyes"; then
 	AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
 fi
 
+AC_ARG_ENABLE(rigol-ds1xx2, AC_HELP_STRING([--enable-rigol-ds1xx2],
+	[enable Rigol DS1xx2 support [default=yes]]),
+	[HW_RIGOL_DS1XX2="$enableval"],
+	[HW_RIGOL_DS1XX2=$HW_ENABLED_DEFAULT])
+AM_CONDITIONAL(HW_RIGOL_DS1XX2, test x$HW_RIGOL_DS1XX2 = xyes)
+if test "x$HW_RIGOL_DS1XX2" = "xyes"; then
+	AC_DEFINE(HAVE_HW_RIGOL_DS1XX2, 1, [Rigol DS1xx2 support])
+fi
+
 AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm],
-	      [enable serial DMM support [default=yes]]),
-	      [HW_SERIAL_DMM="$enableval"],
-	      [HW_SERIAL_DMM=yes])
+	[enable serial DMM support [default=yes]]),
+	[HW_SERIAL_DMM="$enableval"],
+	[HW_SERIAL_DMM=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(HW_SERIAL_DMM, test x$HW_SERIAL_DMM = xyes)
 if test "x$HW_SERIAL_DMM" = "xyes"; then
 	AC_DEFINE(HAVE_HW_SERIAL_DMM, 1, [Serial DMM support])
@@ -207,16 +219,16 @@ fi
 AC_ARG_ENABLE(tondaj-sl-814, AC_HELP_STRING([--enable-tondaj-sl-814],
 	[enable Tondaj SL-814 support [default=yes]]),
 	[HW_TONDAJ_SL_814="$enableval"],
-	[HW_TONDAJ_SL_814=yes])
+	[HW_TONDAJ_SL_814=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(HW_TONDAJ_SL_814, test x$HW_TONDAJ_SL_814 = xyes)
 if test "x$HW_TONDAJ_SL_814" = "xyes"; then
 	AC_DEFINE(HAVE_HW_TONDAJ_SL_814, 1, [Tondaj SL-814 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])
+	[enable UNI-T DMM support [default=yes]]),
+	[HW_UNI_T_DMM="$enableval"],
+	[HW_UNI_T_DMM=$HW_ENABLED_DEFAULT])
 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])
@@ -225,17 +237,17 @@ fi
 AC_ARG_ENABLE(victor-dmm, AC_HELP_STRING([--enable-victor-dmm],
 	[enable victor-dmm support [default=yes]]),
 	[HW_VICTOR_DMM="$enableval"],
-	[HW_VICTOR_DMM=yes])
+	[HW_VICTOR_DMM=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(HW_VICTOR_DMM, test x$HW_VICTOR_DMM = xyes)
 if test "x$HW_VICTOR_DMM" = "xyes"; then
 	AC_DEFINE(HAVE_HW_VICTOR_DMM, 1, [victor-dmm support])
 fi
 
 AC_ARG_ENABLE(zeroplus-logic-cube,
-	      AC_HELP_STRING([--enable-zeroplus-logic-cube],
-	      [enable ZEROPLUS Logic Cube support [default=yes]]),
-	      [LA_ZEROPLUS_LOGIC_CUBE="$enableval"],
-	      [LA_ZEROPLUS_LOGIC_CUBE=yes])
+	AC_HELP_STRING([--enable-zeroplus-logic-cube],
+	[enable ZEROPLUS Logic Cube support [default=yes]]),
+	[LA_ZEROPLUS_LOGIC_CUBE="$enableval"],
+	[LA_ZEROPLUS_LOGIC_CUBE=$HW_ENABLED_DEFAULT])
 AM_CONDITIONAL(LA_ZEROPLUS_LOGIC_CUBE, test x$LA_ZEROPLUS_LOGIC_CUBE = xyes)
 if test "x$LA_ZEROPLUS_LOGIC_CUBE" = "xyes"; then
 	AC_DEFINE(HAVE_LA_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support])
@@ -253,11 +265,6 @@ SR_PKGLIBS=""
 AM_PATH_GLIB_2_0([2.28.0],
 	[CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
-# libgthread-2.0 is always needed (e.g. for the demo hardware driver).
-PKG_CHECK_MODULES([gthread], [gthread-2.0 >= 2.22.0],
-	[CFLAGS="$CFLAGS $gthread_CFLAGS"; LIBS="$LIBS $gthread_LIBS";
-	SR_PKGLIBS="$SR_PKGLIBS gthread-2.0"])
-
 # libusb-1.0 is only needed for some hardware drivers.
 if test "x$LA_ASIX_SIGMA" != xno \
    -o "x$LA_CHRONOVU_LA8" != xno \
@@ -373,6 +380,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
 		 hardware/common/Makefile
 		 hardware/lascar-el-usb/Makefile
 		 hardware/nexus-osciprime/Makefile
+		 hardware/rigol-ds1xx2/Makefile
 		 hardware/tondaj-sl-814/Makefile
 		 hardware/victor-dmm/Makefile
 		 hardware/common/dmm/Makefile
@@ -405,7 +413,7 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0" "gthread-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "alsa"; do
+for lib in "glib-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "alsa"; do
 	if `$PKG_CONFIG --exists $lib`; then
 		ver=`$PKG_CONFIG --modversion $lib`
 		answer="yes ($ver)"
@@ -429,6 +437,7 @@ echo "  - Lascar EL-USB................... $HW_LASCAR_EL_USB"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"
 echo "  - Nexus Osciprime................. $HW_NEXUS_OSCIPRIME"
 echo "  - Openbench Logic Sniffer......... $LA_OLS"
+echo "  - Rigol DS1xx2.................... $HW_RIGOL_DS1XX2"
 echo "  - Serial DMM...................... $HW_SERIAL_DMM"
 echo "  - Tondaj SL-814................... $HW_TONDAJ_SL_814"
 echo "  - UNI-T DMM....................... $HW_UNI_T_DMM"