From c7e5fcf92cfefd75e4733b9d1f95f6199f526972 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 5 Apr 2006 21:22:10 +0000 Subject: [PATCH] Add prerequisites for some header checks to avoid "present but cannot be compiled" warnings. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17856 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ChangeLog | 5 +++++ src/configure.in | 10 +++++++++- src/util/pty/ChangeLog | 4 ++++ src/util/pty/configure.in | 10 +++++++++- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3ccec41cc..867094fdd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-04-05 Tom Yu + + * configure.in: Add prerequisites (application-defined macros) for + regexp.h. + 2006-03-31 Ken Raeburn * configure.in: Check for access, ftime, getcwd, srand48, srand, diff --git a/src/configure.in b/src/configure.in index 6ad693cd4..8b75fff4d 100644 --- a/src/configure.in +++ b/src/configure.in @@ -134,7 +134,15 @@ AC_HEADER_DIRENT AC_CHECK_FUNCS(strdup setvbuf inet_ntoa inet_aton seteuid setresuid setreuid setegid setresgid setregid setsid flock fchmod chmod strftime strptime geteuid setenv unsetenv getenv gethostbyname2 getifaddrs gmtime_r localtime_r pthread_mutex_lock sched_yield bswap16 bswap64 mkstemp getusershell lstat access ftime getcwd srand48 srand srandom stat strchr strerror strstr timezone umask waitpid sem_init sem_trywait daemon) AC_HEADER_STDARG DECLARE_SYS_ERRLIST -AC_CHECK_HEADERS(unistd.h paths.h regex.h regexp.h regexpr.h fcntl.h memory.h ifaddrs.h sys/filio.h sched.h byteswap.h machine/endian.h machine/byte_order.h sys/bswap.h endian.h pwd.h arpa/inet.h alloca.h dlfcn.h limits.h pthread.h semaphore.h krb_db.h kdc.h) +AC_CHECK_HEADERS(unistd.h paths.h regex.h regexpr.h fcntl.h memory.h ifaddrs.h sys/filio.h sched.h byteswap.h machine/endian.h machine/byte_order.h sys/bswap.h endian.h pwd.h arpa/inet.h alloca.h dlfcn.h limits.h pthread.h semaphore.h krb_db.h kdc.h) +AC_CHECK_HEADER(regexp.h, [], [], +[#define INIT char *sp = instring; +#define GETC() (*sp++) +#define PEEKC() (*sp) +#define UNGETC(c) (--sp) +#define RETURN(c) return(c) +#define ERROR(c) +]) AC_CHECK_MEMBERS([struct sockaddr_in.sin_len, struct sockaddr.sa_len], , , [#include #include ]) diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog index 2bfbafc90..fc026843e 100644 --- a/src/util/pty/ChangeLog +++ b/src/util/pty/ChangeLog @@ -1,3 +1,7 @@ +2006-04-05 Tom Yu + + * configure.in: Add prerequisites for sys/ptyvar.h. + 2006-03-31 Ken Raeburn * configure.in: Always provide three arguments to AC_DEFINE. diff --git a/src/util/pty/configure.in b/src/util/pty/configure.in index 50df5307a..7600b1dbd 100644 --- a/src/util/pty/configure.in +++ b/src/util/pty/configure.in @@ -50,11 +50,19 @@ AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY,1,[Define if openpty is provi AC_TYPE_MODE_T AC_CHECK_TYPE(time_t, long) AC_CHECK_FUNCS(setreuid gettosbyname setsid ttyname line_push ptsname grantpt openpty) -AC_CHECK_HEADERS(unistd.h stdlib.h string.h libutil.h pty.h sys/filio.h sys/sockio.h sys/label.h sys/tty.h sys/wait.h ttyent.h lastlog.h sys/select.h sys/ptyvar.h util.h) +AC_CHECK_HEADERS(unistd.h stdlib.h string.h libutil.h pty.h sys/filio.h sys/sockio.h sys/label.h sys/tty.h sys/wait.h ttyent.h lastlog.h sys/select.h util.h sys/stream.h) AC_CHECK_FUNCS(waitpid) CHECK_SIGNALS AC_CHECK_HEADER(termios.h,[AC_CHECK_FUNC(cfsetispeed,AC_DEFINE(POSIX_TERMIOS,1,[Define for POSIX termios interface]))]) +AC_CHECK_HEADER(sys/ptyvar.h, [], [], +[#if HAVE_SYS_STREAM_H +#include +#endif +#if HAVE_SYS_TTY_H +#include +#endif]) + ###################################################################### # # utmp related hair here. There's lots of it. -- 2.26.2