diff --git a/autoconf/ax_with_curses.m4 b/autoconf/ax_with_curses.m4 deleted file mode 100644 index 586dee4..0000000 --- a/autoconf/ax_with_curses.m4 +++ /dev/null @@ -1,122 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_with_curses.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_WITH_CURSES -# -# DESCRIPTION -# -# Detect SysV compatible curses, such as ncurses. -# -# Defines HAVE_CURSES_H or HAVE_NCURSES_H if curses is found. CURSES_LIB -# is also set with the required library, but is not appended to LIBS -# automatically. If no working curses library is found CURSES_LIB will be -# left blank. If CURSES_LIB is set in the environment, the supplied value -# will be used. -# -# There are two options: --with-ncurses forces the use of ncurses, and -# --with-ncursesw forces the use of ncursesw (wide character ncurses). The -# corresponding options --without-ncurses and --without-ncursesw force -# those libraries not to be used. By default, ncursesw is preferred to -# ncurses, which is preferred to plain curses. -# -# ax_cv_curses is set to "yes" if any curses is found (including -# ncurses!); ax_cv_ncurses is set to "yes" if any ncurses is found, and -# ax_cv_ncursesw is set to "yes" if ncursesw is found. -# -# LICENSE -# -# Copyright (c) 2009 Mark Pulford -# Copyright (c) 2009 Damian Pietras -# Copyright (c) 2009 Reuben Thomas -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 6 - -AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES]) -AC_DEFUN([AX_WITH_CURSES], - [AC_ARG_WITH(ncurses, [AS_HELP_STRING([--with-ncurses], - [Force the use of ncurses over curses])],,) - ax_save_LIBS="$LIBS" - AC_ARG_WITH(ncursesw, [AS_HELP_STRING([--without-ncursesw], - [Don't use ncursesw (wide character support)])],,) - if test ! "$CURSES_LIB" -a "$with_ncurses" != no -a "$with_ncursesw" != "no" - then - AC_CACHE_CHECK([for working ncursesw], ax_cv_ncursesw, - [LIBS="$ax_save_LIBS -lncursesw" - AC_TRY_LINK( - [#include ], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - ax_cv_ncursesw=yes, ax_cv_ncursesw=no)]) - if test "$ax_cv_ncursesw" = yes - then - AC_CHECK_HEADER([ncursesw/curses.h], AC_DEFINE(HAVE_NCURSESW_H, 1, - [Define if you have ncursesw.h])) - AC_DEFINE(HAVE_NCURSES_H, 1, [Define if you have ncursesw/curses.h]) - AC_DEFINE(HAVE_NCURSESW, 1, [Define if you have libncursesw]) - CURSES_LIB="-lncursesw" - ax_cv_ncurses=yes - ax_cv_curses=yes - fi - fi - if test ! "$CURSES_LIB" -a "$with_ncurses" != no -a "$with_ncursesw" != yes - then - AC_CACHE_CHECK([for working ncurses], ax_cv_ncurses, - [LIBS="$ax_save_LIBS -lncurses" - AC_TRY_LINK( - [#include ], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - ax_cv_ncurses=yes, ax_cv_ncurses=no)]) - if test "$ax_cv_ncurses" = yes - then - AC_DEFINE([HAVE_NCURSES_H],[1],[Define if you have ncurses.h]) - CURSES_LIB="-lncurses" - ax_cv_curses=yes - fi - fi - if test "$ax_cv_curses" != yes -a "$with_ncurses" != yes -a "$with_ncursesw" != yes - then - if test ! "$CURSES_LIB" - then - CURSES_LIB="-lcurses" - fi - AC_CACHE_CHECK([for working curses], ax_cv_curses, - [LIBS="$ax_save_LIBS $CURSES_LIB" - AC_TRY_LINK( - [#include ], - [chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); ], - ax_cv_curses=yes, ax_cv_curses=no)]) - if test "$ax_cv_curses" = yes - then - AC_DEFINE([HAVE_CURSES_H],[1],[Define if you have curses.h]) - fi - fi - LIBS="$ax_save_LIBS" -])dnl diff --git a/configure b/configure index 76d1322..6b490df 100755 --- a/configure +++ b/configure @@ -2257,90 +2257,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_with_curses.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_WITH_CURSES -# -# DESCRIPTION -# -# Detect SysV compatible curses, such as ncurses. -# -# Defines HAVE_CURSES_H or HAVE_NCURSES_H if curses is found. CURSES_LIB -# is also set with the required library, but is not appended to LIBS -# automatically. If no working curses library is found CURSES_LIB will be -# left blank. If CURSES_LIB is set in the environment, the supplied value -# will be used. -# -# There are two options: --with-ncurses forces the use of ncurses, and -# --with-ncursesw forces the use of ncursesw (wide character ncurses). The -# corresponding options --without-ncurses and --without-ncursesw force -# those libraries not to be used. By default, ncursesw is preferred to -# ncurses, which is preferred to plain curses. -# -# ax_cv_curses is set to "yes" if any curses is found (including -# ncurses!); ax_cv_ncurses is set to "yes" if any ncurses is found, and -# ax_cv_ncursesw is set to "yes" if ncursesw is found. -# -# LICENSE -# -# Copyright (c) 2009 Mark Pulford -# Copyright (c) 2009 Damian Pietras -# Copyright (c) 2009 Reuben Thomas -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 6 - -# This is what autoupdate's m4 run will expand. It fires the warning -# (with _au_warn_XXX), outputs it into the updated configure.ac (with -# m4_warn), and then outputs the replacement expansion. We need extra -# quotation around the m4_warn and dnl so they will be written -# unexpanded into the updated configure.ac. - - -# This is an auxiliary macro that is also run when -# autoupdate runs m4. It simply calls m4_warning, but -# we need a wrapper so that each warning is emitted only -# once. We break the quoting in m4_warning's argument in -# order to expand this macro's arguments, not AU_DEFUN's. - - -# Finally, this is the expansion that is picked up by -# autoconf, causing NAME to expand to NEW-CODE, plus -# (if SILENT is not "silent") a m4_warning telling the -# maintainer to run autoupdate. We don't issue MESSAGE -# from autoconf, because that's instructions for what -# to do *after* running autoupdate. - diff --git a/configure.ac b/configure.ac index 0261c6d..6ecb7b0 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,6 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST m4_include([autoconf/pkg.m4]) -m4_include([autoconf/ax_with_curses.m4]) PKG_PREREQ(0.29) diff --git a/deb/control b/deb/control index 2d37384..510cb1e 100644 --- a/deb/control +++ b/deb/control @@ -4,7 +4,6 @@ Priority: optional Maintainer: Fredrik Öhrström Build-Depends: debhelper-compat (= 13) , librtlsdr-dev - , libncurses-dev , jq , netcat-openbsd Standards-Version: 4.5.1 diff --git a/docker/Dockerfile b/docker/Dockerfile index f39d7fc..a129dfa 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ FROM multiarch/alpine:${TARGETARCH}${TARGETVARIANT}-latest-stable AS build -RUN apk add --no-cache alpine-sdk gcc linux-headers ncurses-dev librtlsdr-dev cmake libusb-dev bash +RUN apk add --no-cache alpine-sdk gcc linux-headers librtlsdr-dev cmake libusb-dev bash RUN git clone https://github.com/wmbusmeters/wmbusmeters.git && \ git clone https://github.com/weetmuts/rtl-wmbus.git && \ git clone https://github.com/merbanan/rtl_433.git @@ -12,7 +12,7 @@ RUN mkdir build && cd build && cmake ../ && make FROM multiarch/alpine:${TARGETARCH}${TARGETVARIANT}-latest-stable as scratch ENV QEMU_EXECVE=1 -RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb ncurses rtl-sdr netcat-openbsd +RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr netcat-openbsd WORKDIR /wmbusmeters COPY --from=build /wmbusmeters/build/wmbusmeters /wmbusmeters/wmbusmeters COPY --from=build /rtl-wmbus/build/rtl_wmbus /usr/bin/rtl_wmbus diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 06344d4..f952f26 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -49,7 +49,6 @@ parts: - g++ - make - librtlsdr-dev - - libncurses5-dev stage-packages: - mosquitto-clients - curl