Remove use of backwards compatibility header name.

Glibc as old as 2.2 provides working headers under the right name and
if not libax25 would install headers under the right name so this has
become redundant and ugly.

25 files changed, 15 insertions, 230 deletions

diff --git a/ax25/ax25d.c b/ax25/ax25d.c
index 63ec5d2..126ec39 100644
--- a/ax25/ax25d.c
+++ b/ax25/ax25d.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ax25d.c,v 1.7 2009/06/14 16:25:26 ralf Exp $
+ * $Id: ax25d.c,v 1.8 2009/06/21 18:01:55 ralf Exp $
  *
  *  This is my version of axl.c, written for the LBBS code to make it
  *    compatable with the kernel AX25 driver.  It appears to work, with
@@ -130,21 +130,9 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/ax25/axctl.c b/ax25/axctl.c
index 6f94650..e198e97 100644
--- a/ax25/axctl.c
+++ b/ax25/axctl.c
@@ -12,16 +12,8 @@
 
 #include <sys/socket.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/ax25/axparms.c b/ax25/axparms.c
index 141ceb2..daac7d4 100644
--- a/ax25/axparms.c
+++ b/ax25/axparms.c
@@ -13,16 +13,8 @@
 
 #include <net/if.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/ax25/axspawn.c b/ax25/axspawn.c
index 0769353..42c8957 100644
--- a/ax25/axspawn.c
+++ b/ax25/axspawn.c
@@ -1,6 +1,6 @@
 /*
  *
- * $Id: axspawn.c,v 1.21 2009/06/14 16:25:26 ralf Exp $
+ * $Id: axspawn.c,v 1.22 2009/06/21 18:01:55 ralf Exp $
  *
  * axspawn.c - run a program from ax25d.
  *
@@ -171,16 +171,8 @@
 
 #include <sys/socket.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 
diff --git a/ax25/beacon.c b/ax25/beacon.c
index da6f68d..095614f 100644
--- a/ax25/beacon.c
+++ b/ax25/beacon.c
@@ -9,16 +9,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/ax25/mheard.c b/ax25/mheard.c
index 6b3f21a..5aeacf4 100644
--- a/ax25/mheard.c
+++ b/ax25/mheard.c
@@ -8,16 +8,8 @@
 
 #include <config.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/mheard.h>
diff --git a/ax25/mheardd.c b/ax25/mheardd.c
index 31f9f64..3d45131 100644
--- a/ax25/mheardd.c
+++ b/ax25/mheardd.c
@@ -24,16 +24,8 @@
 #include <netinet/in.h>
 
 #include <config.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 
 #include <netax25/axlib.h>
diff --git a/ax25/rxecho.c b/ax25/rxecho.c
index e299f2c..7acb156 100644
--- a/ax25/rxecho.c
+++ b/ax25/rxecho.c
@@ -106,16 +106,8 @@
 
 #include <netinet/in.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/configure.ac b/configure.ac
index c64aa06..046a7cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_SUBST(NCURSES_LIB)
 AC_SUBST(UTIL_LIB)
 AC_SUBST(FLTK_LIB)
 AC_CHECK_LIB(z, zlibVersion,Z_LIB="-lz",Z_LIB=)
-AC_CHECK_LIB(ax25, ax25_config_load_ports, AX25_LIB="-lax25", AC_MSG_ERROR(Could not find the libax25 libraries; aborting))
+AC_CHECK_LIB(ax25, ax25_config_load_ports, AX25_LIB="-lax25", AC_MSG_ERROR([Could not find the libax25 libraries; aborting]))
 AC_CHECK_LIB(ncurses, initscr,NCURSES_LIB="-lncurses",NCURSES_LIB=)
 AC_CHECK_LIB(util, openpty, UTIL_LIB="-lutil",UTIL_LIB=)
 AC_CHECK_LIB(GL, main, GL_LIB="-lGL",
@@ -38,15 +38,20 @@ dnl Checks for header files.
 dnl AC_PATH_X
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h limits.h paths.h strings.h sys/file.h sys/ioctl.h sys/time.h syslog.h unistd.h zlib.h )
+AC_CHECK_HEADERS(fcntl.h limits.h paths.h strings.h sys/file.h sys/ioctl.h sys/time.h syslog.h unistd.h zlib.h)
 
 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, 1, [Define if you have a proper netax25/ax25.h header file.]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
-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, 1, [Define if you have a proper netrom/netrom.h header file.]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
-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, 1, [Define if you have a proper netrose/rose.h header file.]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
+AC_CHECK_TYPES([struct ax25_fwd_struct], [],
+	[AC_MSG_ERROR([Both glibc and libax25 are too old or both installed])],
+	[[#include <netax25/ax25.h>]])
+AC_CHECK_MEMBER([struct nr_route_struct.ndigis], [],
+	[AC_MSG_ERROR([Both glibc and libax25 are too old or both installed])],
+	[[#include <netrom/netrom.h>]])
+AC_CHECK_TYPES([struct rose_facilities_struct], [],
+	[AC_MSG_ERROR([Both glibc and libax25 are too old or both installed])],
+	[[#include <netax25/ax25.h>	/* Or <netrose/rose.h> will blow up */
+	#include <netrose/rose.h>
+	]])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
diff --git a/kiss/kissattach.c b/kiss/kissattach.c
index af47eae..025b358 100644
--- a/kiss/kissattach.c
+++ b/kiss/kissattach.c
@@ -19,16 +19,8 @@
 #include <sys/ioctl.h>
 
 #include <net/if.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/daemon.h>
 #include <netax25/axlib.h>
diff --git a/kiss/kissparms.c b/kiss/kissparms.c
index cfc57d6..9d7192c 100644
--- a/kiss/kissparms.c
+++ b/kiss/kissparms.c
@@ -16,16 +16,8 @@
 #include <linux/if_ether.h>
 #endif
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axconfig.h>
 
diff --git a/netrom/netromd.c b/netrom/netromd.c
index 0a16fd3..e7a0362 100644
--- a/netrom/netromd.c
+++ b/netrom/netromd.c
@@ -23,21 +23,9 @@
 #include <linux/if_ether.h>
 #endif
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/netrom/netromr.c b/netrom/netromr.c
index 5fde8d0..9ed716f 100644
--- a/netrom/netromr.c
+++ b/netrom/netromr.c
@@ -20,21 +20,9 @@
 #include <linux/if_ether.h>
 #endif
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include "../pathnames.h"
diff --git a/netrom/netromt.c b/netrom/netromt.c
index 3b37d5f..b3f99b3 100644
--- a/netrom/netromt.c
+++ b/netrom/netromt.c
@@ -12,21 +12,9 @@
 
 #include <sys/socket.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/netrom/nodesave.c b/netrom/nodesave.c
index 7737fff..1258c36 100644
--- a/netrom/nodesave.c
+++ b/netrom/nodesave.c
@@ -10,11 +10,7 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
 
 #include <netax25/axconfig.h>
 #include <netax25/nrconfig.h>
diff --git a/netrom/nrattach.c b/netrom/nrattach.c
index bd6cb58..ceda97d 100644
--- a/netrom/nrattach.c
+++ b/netrom/nrattach.c
@@ -17,21 +17,9 @@
 #include <net/if_arp.h>
 
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/nrconfig.h>
diff --git a/netrom/nrparms.c b/netrom/nrparms.c
index 78a81f3..ff8b60e 100644
--- a/netrom/nrparms.c
+++ b/netrom/nrparms.c
@@ -10,21 +10,9 @@
 #include <sys/ioctl.h>
 
 #include <sys/socket.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/rose/rsattach.c b/rose/rsattach.c
index b7323e1..924d152 100644
--- a/rose/rsattach.c
+++ b/rose/rsattach.c
@@ -19,21 +19,9 @@
 /* #include <linux/sockios.h> */
 
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 
diff --git a/rose/rsdwnlnk.c b/rose/rsdwnlnk.c
index decc06d..9ff6f31 100644
--- a/rose/rsdwnlnk.c
+++ b/rose/rsdwnlnk.c
@@ -11,16 +11,8 @@
 #include <sys/types.h>
 
 #include <sys/socket.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/rose/rsparms.c b/rose/rsparms.c
index 68e8481..95ef0ce 100644
--- a/rose/rsparms.c
+++ b/rose/rsparms.c
@@ -10,16 +10,8 @@
 #include <sys/ioctl.h>
 
 #include <sys/socket.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/rose/rsuplnk.c b/rose/rsuplnk.c
index 37c9484..eadb0ed 100644
--- a/rose/rsuplnk.c
+++ b/rose/rsuplnk.c
@@ -11,16 +11,8 @@
 #include <sys/types.h>
 
 #include <sys/socket.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/tcpip/ttylinkd.c b/tcpip/ttylinkd.c
index 234b7fd..792969e 100644
--- a/tcpip/ttylinkd.c
+++ b/tcpip/ttylinkd.c
@@ -47,16 +47,8 @@
 #include <sys/ioctl.h>
 
 #include <sys/socket.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include "../pathnames.h"
 
diff --git a/user_call/ax25_call.c b/user_call/ax25_call.c
index 9475e1a..1fafe4f 100644
--- a/user_call/ax25_call.c
+++ b/user_call/ax25_call.c
@@ -11,16 +11,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/user_call/netrom_call.c b/user_call/netrom_call.c
index ca4c1c9..8d7fd85 100644
--- a/user_call/netrom_call.c
+++ b/user_call/netrom_call.c
@@ -11,21 +11,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROM_NETROM_H
 #include <netrom/netrom.h>
-#else
-#include <netax25/kernel_netrom.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
diff --git a/user_call/rose_call.c b/user_call/rose_call.c
index 51308a2..43a27ae 100644
--- a/user_call/rose_call.c
+++ b/user_call/rose_call.c
@@ -11,16 +11,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
-#ifdef HAVE_NETROSE_ROSE_H
 #include <netrose/rose.h>
-#else 
-#include <netax25/kernel_rose.h>
-#endif
 
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>