[Emacs-diffs] /srv/bzr/emacs/trunk r99401: Account for utmp.h availability.

[Chong Yidong]

------------------------------------------------------------
revno: 99401
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-01-23 17:15:22 -0500
message:
  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).
modified:
  ChangeLog
  configure
  configure.in
  src/ChangeLog
  src/filelock.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-01-13 08:35:10 +0000
+++ b/ChangeLog 2010-01-23 22:15:22 +0000
@@ -1,3 +1,8 @@
+2010-01-23  Giorgos Keramidas  <address@hidden>  (tiny change)
+
+       * configure.in: Check for utmp.h availability (FreeBSD 9.x lacks
+       this header file).
+
 2010-01-12  Juanma Barranquero  <address@hidden>
 
        * .bzrignore: Ignore all .exe, instead of individual files.

=== modified file 'configure'
--- a/configure 2010-01-12 16:25:08 +0000
+++ b/configure 2010-01-23 22:15:22 +0000
@@ -6665,11 +6665,12 @@
 
 
 
+
 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

=== modified file 'configure.in'
--- a/configure.in      2010-01-13 08:35:10 +0000
+++ b/configure.in      2010-01-23 22:15:22 +0000
@@ -1106,7 +1106,7 @@
   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)],

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-23 05:20:38 +0000
+++ b/src/ChangeLog     2010-01-23 22:15:22 +0000
@@ -1,3 +1,8 @@
+2010-01-23  Giorgos Keramidas  <address@hidden>  (tiny change)
+
+       * filelock.c: Include utmp.h only when HAVE_UTMP_H (FreeBSD 9.x
+       lacks this header file).
+
 2010-01-23  YAMAMOTO Mitsuharu  <address@hidden>
 
        * xdisp.c (draw_glyphs): Update `start' for left_overwritten case

=== modified file 'src/filelock.c'
--- a/src/filelock.c    2010-01-13 08:35:10 +0000
+++ b/src/filelock.c    2010-01-23 22:15:22 +0000
@@ -63,7 +63,9 @@
 
 #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)