diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-01-23 17:15:22 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-01-23 17:15:22 -0500 |
| commit | c6d09b8da9277374a080f8574251b98f8f7879cb (patch) | |
| tree | 7d6581e10421c9a4d8dcede70b10909bc50f4793 | |
| parent | 5336c3ec747bcfca4edf97e962f06ec6f37b6936 (diff) | |
| download | emacs-c6d09b8da9277374a080f8574251b98f8f7879cb.tar.gz | |
Account for utmp.h availability.
* configure.in: Check for utmp.h availability (FreeBSD 9.x lacks
this header file).
* filelock.c: Include utmp.h only when HAVE_UTMP_H (FreeBSD 9.x
lacks this header file).
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/filelock.c | 2 |
5 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index db1d28dd620..6792ba4f3e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-01-23 Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change) + + * configure.in: Check for utmp.h availability (FreeBSD 9.x lacks + this header file). + 2010-01-12 Juanma Barranquero <lekktu@gmail.com> * .bzrignore: Ignore all .exe, instead of individual files. diff --git a/configure b/configure index 947b8ae9c3e..1ba9d361e6a 100755 --- a/configure +++ b/configure @@ -6665,11 +6665,12 @@ fi + for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \ linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \ termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \ sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \ - sys/utsname.h pwd.h + sys/utsname.h pwd.h utmp.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then diff --git a/configure.in b/configure.in index 33671e530ee..82d3dfe4ede 100644 --- a/configure.in +++ b/configure.in @@ -1106,7 +1106,7 @@ AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \ linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \ termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \ sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \ - sys/utsname.h pwd.h) + sys/utsname.h pwd.h utmp.h) AC_MSG_CHECKING(if personality LINUX32 can be set) AC_TRY_COMPILE([#include <sys/personality.h>], [personality (PER_LINUX32)], diff --git a/src/ChangeLog b/src/ChangeLog index 62337d8db63..d20b3113ba7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-01-23 Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change) + + * filelock.c: Include utmp.h only when HAVE_UTMP_H (FreeBSD 9.x + lacks this header file). + 2010-01-23 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * xdisp.c (draw_glyphs): Update `start' for left_overwritten case diff --git a/src/filelock.c b/src/filelock.c index 3c92d495060..7c69ea954fc 100644 --- a/src/filelock.c +++ b/src/filelock.c @@ -63,7 +63,9 @@ Lisp_Object Vtemporary_file_directory; #ifdef CLASH_DETECTION +#ifdef HAVE_UTMP_H #include <utmp.h> +#endif #if !defined (S_ISLNK) && defined (S_IFLNK) #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) |