Commit 1114ec53 authored by Christoph Berg's avatar Christoph Berg

Import Upstream version 1.3.0

parent 2599b3ae
This diff is collapsed.
......@@ -196,7 +196,8 @@ CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/tlf.1.in AUTHORS COPYING ChangeLog INSTALL NEWS \
README compile config.guess config.sub install-sh missing
README compile config.guess config.sub depcomp install-sh \
missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -252,7 +253,8 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURSES_LIB = @CURSES_LIB@
CURSES_CFLAGS = @CURSES_CFLAGS@
CURSES_LIBS = @CURSES_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -293,7 +295,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_LIB = @PANEL_LIB@
PANEL_LIBS = @PANEL_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
......
tlf-1.3.0
=========
Major release.
Besides a some of fixed bugs and i lot of internal improvements it provides
some new features:
Bugfixes:
- Fixed wrong parsing of EXCLUDE_MULTILIST keyword.
- Fixed recognition of CQ zone for 1Axxx stations.
New features:
- Allow direct use of fldigis XMLRPC interface for receiving and sending
digimode data. See doc/READMA_RTTY.txt and man page for details.
Tnx Ervin HA2OS. (The old GMFSK interface to fldigi is still available
but will be dropped in next versions).
- New keyword MINITEST to support Minitest like contests, where you can
operate the same station each time in one of two or more time
intervalls. Tnx HA2OS.
- New multi keyword UNIQUE_CALL_MULTI for Minitest or CWops CWT contest.
Allows to count unique call signs as multi for all band or per band.
Tnx HA2OS.
- Enable PTT keying via Hamlibs CAT interface (for SSB contests). Tnx Nate
N0NB for providing the code.
- Updated CTY.DAT to version from January 2017.
- Better implementation of WPX prefix recognition. Can now handle call
signs with only letters (e.g. RAEM) and long numbers (e.g. DR2006Q).
- Add hints to correct own CQ zone to FAQ.
- Refactor keying logic to allow having separate keyer devices for CW and
DIGI modes at the same time.
- Better automatic recognition of ncurses components for different
distributions. Adds also support for ncurses versions with split out
tinfo database.
- Fix color handling and packet screen interface for the new ncurses6.
tlf-1.2.4.5
===========
Bugfix release.
Bug fixes:
- autosend did not work as Enter key was wrongly checked. Tnx Feed DH5FS.
tlf-1.2.4.4
===========
Bugfix release.
Bug fixes:
- Do not change scorewindow state when sending to DX cluster. Tnx HA2OS
- Fix Grab function if BMAUTOGRAB not set.
- Fix bandmap display if grabbed station is very near to other ones
in bandmap. Tnx Fred DH5FS.
tlf-1.2.4.3
===========
New feature:
- QTC_RECV_LAZY keyword. Setting it skips check of received QTC records
for completion. Useful during rx if you record the audio during qso
and complete the QTC records later.
tlf-1.2.4.2
===========
Bugfix release.
Bug fixes:
- fix some memory and ressource leaks in seldom used functions
Enhancements:
- Update and fix spelling errors in man page
- Cleanup some code in CW sending logic
- Align hamlib's passband argument to new macro: RIG_PASSBAND_NORMAL
(provided by the coming hamlib-3.1). That allows to switch
frequency without changing the rig passband settings.
tlf-1.2.4.1
===========
......
This diff is collapsed.
#! /bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2015 Free Software Foundation, Inc.
# Copyright 1992-2016 Free Software Foundation, Inc.
timestamp='2015-12-14'
timestamp='2016-03-30'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -33,7 +33,7 @@ timestamp='2015-12-14'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
......@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright 1992-2015 Free Software Foundation, Inc.
Copyright 1992-2016 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
......@@ -1400,7 +1400,7 @@ case $os in
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
| -bitrig* | -openbsd* | -solidbsd* \
| -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
......@@ -1549,6 +1549,8 @@ case $os in
;;
-nacl*)
;;
-ios)
;;
-none)
;;
*)
......
This diff is collapsed.
# Process this file with autoconf to produce a configure script.
AC_INIT([Tlf],
[1.2.4.1],
[1.3.0],
[tlf-devel@nongnu.org],
[tlf],
[https://github.com/Tlf/tlf])
......@@ -77,8 +77,8 @@ AS_IF([test "x$ax_cv_panel" != xyes],
dnl Check if we want to link the Hamradio control libraries (hamlib)
AC_MSG_CHECKING([whether to build Hamlib support])
AC_ARG_ENABLE([hamlib], [
AS_HELP_STRING([--enable-hamlib],
AC_ARG_ENABLE([hamlib],
[AS_HELP_STRING([--enable-hamlib],
[Add support for Ham Radio Control Libraries])],
[wanthamlib=true],
[wanthamlib=false])
......@@ -117,8 +117,8 @@ AS_IF([test "x$wanthamlib" = xtrue], [
dnl Check if we want to use xmlrpc to read carrier from Fldigi
AC_MSG_CHECKING([whether to build Fldigi XML RPC support])
AC_ARG_ENABLE([fldigi-xmlrpc], [
AS_HELP_STRING([--enable-fldigi-xmlrpc],
AC_ARG_ENABLE([fldigi-xmlrpc],
[AS_HELP_STRING([--enable-fldigi-xmlrpc],
[Add support for XMLRPC to read Fldigi's carrier (usually in RTTY/DIGIMODE)])],
[wantfldigixmlrpc=true],
[wantfldigixmlrpc=false])
......
......@@ -5,7 +5,7 @@ A: You can use the master.scp file from http://www.supercheckpartial.com
in TLF's global data directory (/usr/local/share/TLF). The file in the
actual contest directory takes precedence.
Q: Can I add my own list of callsigns to the callmaster file.
Q: Can I add my own list of call signs to the callmaster file.
A: Sure. Just add it to the end of the file - each call (in uppercase)
on a line by itself.
......@@ -17,3 +17,22 @@ A: Try http://www.country-files.com/ Make sure to save it as 'cty.dat' in
lower case letters.
Be aware that there a two different file formats. Make sure to download
the file for TLF.
Q: TLF thinks that I am in cq zone 5 but in fact I am in another one. How can
I fix that?
A: At the moment you have to modify your cty.dat file. Look for the entry
for your country, e.g. for Canada look for
Canada: 05: 09: NA: 44.35: 78.75: 5.0: VE:0
Below that entry there may be lines with special prefixes and call signs
which counts also for Canada. Add yourself (VE3XYZ in the following
example) to the list with the correct CQ zone appended in parentheses, e.g.
VE2IM(2)[4],VY0PW(4)[3],VE3XYZ(3);
That would override the default setting for the CQ zone (5 for VE)
with your one (3). See also http://www.country-files.com/cty-dat-format/
for a detailed description.
......@@ -168,7 +168,8 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURSES_LIB = @CURSES_LIB@
CURSES_CFLAGS = @CURSES_CFLAGS@
CURSES_LIBS = @CURSES_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -209,7 +210,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_LIB = @PANEL_LIB@
PANEL_LIBS = @PANEL_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
......
Tlf RTTY howto
2015, Ervin Hegedus, HA2OS
2016, Ervin Hegedus, HA2OS
This is a guide for Tlf, how to use it with Fldigi in RTTY mode,
especially in FSK, LSB or USB modulations.
especially in FSK, LSB or USB modulations. Tlf got a new Fldigi
interface, here is what you need to know.
To work in RTTY, you need to solve two problems: read and demodulate
RTTY signals (RX), and send your messages (TX). To demodulate the
......@@ -19,27 +20,32 @@ Important: if you set up your Fldigi instance, don't set up your
RIG! Tlf needs to handle the RIG, because it needs to tune the VFO,
to use the bandmap.
First, you have to create some files in your $HOME directory:
Starting with TLF-1.3 there are two ways to comunicate with Fldigi -
the old GMFSK interface and the actual XMLRPC one.
Note: Using the new interface ist recommended. The old GMFSK interface
will be no longer maintained and will go away soon.
GMFSK interface
===============
First you need to create some filesin your $HOME directory:
~$ touch TLFfldigi
~$ touch gmfsk_autofile
The TLFfldigi file indicates to Fldigi, that it needs to listen
the gmfsk_autofile file. Tlf writes its RTTY messages to
gmfsk_autofile file, and Fldigi can reads that. If you want to look
that file, when Fldigi runs, then you can't find it - after the
Fldigi reads RTTY lines from that, then removes it. So, when Tlf
wants to send a message again, it creates a new one, and Fldigi
reads that and removes again - so don't worry, if you don't find it.
that file, and Fldigi reads the messages from it.
Now in your logcfg.dat, you have to set up these variables:
In your logcfg.dat, you had to set up the following lines:
RTTYMODE
GMFSK=/home/YOURUSER/gMFSK.log
DIGIMODEM=/home/YOURUSER/gmfsk_autofile
Note, that GMFSK directive tells to Tlf, that it can be read the
output of modem, and it can be shows it in its own modem window.
Note, that GMFSK directive tells Tlf, that it can read the
output of modem, and it can be shown in its own modem window.
(The miniterm window opens when you type the ":miniterm" command
in callsign field.)
......@@ -50,10 +56,31 @@ PC. So, I've set it up like this:
DIGIMODEM=/dev/ttyS0
The TX direction of RTTY mode only is that - you don't need to do
anything in Tlf config - of course, you have to set up your Fldigi
instance, eg. sound device, etc...
XMLRPC interface
================
The only thing to do is to set the following command into your
logcfg.dat
FLDIGI
That will work as long as your Fldigi is compiled with the XMLRPC
interface and you do use the standard port for it.
If you run fldigis XMLRPC on a different port (or machine) use
FLDIGI=http://<host>:<portnumber>/RPC2
That's it. Tlf will realizes that you have Fldigi, and will
communicate through XMLRPC.
You can still read of Fldigi RX window (top) in Tlf own terminal,
just use ":miniterm" command in callsign field.
IMPORTANT: The FLDIGI command sets the XMLRPC interface as keyer for
both CW and DIGIMODE. That means you can not have FLDIGI and NETKEYER
(first for Ddigimode, second for CW) at the same time. That limitation
will go away in next versions of tlf.
The RX mode is a slightly difficult. I don't want to expose that
here, I suppose that anybody knows that, if works in RTTY. I had
......@@ -93,6 +120,15 @@ the Fldigi carrier's as it exists, and grab the next spot. Tlf will
calculates the requested QRG from the different of the spot and
Fldigi carrier's frequency, and tune the RIG. That's it.
More new feature in Fldigi interface:
- when Tlf sends a message throug Fldigi, it switches Fldigi to TX mode.
- similar to CW mode, if you press ESC while Fldigi sends the message,
Tlf will stop it.
- if the connection between Tlf and Fldigi breaks (eg. you close
Fldigi, or you start Tlf before Fldigi), then Tlf realizes it,
and handles as correctly. You will lost the Fldigi functions (no
TX/RX, QRG align), but Tlf runs away. If you start Fldigi again,
after a few seconds, Tlf will work with it again
73, Ervin
HA2OS
......
......@@ -21,7 +21,7 @@ QTC window
==========
When you enabled the QTC handling in logcfg.dat, you can open the
QTC window from either field: callsign or exchange, it doesn't matter. i
QTC window from either field: callsign or exchange, it doesn't matter.
To open it, just press CTRL+Q. If you want to close is, just simple
press ESC. The window is divided to 2 side: the left side
contains the QTC's data, the right side contains the help information.
......@@ -39,6 +39,10 @@ The data side contains the following QTC's fields:
* every line generated by the QSO's, all of them are formatted
for three fields: time, callsign and serial
Note, that if you set up the QTC_RECV_LAZY option in RECV mode
(EU station in CW/SSB contest), then Tlf will skip to check
the restrictions above.
This side contains many "meta" information:
* at right of the QTC callsign field, Tlf shows the QTC info of
current station: how many QTC has it; if the callsign field
......
......@@ -12,7 +12,9 @@
# present, along with the associated header file. The NcursesW
# (wide-character) library is searched for first, followed by Ncurses,
# then the system-default plain Curses. The first library found is the
# one returned.
# one returned. Finding libraries will first be attempted by using
# pkg-config, and should the pkg-config files not be available, will
# fallback to combinations of known flags itself.
#
# The following options are understood: --with-ncursesw, --with-ncurses,
# --without-ncursesw, --without-ncurses. The "--with" options force the
......@@ -52,23 +54,29 @@
#
# (These preprocessor symbols are discussed later in this document.)
#
# The following output variable is defined by this macro; it is precious
# and may be overridden on the ./configure command line:
# The following output variables are defined by this macro; they are
# precious and may be overridden on the ./configure command line:
#
# CURSES_LIB - library to add to xxx_LDADD
# CURSES_LIBS - library to add to xxx_LDADD
# CURSES_CFLAGS - include paths to add to xxx_CPPFLAGS
#
# The library listed in CURSES_LIB is NOT added to LIBS by default. You
# need to add CURSES_LIB to the appropriate xxx_LDADD line in your
# Makefile.am. For example:
# In previous versions of this macro, the flags CURSES_LIB and
# CURSES_CPPFLAGS were defined. These have been renamed, in keeping with
# AX_WITH_CURSES's close bigger brother, PKG_CHECK_MODULES, which should
# eventually supersede the use of AX_WITH_CURSES. Neither the library
# listed in CURSES_LIBS, nor the flags in CURSES_CFLAGS are added to LIBS,
# respectively CPPFLAGS, by default. You need to add both to the
# appropriate xxx_LDADD/xxx_CPPFLAGS line in your Makefile.am. For
# example:
#
# prog_LDADD = @CURSES_LIB@
# prog_LDADD = @CURSES_LIBS@
# prog_CPPFLAGS = @CURSES_CFLAGS@
#
# If CURSES_LIB is set on the configure command line (such as by running
# "./configure CURSES_LIB=-lmycurses"), then the only header searched for
# is <curses.h>. The user may use the CPPFLAGS precious variable to
# override the standard #include search path. If the user needs to
# specify an alternative path for a library (such as for a non-standard
# NcurseW), the user should use the LDFLAGS variable.
# If CURSES_LIBS is set on the configure command line (such as by running
# "./configure CURSES_LIBS=-lmycurses"), then the only header searched for
# is <curses.h>. If the user needs to specify an alternative path for a
# library (such as for a non-standard NcurseW), the user should use the
# LDFLAGS variable.
#
# The following shell variables may be defined by this macro:
#
......@@ -182,11 +190,66 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
#serial 15
#serial 17
# internal function to factorize common code that is used by both ncurses
# and ncursesw
AC_DEFUN([_FIND_CURSES_FLAGS], [
AC_MSG_CHECKING([for $1 via pkg-config])
AX_REQUIRE_DEFINED([PKG_CHECK_EXISTS])
_PKG_CONFIG([_ax_cv_$1_libs], [libs], [$1])
_PKG_CONFIG([_ax_cv_$1_cppflags], [cflags], [$1])
AS_IF([test "x$pkg_failed" = "xyes" || test "x$pkg_failed" = "xuntried"],[
AC_MSG_RESULT([no])
# No suitable .pc file found, have to find flags via fallback
AC_CACHE_CHECK([for $1 via fallback], [ax_cv_$1], [
AS_ECHO()
pkg_cv__ax_cv_$1_libs="-l$1"
pkg_cv__ax_cv_$1_cppflags="-D_GNU_SOURCE $CURSES_CFLAGS"
LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags"
AC_MSG_CHECKING([for initscr() with $pkg_cv__ax_cv_$1_libs])
AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
[
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs])
AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[
ax_cv_$1=yes
],[
AC_MSG_RESULT([no])
m4_if(
[$1],[ncursesw],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfow"],
[$1],[ncurses],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfo"]
)
LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs])
AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[
ax_cv_$1=yes
],[
ax_cv_$1=no
])
])
],[
ax_cv_$1=no
])
])
],[
AC_MSG_RESULT([yes])
# Found .pc file, using its information
LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags"
ax_cv_$1=yes
])
])
AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES])
AC_DEFUN([AX_WITH_CURSES], [
AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses])
AC_ARG_VAR([CURSES_LIBS], [linker library for Curses, e.g. -lcurses])
AC_ARG_VAR([CURSES_CFLAGS], [preprocessor flags for Curses, e.g. -I/usr/include/ncursesw])
AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses],
[force the use of Ncurses or NcursesW])],
[], [with_ncurses=check])
......@@ -195,20 +258,17 @@ AC_DEFUN([AX_WITH_CURSES], [
[], [with_ncursesw=check])
ax_saved_LIBS=$LIBS
ax_saved_CPPFLAGS=$CPPFLAGS
AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes],
[ax_with_plaincurses=no], [ax_with_plaincurses=check])
ax_cv_curses_which=no
# Test for NcursesW
AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncursesw" != xno], [
_FIND_CURSES_FLAGS([ncursesw])
AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno], [
LIBS="$ax_saved_LIBS -lncursesw"
AC_CACHE_CHECK([for NcursesW wide-character library], [ax_cv_ncursesw], [
AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
[ax_cv_ncursesw=yes], [ax_cv_ncursesw=no])
])
AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [
AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library])
])
......@@ -216,7 +276,8 @@ AC_DEFUN([AX_WITH_CURSES], [
AS_IF([test "x$ax_cv_ncursesw" = xyes], [
ax_cv_curses=yes
ax_cv_curses_which=ncursesw
CURSES_LIB="-lncursesw"
CURSES_LIBS="$pkg_cv__ax_cv_ncursesw_libs"
CURSES_CFLAGS="$pkg_cv__ax_cv_ncursesw_cppflags"
AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present])
AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
......@@ -318,16 +379,13 @@ AC_DEFUN([AX_WITH_CURSES], [
])
])
])
unset pkg_cv__ax_cv_ncursesw_libs
unset pkg_cv__ax_cv_ncursesw_cppflags
# Test for Ncurses
AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
_FIND_CURSES_FLAGS([ncurses])
AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
LIBS="$ax_saved_LIBS -lncurses"
AC_CACHE_CHECK([for Ncurses library], [ax_cv_ncurses], [
AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
[ax_cv_ncurses=yes], [ax_cv_ncurses=no])
])
AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [
AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library])
])
......@@ -335,7 +393,8 @@ AC_DEFUN([AX_WITH_CURSES], [
AS_IF([test "x$ax_cv_ncurses" = xyes], [
ax_cv_curses=yes
ax_cv_curses_which=ncurses
CURSES_LIB="-lncurses"
CURSES_LIBS="$pkg_cv__ax_cv_ncurses_libs"
CURSES_CFLAGS="$pkg_cv__ax_cv_ncurses_cppflags"
AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present])
AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
......@@ -390,12 +449,13 @@ AC_DEFUN([AX_WITH_CURSES], [
])
])
])
unset pkg_cv__ax_cv_ncurses_libs
unset pkg_cv__ax_cv_ncurses_cppflags
# Test for plain Curses (or if CURSES_LIB was set by user)
# Test for plain Curses (or if CURSES_LIBS was set by user)
AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [
AS_IF([test "x$CURSES_LIB" != x], [
LIBS="$ax_saved_LIBS $CURSES_LIB"
AS_IF([test "x$CURSES_LIBS" != x], [
LIBS="$ax_saved_LIBS $CURSES_LIBS"
], [
LIBS="$ax_saved_LIBS -lcurses"
])
......@@ -408,8 +468,8 @@ AC_DEFUN([AX_WITH_CURSES], [
AS_IF([test "x$ax_cv_plaincurses" = xyes], [
ax_cv_curses=yes
ax_cv_curses_which=plaincurses
AS_IF([test "x$CURSES_LIB" = x], [
CURSES_LIB="-lcurses"
AS_IF([test "x$CURSES_LIBS" = x], [
CURSES_LIBS="-lcurses"
])
AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
......@@ -515,4 +575,8 @@ AC_DEFUN([AX_WITH_CURSES], [
AS_IF([test "x$ax_cv_curses_obsolete" != xyes], [ax_cv_curses_obsolete=no])
LIBS=$ax_saved_LIBS
CPPFLAGS=$ax_saved_CPPFLAGS
unset ax_saved_LIBS
unset ax_saved_CPPFLAGS
])dnl
......@@ -41,18 +41,22 @@
# The following output variables may be defined by these macros; these are
# precious and may be overridden on the ./configure command line:
#
# PANEL_LIB - library to add to xxx_LDADD before CURSES_LIB
# MENU_LIB - library to add to xxx_LDADD before CURSES_LIB
# FORM_LIB - library to add to xxx_LDADD before CURSES_LIB
#
# These libraries are NOT added to LIBS by default. You need to add them
# to the appropriate xxx_LDADD line in your Makefile.am in front of the
# equivalent CURSES_LIB incantation. For example:
#
# prog_LDADD = @PANEL_LIB@ @CURSES_LIB@
#
# If one of the xxx_LIB variables is set on the configure command line
# (such as by running "./configure PANEL_LIB=-lmypanel"), then the header
# PANEL_LIBS - library to add to xxx_LDADD before CURSES_LIBS
# MENU_LIBS - library to add to xxx_LDADD before CURSES_LIBS
# FORM_LIBS - library to add to xxx_LDADD before CURSES_LIBS
#
# In previous versions of this macro, the flags PANEL_LIB, MENU_LIB and
# FORM_LIB were defined. These have been renamed, in keeping with the
# variable scheme of PKG_CHECK_MODULES, which should eventually supersede
# the use of AX_WITH_CURSES and AX_WITH_CURSES_* macros. These libraries
# are NOT added to LIBS by default. You need to add them to the
# appropriate xxx_LDADD line in your Makefile.am in front of the
# equivalent CURSES_LIBS incantation. For example:
#
# prog_LDADD = @PANEL_LIBS@ @CURSES_LIBS@
#
# If one of the xxx_LIBS variables is set on the configure command line
# (such as by running "./configure PANEL_LIBS=-lmypanel"), then the header
# file searched must NOT contain a subpath. In this case, in other words,
# only <panel.h> would be searched for. The user may use the CPPFLAGS
# precious variable to override the standard #include search path.
......@@ -144,7 +148,7 @@
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.
#serial 2
#serial 4
AC_DEFUN([_AX_WITH_CURSES_CHECKEXTRA], [
dnl Parameter 1 is the variable name component, using uppercase letters only
......@@ -159,8 +163,11 @@ AC_DEFUN([_AX_WITH_CURSES_CHECKEXTRA], [
AS_VAR_PUSHDEF([_AX_WITH_CURSES_CHECKEXTRA_have_header_var], [HAVE_[]m4_toupper($4)])dnl
ax_saved_LIBS=$LIBS
ax_saved_CPPFLAGS=$CPPFLAGS
AC_CACHE_CHECK([for Curses $2 library with $4], [_AX_WITH_CURSES_CHECKEXTRA_header_var], [
LIBS="$ax_saved_LIBS $5 $CURSES_LIB"
LIBS="$ax_saved_LIBS $5 $CURSES_LIBS"
CPPFLAGS="$ax_saved_CPPFLAGS $CURSES_CFLAGS"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@%:@include <$4>
]], [$3])],
......@@ -169,14 +176,18 @@ AC_DEFUN([_AX_WITH_CURSES_CHECKEXTRA], [
])
AS_IF([test "x$[]_AX_WITH_CURSES_CHECKEXTRA_header_var" = xyes], [
_AX_WITH_CURSES_CHECKEXTRA_cv_var=yes
AS_LITERAL_IF([$5], [$1_LIB="$5"])
AS_LITERAL_IF([$5], [$1_LIBS="$5"])
AC_DEFINE([_AX_WITH_CURSES_CHECKEXTRA_have_var], [1], [Define to 1 if the Curses $2 library is present])
AC_DEFINE([_AX_WITH_CURSES_CHECKEXTRA_have_header_var], [1], [Define to 1 if <$4> is present])
], [
AS_IF([test "x$[]_AX_WITH_CURSES_CHECKEXTRA_cv_var" = xyes], [],
[_AX_WITH_CURSES_CHECKEXTRA_cv_var=no])
])
LIBS=$ax_saved_LIBS
CPPFLAGS=$ax_saved_CPPFLAGS
unset ax_saved_LIBS
unset ax_saved_CPPFLAGS
AS_VAR_POPDEF([_AX_WITH_CURSES_CHECKEXTRA_have_header_var])dnl
AS_VAR_POPDEF([_AX_WITH_CURSES_CHECKEXTRA_header_var])dnl
......@@ -194,16 +205,21 @@ AC_DEFUN([_AX_WITH_CURSES_EXTRA], [
dnl Parameter 7 is the plain Curses library command line
AC_REQUIRE([AX_WITH_CURSES])
AC_ARG_VAR([$1_LIB], [linker library for Curses $2, e.g. $7])
AC_ARG_VAR([$1_LIBS], [linker library for Curses $2, e.g. $7])
AS_IF([test "x$[]$1_LIB" != x], [
_AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [$4], [$[]$1_LIB])
AS_IF([test "x$[]$1_LIBS" != x], [
_AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [$4], [$[]$1_LIBS])
], [
AS_IF([test "x$ax_cv_curses_which" = xncursesw], [
_AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [ncursesw/$4], [$5])
AS_IF([test x$[]ax_cv_[]m4_tolower($1) != "xyes"], [
_AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [$4], [$6])
])
], [test "x$ax_cv_curses_which" = xncurses], [
_AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [ncurses/$4], [$6])
_AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [$4], [$6])
AS_IF([test x$[]ax_cv_[]m4_tolower($1) != "xyes"], [
_AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [ncurses/$4], [$6])
])
], [test "x$ax_cv_curses_which" = xplaincurses], [
_AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [$4], [$7])
])
......
......@@ -228,7 +228,8 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURSES_LIB = @CURSES_LIB@
CURSES_CFLAGS = @CURSES_CFLAGS@
CURSES_LIBS = @CURSES_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -269,7 +270,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_LIB = @PANEL_LIB@
PANEL_LIBS = @PANEL_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
......
......@@ -99,5 +99,6 @@ QTCREC_RECORD
# record file: yymmddhhmmss.wav
QTCREC_RECORD_COMMAND=rec -r 8000 $ -q
# QTC_RECV_LAZY
####### END #####################
......@@ -168,7 +168,8 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURSES_LIB = @CURSES_LIB@
CURSES_CFLAGS = @CURSES_CFLAGS@
CURSES_LIBS = @CURSES_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -209,7 +210,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_LIB = @PANEL_LIB@
PANEL_LIBS = @PANEL_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
......
......@@ -168,7 +168,8 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURSES_LIB = @CURSES_LIB@
CURSES_CFLAGS = @CURSES_CFLAGS@
CURSES_LIBS = @CURSES_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
......@@ -209,7 +210,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANEL_LIB = @PANEL_LIB@
PANEL_LIBS = @PANEL_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
......
This diff is collapsed.
......@@ -123,6 +123,7 @@ CWTONE=800
#RIGSPEED=2400