From: Uwe Hermann <redacted>
Date: Sun, 3 Nov 2013 22:28:03 +0000 (+0100)
Subject: configure.ac: Move a teleinfo snippet to the correct place.
X-Git-Tag: libsigrok-0.2.2~11
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=122d33d47d17fd56c6306190b7066d8819b43145;p=libsigrok.git

configure.ac: Move a teleinfo snippet to the correct place.

This breaks some configure use-cases otherwise.
---

diff --git a/configure.ac b/configure.ac
index 63280d05..1b91c78f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,10 +203,6 @@ AC_ARG_ENABLE(teleinfo, AC_HELP_STRING([--enable-teleinfo],
 	[enable Teleinfo support [default=yes]]),
 	[HW_TELEINFO="$enableval"],
 	[HW_TELEINFO=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(HW_TELEINFO, test x$HW_TELEINFO = xyes)
-if test "x$HW_TELEINFO" = "xyes"; then
-	AC_DEFINE(HAVE_HW_TELEINFO, 1, [Teleinfo support])
-fi
 
 AC_ARG_ENABLE(tondaj-sl-814, AC_HELP_STRING([--enable-tondaj-sl-814],
 	[enable Tondaj SL-814 support [default=yes]]),
@@ -441,6 +437,11 @@ if test "x$HW_SERIAL_DMM" = "xyes"; then
 	AC_DEFINE(HAVE_HW_SERIAL_DMM, 1, [Serial DMM support])
 fi
 
+AM_CONDITIONAL(HW_TELEINFO, test x$HW_TELEINFO = xyes)
+if test "x$HW_TELEINFO" = "xyes"; then
+	AC_DEFINE(HAVE_HW_TELEINFO, 1, [Teleinfo support])
+fi
+
 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])