X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=1280582ed562696ce0314a05bf62db49c3e7b020;hb=3e43da1f70d48aba917026074d46ca4c91e43bf1;hp=f0435c42bd1a08370d84b9a3ab181dac7d411b0a;hpb=06a3e78adb41974ed759b39812ba1f83fd21a5aa;p=libsigrok.git diff --git a/configure.ac b/configure.ac index f0435c42..1280582e 100644 --- a/configure.ac +++ b/configure.ac @@ -149,11 +149,6 @@ AC_ARG_ENABLE(hameg-hmo, AC_HELP_STRING([--enable-hameg-hmo], [HW_HAMEG_HMO="$enableval"], [HW_HAMEG_HMO=$HW_ENABLED_DEFAULT]) -AM_CONDITIONAL(HW_HAMEG_HMO, test x$HW_HAMEG_HMO = xyes) -if test "x$HW_HAMEG_HMO" = "xyes"; then - AC_DEFINE(HAVE_HW_HAMEG_HMO, 1, [Hameg HMO support]) -fi - AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso], [enable Hantek DSO support [default=yes]]), [HW_HANTEK_DSO="$enableval"], @@ -274,7 +269,8 @@ PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0], SR_PKGLIBS="$SR_PKGLIBS libserialport"], [have_libserialport="no"; HW_AGILENT_DMM="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_LINK_MSO19="no"; HW_MIC_985XX="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_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"]) @@ -428,6 +424,11 @@ if test "x$HW_HANTEK_DSO" = "xyes"; then AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support]) fi +AM_CONDITIONAL(HW_HAMEG_HMO, test x$HW_HAMEG_HMO = xyes) +if test "x$HW_HAMEG_HMO" = "xyes"; then + AC_DEFINE(HAVE_HW_HAMEG_HMO, 1, [Hameg HMO support]) +fi + AM_CONDITIONAL(HW_IKALOGIC_SCANALOGIC2, test x$HW_IKALOGIC_SCANALOGIC2 = xyes) if test "x$HW_IKALOGIC_SCANALOGIC2" = "xyes"; then AC_DEFINE(HAVE_HW_IKALOGIC_SCANALOGIC2, 1, [IKALOGIC Scanalogic-2 support])