8 files changed, 19 insertions, 72 deletions
diff --git a/ax25rtd/ax25rtd.c b/ax25rtd/ax25rtd.c
index 4d22c47..7180640 100644
--- a/ax25rtd/ax25rtd.c
+++ b/ax25rtd/ax25rtd.c
@@ -1,4 +1,4 @@
-/* $Id: ax25rtd.c,v 1.6 2009/06/14 16:25:33 ralf Exp $
+/* $Id: ax25rtd.c,v 1.7 2009/06/21 18:01:57 ralf Exp $
  *
  * Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com)
  *
@@ -50,23 +50,15 @@
 #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>
 #include <netax25/axlib.h>
 
 #include "../pathnames.h"
 #include "ax25rtd.h"
 
-const char *Version = "ax25rtd $Revision: 1.6 $";
+const char *Version = "ax25rtd $Revision: 1.7 $";
 config *Config = NULL;
 
 int reload = 0;
diff --git a/ax25rtd/cache_ctl.c b/ax25rtd/cache_ctl.c
index 1f435b5..e6abb42 100644
--- a/ax25rtd/cache_ctl.c
+++ b/ax25rtd/cache_ctl.c
@@ -1,4 +1,4 @@
-/* $Id: cache_ctl.c,v 1.2 2001/09/12 13:18:43 terry Exp $
+/* $Id: cache_ctl.c,v 1.3 2009/06/21 18:01:57 ralf Exp $
  *
  * Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com)
  *
@@ -24,11 +24,7 @@
 #include <sys/socket.h>
 
 #include <config.h>
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
 
 #include "ax25rtd.h"
 
diff --git a/ax25rtd/cache_dump.c b/ax25rtd/cache_dump.c
index 64cb8dd..b8e6c47 100644
--- a/ax25rtd/cache_dump.c
+++ b/ax25rtd/cache_dump.c
@@ -1,4 +1,4 @@
-/* $Id: cache_dump.c,v 1.2 2001/09/12 13:18:43 terry Exp $
+/* $Id: cache_dump.c,v 1.3 2009/06/21 18:01:57 ralf Exp $
  *
  * Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com)
  *
@@ -27,16 +27,8 @@
 #include <sys/socket.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>
 
 #include "ax25rtd.h"
diff --git a/ax25rtd/config.c b/ax25rtd/config.c
index f557456..9e3e678 100644
--- a/ax25rtd/config.c
+++ b/ax25rtd/config.c
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.5 2009/06/14 08:08:26 ralf Exp $
+/* $Id: config.c,v 1.6 2009/06/21 18:01:57 ralf Exp $
  *
  * Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com)
  *
@@ -38,8 +38,8 @@
 #include <net/if_arp.h>
 
 #include <config.h>
-#include <netax25/kernel_ax25.h>
-#include <netax25/kernel_rose.h>
+#include <netax25/ax25.h>
+#include <netrose/rose.h>
 #include <netax25/axlib.h>
 #include <netax25/axconfig.h>
 
diff --git a/ax25rtd/listener.c b/ax25rtd/listener.c
index 051d8c9..7bbb710 100644
--- a/ax25rtd/listener.c
+++ b/ax25rtd/listener.c
@@ -1,4 +1,4 @@
-/* $Id: listener.c,v 1.6 2009/06/14 16:25:33 ralf Exp $
+/* $Id: listener.c,v 1.7 2009/06/21 18:01:57 ralf Exp $
  *
  * Copyright (c) 1996 Jörg Reuter (jreuter@poboxes.com)
  *
@@ -39,11 +39,7 @@
 #include <net/if.h>
 #include <net/if_arp.h>
 
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
 
 #include "../pathnames.h"
 #include "ax25rtd.h"
diff --git a/call/call.c b/call/call.c
index 3a94225..db76545 100644
--- a/call/call.c
+++ b/call/call.c
@@ -37,21 +37,9 @@
 #include <unistd.h>
 #include <curses.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/configure.ac b/configure.ac
index 2b0cedc..0b16cc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,30 +20,17 @@ AC_CHECK_LIB(ax25, ax25_config_load_ports, AX25_LIB="-lax25", AC_MSG_ERROR(Could
 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, has_ax25=yes, has_ax25=no)
-if test "$has_ax25" = "yes" ; then
-  AC_DEFINE(HAVE_NETAX25_AX25_H, 1, [Define if you have a proper netax25/ax25.h header file.])
-  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, has_netrom=yes, has_netrom=no)
-if test "$has_netrom" = "yes" ; then
-  AC_DEFINE(HAVE_NETROM_NETROM_H, 1, [Define if you have a proper netrom/netrom.h header file.])
-  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, has_rose=yes, has_rose=no)
-if test "$has_rose" = "yes" ; then
-  AC_DEFINE(HAVE_NETROSE_ROSE_H, 1, [Define if you have a proper netrose/rose.h header file.])
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-fi
+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 header files.
 AC_HEADER_DIRENT
diff --git a/listen/listen.c b/listen/listen.c
index f07a1f6..4643e9c 100644
--- a/listen/listen.c
+++ b/listen/listen.c
@@ -17,11 +17,7 @@
 #else
 #include <linux/if_ether.h>
 #endif
-#ifdef HAVE_NETAX25_AX25_H
 #include <netax25/ax25.h>
-#else
-#include <netax25/kernel_ax25.h>
-#endif
 #include <netax25/axconfig.h>
 
 #include <config.h>