Changeset 6131ae87f1f4d61b94dfd16f280384290a3e65f8

Timestamp:

04/14/11 03:17:25 (2 years ago)

Author:

Piotr Sikora <piotr.sikora@frickle.com>

git-committer:

Piotr Sikora <piotr.sikora@frickle.com> 1302751045 +0000

git-parent:

[b8cf70c088e4f042cd71503f15c6503a3266c11a]

git-author:

Piotr Sikora <piotr.sikora@frickle.com> 1302751045 +0000

Message:

Correctly detect availability of openpty().

Files:

• configure.in (modified) (1 diff)
• src/noit_config.h.in (modified) (1 diff)
• src/noit_console.c (modified) (1 diff)

configure.in

@@ -391 +391 @@
-     ]])
-
+AC_CHECK_DECLS([openpty], [], [],
+                [#if defined(HAVE_SYS_TYPES_H)
+                 # include <sys/types.h>
+                 #endif
+                 #if defined(HAVE_SYS_IOCTL_H)
+                 # include <sys/ioctl.h>
+                 #endif
+                 #if defined(HAVE_TERMIOS_H)
+                 # include <termios.h>
+                 #endif
+                 #if defined(HAVE_LIBUTIL_H)
+                 # include <libutil.h>
+                 #endif
+                 #if defined(HAVE_UTIL_H)
+                 # include <util.h>
+                 #endif
+                 #if defined(HAVE_PTY_H)
+                 # include <pty.h>
+                 #endif
+                ])
+
-AC_CHECK_FUNCS(getpwnam_r)
-GETPWNAM_R_POSIX

src/noit_config.h.in

@@ -119 +119 @@
-#undef HAVE_STRNSTRN
-#undef HAVE_OPENPTY
+#undef HAVE_DECL_OPENPTY
-#undef HAVE_INET_PTON
-#undef HAVE_INET_NTOP

src/noit_console.c

@@ -311 +311 @@
-int
-allocate_pty(int *master, int *slave) {
-def HAVE_OPENPTY
+ defined(HAVE_OPENPTY) || defined(HAVE_DECL_OPENPTY)
-  if(openpty(master, slave, NULL, NULL, NULL)) return -1;
-#else