summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-08-24 01:30:23 +0200
committerRalf Baechle <ralf@linux-mips.org>1999-08-24 01:30:23 +0200
commit57cf4e9453c51359d0c9af334c3dc1156ea2527a (patch)
tree8679ec2c7a915ca43f959093eb61c517627f698e
parent28280a70d9880c21efdff840246163a1b8e06a94 (diff)
Import ax25-apps 0.0.4 from tarballax25-apps-0.0.4
-rw-r--r--ChangeLog12
-rw-r--r--INSTALL6
-rw-r--r--README10
-rw-r--r--call/call.c12
-rwxr-xr-xconfigure166
-rw-r--r--configure.in33
-rw-r--r--listen/nrdump.c12
7 files changed, 153 insertions, 98 deletions
diff --git a/ChangeLog b/ChangeLog
index ee17343..dd060d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,19 +1,23 @@
-ax25-apps 0.0.3
+ax25-apps 0.0.4
+ * Added Tomi's patch so it correctly detects broken headers
+
+ -- Craig Small <csmall@small.dropbear.id.au> Mon, 23 Aug 1999 11:45:46 +1000
+ax25-apps 0.0.3
* Should now compile on libc5 (probably)
* Some nice formatting changes to listen
* Added Klaus Kudielka's ax25rtd patch
* Added some authors to AUTHORS
- - Tue, 10 Aug 1999 10:06:56 +1000 Craig Small <csmall@small.dropbear.id.au>
+ -- Craig Small <csmall@small.dropbear.id.au> Tue, 10 Aug 1999 10:06:56 +1000
ax25-apps 0.0.2
* Fixed where to find config files
* Had another crack at working around broken headers
- - Craig Small <csmall@small.dropbear.id.au> 7 July 1999
+ -- Craig Small <csmall@small.dropbear.id.au> 7 July 1999
ax25-apps 0.0.1
* First public release
- - Craig Small <csmall@small.dropbear.id.au>
+ -- Craig Small <csmall@small.dropbear.id.au>
diff --git a/INSTALL b/INSTALL
index cb25112..eb57a6a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
Installation Instructions for AX.25 Tools
=========================================
-To make this library you will need the following:
+To make this package you will need the following:
glibc2.1 (Debian 2.1.1-5 or RedHat glibc-2.1.2-3)
A Modern kernel, 2.2.x
libtool
@@ -14,7 +14,9 @@ To build it you type:
By default, it will install the files in /usr/local. To change this
so that binaries go in /usr and the conf files go in /etc
-type 'make install --prefix=/usr --sysconfdir=/etc --localstatedir=/var'
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ make
+ make install
To install the example configuration files type
make installconf
diff --git a/README b/README
index 21a9696..989f3f8 100644
--- a/README
+++ b/README
@@ -1,14 +1,12 @@
AX25 Apps
========
-You are supposed to use glibc 2.1 (libc6 unstable libraries) for this
-package. I have attempted to cater for glibc 2.0 users here.
+Listen now by default is NOT setuid root which means that normal users will
+not be able to run it out of the box. If you want everyone to run
+listen then after installing the binaries as root type
+ chmod u+s /usr/bin/listen
-More specifically, it is recommended that you use a glibc newer than
-2 May 1999, I believe Debian libc6 package 2.1.1-5 will do.
-These tools were built on a Debian system, potato release, the libraries
-are libc6 2.1.1-12 and ncurses 4.2-3.2. Kernel is 2.2.10
- Craig Small <csmall@small.dropbear.id.au>
diff --git a/call/call.c b/call/call.c
index e82bfea..c3cfd16 100644
--- a/call/call.c
+++ b/call/call.c
@@ -417,7 +417,7 @@ void dupdstatw(WINDOW * win, char *s, int add)
{
static char infostr[80];
static int y, x;
- static oldlen;
+ static int oldlen;
int l, cnt;
if (add) {
@@ -1464,10 +1464,12 @@ int cmd_call(char *call[], int mode)
switch (com_num) {
case 0:
{
-#ifdef 0 /* FIXME! We should, no: WE MUST be able to turn off */
- /* all remote commands to avoid mail bombs generating */
- /* offensive mails with //e while sucking the BBS */
-
+#if 0
+ /*
+ FIXME! We should, no: WE MUST be able to turn off
+ all remote commands to avoid mail bombs generating
+ offensive mails with //e while sucking the BBS
+ */
remotecommand(parms, parmsbytes);
#endif
}
diff --git a/configure b/configure
index fc4c59d..3bc46fc 100755
--- a/configure
+++ b/configure
@@ -532,7 +532,7 @@ fi
-VERSION=0.0.3
+VERSION=0.0.4
PACKAGE=ax25-apps
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -1785,68 +1785,86 @@ EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "ax25_fwd_struct" >/dev/null 2>&1; then
rm -rf conftest*
+ has_ax25=yes
+else
+ rm -rf conftest*
+ has_ax25=no
+fi
+rm -f conftest*
+
+if test "$has_ax25" = "yes" ; then
cat >> confdefs.h <<\EOF
#define HAVE_NETAX25_AX25_H 1
EOF
- echo "$ac_t""yes" 1>&6
+
+ echo "$ac_t""yes" 1>&6
else
- rm -rf conftest*
echo "$ac_t""no" 1>&6
fi
-rm -f conftest*
-
echo $ac_n "checking for working netrom/netrom.h header file""... $ac_c" 1>&6
-echo "configure:1800: checking for working netrom/netrom.h header file" >&5
+echo "configure:1806: checking for working netrom/netrom.h header file" >&5
cat > conftest.$ac_ext <<EOF
-#line 1802 "configure"
+#line 1808 "configure"
#include "confdefs.h"
#include <netrom/netrom.h>
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "unsigned int ndigis" >/dev/null 2>&1; then
rm -rf conftest*
+ has_netrom=yes
+else
+ rm -rf conftest*
+ has_netrom=no
+fi
+rm -f conftest*
+
+if test "$has_netrom" = "yes" ; then
cat >> confdefs.h <<\EOF
#define HAVE_NETROM_NETROM_H 1
EOF
- echo "$ac_t""yes" 1>&6
+
+ echo "$ac_t""yes" 1>&6
else
- rm -rf conftest*
echo "$ac_t""no" 1>&6
fi
-rm -f conftest*
-
echo $ac_n "checking for working netrose/rose.h header file""... $ac_c" 1>&6
-echo "configure:1820: checking for working netrose/rose.h header file" >&5
+echo "configure:1832: checking for working netrose/rose.h header file" >&5
cat > conftest.$ac_ext <<EOF
-#line 1822 "configure"
+#line 1834 "configure"
#include "confdefs.h"
#include <netrose/rose.h>
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "rose_facilities_struct" >/dev/null 2>&1; then
rm -rf conftest*
+ has_rose=yes
+else
+ rm -rf conftest*
+ has_rose=no
+fi
+rm -f conftest*
+
+if test "$has_rose" = "yes" ; then
cat >> confdefs.h <<\EOF
#define HAVE_NETROSE_ROSE_H 1
EOF
- echo "$ac_t""yes" 1>&6
+
+ echo "$ac_t""yes" 1>&6
else
- rm -rf conftest*
echo "$ac_t""no" 1>&6
fi
-rm -f conftest*
-
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:1845: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1863: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1850 "configure"
+#line 1868 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -1854,7 +1872,7 @@ int main() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:1858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -1879,7 +1897,7 @@ done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:1883: checking for opendir in -ldir" >&5
+echo "configure:1901: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1887,7 +1905,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1891 "configure"
+#line 1909 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1898,7 +1916,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1920,7 +1938,7 @@ fi
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1924: checking for opendir in -lx" >&5
+echo "configure:1942: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1928,7 +1946,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1932 "configure"
+#line 1950 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1939,7 +1957,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1962,12 +1980,12 @@ fi
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1966: checking for ANSI C header files" >&5
+echo "configure:1984: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1971 "configure"
+#line 1989 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1975,7 +1993,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1992,7 +2010,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1996 "configure"
+#line 2014 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -2010,7 +2028,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 2014 "configure"
+#line 2032 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -2031,7 +2049,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 2035 "configure"
+#line 2053 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2042,7 +2060,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:2046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -2066,12 +2084,12 @@ EOF
fi
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2070: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2088: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2075 "configure"
+#line 2093 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -2087,7 +2105,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:2091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -2111,17 +2129,17 @@ for ac_hdr in fcntl.h sys/file.h sys/ioctl.h sys/time.h syslog.h termio.h unistd
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2115: checking for $ac_hdr" >&5
+echo "configure:2133: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2120 "configure"
+#line 2138 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2149,12 +2167,12 @@ done
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2153: checking for working const" >&5
+echo "configure:2171: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2158 "configure"
+#line 2176 "configure"
#include "confdefs.h"
int main() {
@@ -2203,7 +2221,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:2207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -2224,21 +2242,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2228: checking for inline" >&5
+echo "configure:2246: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 2235 "configure"
+#line 2253 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:2242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -2264,12 +2282,12 @@ EOF
esac
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2268: checking for off_t" >&5
+echo "configure:2286: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2273 "configure"
+#line 2291 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2297,12 +2315,12 @@ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2301: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2319: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2306 "configure"
+#line 2324 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -2311,7 +2329,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:2315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -2332,12 +2350,12 @@ EOF
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:2336: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:2354: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2341 "configure"
+#line 2359 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -2345,7 +2363,7 @@ int main() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:2349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -2367,7 +2385,7 @@ fi
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:2371: checking for 8-bit clean memcmp" >&5
+echo "configure:2389: checking for 8-bit clean memcmp" >&5
if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2375,7 +2393,7 @@ else
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
-#line 2379 "configure"
+#line 2397 "configure"
#include "confdefs.h"
main()
@@ -2385,7 +2403,7 @@ main()
}
EOF
-if { (eval echo configure:2389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_memcmp_clean=yes
else
@@ -2403,12 +2421,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2407: checking return type of signal handlers" >&5
+echo "configure:2425: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2412 "configure"
+#line 2430 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -2425,7 +2443,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:2429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -2444,7 +2462,7 @@ EOF
echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
-echo "configure:2448: checking whether utime accepts a null argument" >&5
+echo "configure:2466: checking whether utime accepts a null argument" >&5
if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2454,7 +2472,7 @@ if test "$cross_compiling" = yes; then
ac_cv_func_utime_null=no
else
cat > conftest.$ac_ext <<EOF
-#line 2458 "configure"
+#line 2476 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -2465,7 +2483,7 @@ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0
&& t.st_mtime - s.st_mtime < 120));
}
EOF
-if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_utime_null=yes
else
@@ -2489,12 +2507,12 @@ EOF
fi
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2493: checking for vprintf" >&5
+echo "configure:2511: checking for vprintf" >&5
if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2498 "configure"
+#line 2516 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
@@ -2517,7 +2535,7 @@ vprintf();
; return 0; }
EOF
-if { (eval echo configure:2521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -2541,12 +2559,12 @@ fi
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2545: checking for _doprnt" >&5
+echo "configure:2563: checking for _doprnt" >&5
if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2550 "configure"
+#line 2568 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
@@ -2569,7 +2587,7 @@ _doprnt();
; return 0; }
EOF
-if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -2596,12 +2614,12 @@ fi
for ac_func in gettimeofday mktime select socket strdup strerror strspn strstr strtol strtoul uname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2600: checking for $ac_func" >&5
+echo "configure:2618: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2605 "configure"
+#line 2623 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2624,7 +2642,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2650,6 +2668,12 @@ done
+if test "x$GCC" = "xyes"; then
+ if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
+ CFLAGS="$CFLAGS -Wall"
+ fi
+fi
+
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
diff --git a/configure.in b/configure.in
index 55e4c35..192a498 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(ax25ipd/config.c)
dnl For automake
-VERSION=0.0.3
+VERSION=0.0.4
PACKAGE=ax25-apps
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
@@ -24,11 +24,29 @@ AC_CHECK_LIB(ncurses, initscr,NCURSES_LIB="-lncurses",NCURSES_LIB=)
dnl Checks for working glibc 2.1 headers
AC_MSG_CHECKING(for working netax25/ax25.h header file)
-AC_EGREP_HEADER(ax25_fwd_struct, netax25/ax25.h,AC_DEFINE(HAVE_NETAX25_AX25_H) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+AC_HEADER_EGREP(ax25_fwd_struct, netax25/ax25.h, has_ax25=yes, has_ax25=no)
+if test "$has_ax25" = "yes" ; then
+ AC_DEFINE(HAVE_NETAX25_AX25_H)
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
AC_MSG_CHECKING(for working netrom/netrom.h header file)
-AC_EGREP_HEADER(unsigned int ndigis, netrom/netrom.h,AC_DEFINE(HAVE_NETROM_NETROM_H) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+AC_HEADER_EGREP(unsigned int ndigis, netrom/netrom.h, has_netrom=yes, has_netrom=no)
+if test "$has_netrom" = "yes" ; then
+ AC_DEFINE(HAVE_NETROM_NETROM_H)
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
AC_MSG_CHECKING(for working netrose/rose.h header file)
-AC_EGREP_HEADER(rose_facilities_struct, netrose/rose.h,AC_DEFINE(HAVE_NETROSE_ROSE_H) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+AC_HEADER_EGREP(rose_facilities_struct, netrose/rose.h, has_rose=yes, has_rose=no)
+if test "$has_rose" = "yes" ; then
+ AC_DEFINE(HAVE_NETROSE_ROSE_H)
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
dnl Checks for header files.
AC_HEADER_DIRENT
@@ -51,4 +69,11 @@ AC_FUNC_VPRINTF
AC_CHECK_FUNCS(gettimeofday mktime select socket strdup strerror strspn strstr strtol strtoul uname)
+dnl Only use -Wall if we have gcc
+if test "x$GCC" = "xyes"; then
+ if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
+ CFLAGS="$CFLAGS -Wall"
+ fi
+fi
+
AC_OUTPUT(call/Makefile ax25ipd/Makefile listen/Makefile Makefile ax25rtd/Makefile)
diff --git a/listen/nrdump.c b/listen/nrdump.c
index 9d50864..974fa71 100644
--- a/listen/nrdump.c
+++ b/listen/nrdump.c
@@ -92,7 +92,7 @@ void netrom_dump(unsigned char *data, int length, int hexdump)
break;
case NR4OPCONRQ: /* Connect request */
- lprintf(T_AXHDR, " conn rqst: ckt %d/%d", data[0], data[1]);
+ lprintf(T_AXHDR, " conn rqst: my ckt %02X/%02X", data[0], data[1]);
lprintf(T_AXHDR, " wnd %d", data[5]);
lprintf(T_ADDR, " %s", pax25(tmp, data + 6));
lprintf(T_ADDR, "@%s", pax25(tmp, data + 6 + AXLEN));
@@ -104,28 +104,28 @@ void netrom_dump(unsigned char *data, int length, int hexdump)
break;
case NR4OPCONAK: /* Connect acknowledgement */
- lprintf(T_AXHDR," conn ack: ur ckt %d/%d my ckt %d/%d", data[0], data[1], data[2], data[3]);
+ lprintf(T_AXHDR," conn ack: ur ckt %02X/%02X my ckt %02X/%02X", data[0], data[1], data[2], data[3]);
lprintf(T_AXHDR, " wnd %d", data[5]);
netrom_flags(data[4]);
break;
case NR4OPDISRQ: /* Disconnect request */
- lprintf(T_AXHDR, " disc: ckt %d/%d\n", data[0], data[1]);
+ lprintf(T_AXHDR, " disc: ur ckt %02X/%02X\n", data[0], data[1]);
break;
case NR4OPDISAK: /* Disconnect acknowledgement */
- lprintf(T_AXHDR, " disc ack: ckt %d/%d\n", data[0], data[1]);
+ lprintf(T_AXHDR, " disc ack: ur ckt %02X/%02X\n", data[0], data[1]);
break;
case NR4OPINFO: /* Information (data) */
- lprintf(T_AXHDR, " info: ckt %d/%d", data[0], data[1]);
+ lprintf(T_AXHDR, " info: ur ckt %02X/%02X", data[0], data[1]);
lprintf(T_AXHDR, " txseq %d rxseq %d", data[2], data[3]);
netrom_flags(data[4]);
data_dump(data + 5, length - 5, hexdump);
break;
case NR4OPACK: /* Information acknowledgement */
- lprintf(T_AXHDR, " info ack: ckt %d/%d", data[0], data[1]);
+ lprintf(T_AXHDR, " info ack: ur ckt %02X/%02X", data[0], data[1]);
lprintf(T_AXHDR, " rxseq %d", data[3]);
netrom_flags(data[4]);
break;