diff options
| -rw-r--r-- | Makefile.am | 22 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | netax25/ax25.h (renamed from netax25/kernel_ax25.h) | 0 | ||||
| -rw-r--r-- | netrom/netrom.h (renamed from netax25/kernel_netrom.h) | 0 | ||||
| -rw-r--r-- | netrose/rose.h (renamed from netax25/kernel_rose.h) | 0 |
5 files changed, 21 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 0ceed26..1705888 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,16 @@ libax25ioincludedir = $(includedir) INCLUDES = -DAX25_SYSCONFDIR=\""$(sysconfdir)/ax25/"\" \ -DAX25_LOCALSTATEDIR=\""$(localstatedir)/ax25/"\" +if !AX25_H +USE_LIBAX25_AX25_H = netax25/ax25.h +endif +if !NETROM_H +USE_LIBAX25_NETROM_H = netrom/netrom.h +endif +if !ROSE_H +USE_LIBAX25_ROSE_H = netrose/rose.h +endif + nobase_libax25include_HEADERS = \ netax25/axlib.h \ netax25/axconfig.h \ @@ -14,10 +24,10 @@ nobase_libax25include_HEADERS = \ netax25/daemon.h \ netax25/ttyutils.h \ netax25/procutils.h \ - netax25/kernel_ax25.h \ - netax25/kernel_rose.h \ - netax25/kernel_netrom.h \ - netax25/mheard.h + netax25/mheard.h \ + $(USE_LIBAX25_AX25_H) \ + $(USE_LIBAX25_NETROM_H) \ + $(USE_LIBAX25_ROSE_H) nobase_libax25ioinclude_HEADERS = \ netax25/ax25io.h @@ -40,8 +50,8 @@ libax25_la_SOURCES = \ netax25/rsconfig.h \ ttyutils.c \ netax25/ttyutils.h \ - netax25/kernel_ax25.h \ - netax25/kernel_rose.h + $(USE_LIBAX25_AX25_H) \ + $(USE_LIBAX25_ROSE_H) libax25io_la_SOURCES = \ ax25io.c \ diff --git a/configure.ac b/configure.ac index 7e56c65..2701f87 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,8 @@ if test "$has_ax25" = "yes" ; then else AC_MSG_RESULT(no) fi +AM_CONDITIONAL([AX25_H], [test "$has_ax25" = "yes"]) + AC_MSG_CHECKING(for working netrom/netrom.h header file) AC_HEADER_EGREP(unsigned int ndigis, netrom/netrom.h, has_netrom=yes, has_netrom=no) if test "$has_netrom" = "yes" ; then @@ -37,6 +39,8 @@ if test "$has_netrom" = "yes" ; then else AC_MSG_RESULT(no) fi +AM_CONDITIONAL([NETROM_H], [test "$has_netrom" = "yes"]) + AC_MSG_CHECKING(for working netrose/rose.h header file) AC_HEADER_EGREP(rose_facilities_struct, netrose/rose.h, has_rose=yes, has_rose=no) if test "$has_rose" = "yes" ; then @@ -45,6 +49,7 @@ if test "$has_rose" = "yes" ; then else AC_MSG_RESULT(no) fi +AM_CONDITIONAL([ROSE_H], [test "$has_rose" = "yes"]) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git a/netax25/kernel_ax25.h b/netax25/ax25.h index e1b6abb..e1b6abb 100644 --- a/netax25/kernel_ax25.h +++ b/netax25/ax25.h diff --git a/netax25/kernel_netrom.h b/netrom/netrom.h index 4984772..4984772 100644 --- a/netax25/kernel_netrom.h +++ b/netrom/netrom.h diff --git a/netax25/kernel_rose.h b/netrose/rose.h index e4ba7d7..e4ba7d7 100644 --- a/netax25/kernel_rose.h +++ b/netrose/rose.h |