Changeset 4791 for neercsTweet

Timestamp:

Dec 9, 2011, 12:23:18 AM (9 years ago)

Author:

Pascal Terjan

Message:

Include util.h or libutil.h depending on what is available, should help building on FreeBSD

Location:

neercs/trunk

Files:

• configure.ac (modified) (1 diff)
• src/term.c (modified) (1 diff)

neercs/trunk/configure.ac

@@ -71 +71 @@
   AC_MSG_ERROR([you need libcaca version 0.99.beta17 or later])])
 
-AC_CHECK_HEADERS(stdio.h pty.h sys/ioctl.h sys/ptrace.h sys/stat.h sys/syscall.h sys/user.h sys/wait.h linux/kdev_t.h linux/major.h security/pam_appl.h security/pam_misc.h)
+AC_CHECK_HEADERS(libutil.h util.h stdio.h pty.h sys/ioctl.h sys/ptrace.h sys/stat.h sys/syscall.h sys/user.h sys/wait.h linux/kdev_t.h linux/major.h security/pam_appl.h security/pam_misc.h)
 
 case $host_os in

neercs/trunk/src/term.c

@@ -19 +19 @@
 #if defined HAVE_PTY_H
 #   include <pty.h>             /* for openpty and forkpty */
-#else
-#   include <util.h>            /* for OS X */
+#endif
+#if defined HAVE_UTIL_H
+#   include <util.h>            /* for OS X, OpenBSD and NetBSD */
+#endif
+#if defined HAVE_LIBUTIL_H
+#   include <libutil.h>         /* for FreeBSD */
 #endif
 #include <unistd.h>