]> sigrok.org Git - libsigrok.git/commitdiff
configure.ac: Move a teleinfo snippet to the correct place.
authorUwe Hermann <redacted>
Sun, 3 Nov 2013 22:28:03 +0000 (23:28 +0100)
committerUwe Hermann <redacted>
Mon, 4 Nov 2013 00:14:57 +0000 (01:14 +0100)
This breaks some configure use-cases otherwise.

configure.ac

index 63280d05a7e712cb39040a9c60c8fe9f6cc6249f..1b91c78f008bad14a3ae8791eb5bc0da301d2c14 100644 (file)
@@ -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])