BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This breaks some configure use-cases otherwise.
This commit is contained in:
Uwe Hermann 2013-11-03 23:28:03 +01:00
parent 9b2f03bbd2
commit 122d33d47d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View 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])