From: Uwe Hermann Date: Tue, 3 Dec 2013 14:37:36 +0000 (+0100) Subject: configure.ac: Move Hameg HMO AM_CONDITIONAL to the correct place. X-Git-Tag: libsigrok-0.3.0~505 X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=582b3d21d39526b602f3611ae0082eacfad8e11e;p=libsigrok.git configure.ac: Move Hameg HMO AM_CONDITIONAL to the correct place. --- diff --git a/configure.ac b/configure.ac index f0435c42..e6cb7143 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"], @@ -428,6 +423,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])