From: Jaakko Heinonen Date: Tue, 23 Aug 2005 09:58:25 +0000 (+0000) Subject: - don't try to use linux/termios.h X-Git-Tag: upstream/0.6.1~2^2~175 X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=47ca9ac04785f2d48d28886cbc4e2802b19dd9cf;p=pkg%2Fabook.git - don't try to use linux/termios.h - remove rc tag --- diff --git a/config.h.in b/config.h.in index 68fa99e..812793b 100644 --- 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 header file. */ -#undef HAVE_LINUX_TERMIOS_H - /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H diff --git a/configure b/configure index 4bfbde2..7d43b58 100755 --- 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 b2e409a..d75364f 100644 --- 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 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 62b5e8f..4f162e1 100644 --- a/ui.c +++ b/ui.c @@ -28,10 +28,6 @@ #endif #ifdef HAVE_TERMIOS_H # include -#else -# ifdef HAVE_LINUX_TERMIOS_H -# include -# endif #endif #ifdef HAVE_SYS_IOCTL_H # include