- don't try to use linux/termios.h

- remove rc tag

diff --git a/config.h.in b/config.h.in
index 68fa99e98ffacba3ac98ab370bb6d23004862e08..812793bab1c7b77d00f64f45e772d09fa58d6b76 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -16,9 +16,6 @@
 /* Define if you have a readline compatible library */
 #undef HAVE_LIBREADLINE
 
-/* Define to 1 if you have the <linux/termios.h> header file. */
-#undef HAVE_LINUX_TERMIOS_H
-
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 

diff --git a/configure b/configure
index 4bfbde2ccecdd1bcbf224c2b83346671d8bbdd3c..7d43b581c80804e292d87c1fb52c535a0b3d19d8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1613,7 +1613,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=abook
- VERSION=0.5.4rc3
+ VERSION=0.5.4
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4024,8 +4024,7 @@ fi
 
 
 
-
-for ac_header in unistd.h locale.h termios.h linux/termios.h sys/ioctl.h
+for ac_header in unistd.h locale.h termios.h sys/ioctl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then

diff --git a/configure.in b/configure.in
index b2e409a0cb5c365bb326cc5d7844fe9b397e82cc..d75364f6e0b272a110f7e25b0e8a029efb2b05c1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.5.4rc3)
+AM_INIT_AUTOMAKE(abook, 0.5.4)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
@@ -15,7 +15,7 @@ fi
 AC_C_INLINE
 AC_PROG_INSTALL
 AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h locale.h termios.h linux/termios.h sys/ioctl.h)
+AC_CHECK_HEADERS(unistd.h locale.h termios.h sys/ioctl.h)
 AC_CHECK_HEADER(stdarg.h,AC_DEFINE(HAVE_STDARG_H, 1, [Define if you have the <stdarg.h> header file.]),AC_MSG_ERROR([*** stdarg.h is missing on your system ***]))
 AC_FUNC_STRCOLL
 AC_CHECK_FUNCS(setlocale)

diff --git a/ui.c b/ui.c
index 62b5e8f327d52340f2986c46005a47ee421c9b0a..4f162e179149d68595a518c823e7e2e43de244f1 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -28,10 +28,6 @@
 #endif
 #ifdef HAVE_TERMIOS_H
 #      include <termios.h>
-#else
-#      ifdef HAVE_LINUX_TERMIOS_H
-#              include <linux/termios.h>
-#      endif
 #endif
 #ifdef HAVE_SYS_IOCTL_H
 #      include <sys/ioctl.h>