[Emacs-diffs] /srv/bzr/emacs/trunk r110229: Link with LIB_TIMER_TIME as needed.

[Paul Eggert]

------------------------------------------------------------
revno: 110229
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2012-09-27 16:02:23 -0700
message:
  Link with LIB_TIMER_TIME as needed.
modified:
  ChangeLog
  msdos/ChangeLog
  msdos/sed1v2.inp
  msdos/sed3v2.inp
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-09-27 01:06:23 +0000
+++ b/ChangeLog 2012-09-27 23:02:23 +0000
@@ -5,6 +5,7 @@
        <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00671.html>.
        * configure.ac (gl_THREADLIB): Define to empty, since Emacs
        does threads its own way.
+       * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
 
 2012-09-23  Paul Eggert  <address@hidden>
 

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2012-08-28 16:01:59 +0000
+++ b/msdos/ChangeLog   2012-09-27 23:02:23 +0000
@@ -1,3 +1,8 @@
+2012-09-27  Paul Eggert  <address@hidden>
+
+       Check more robustly for timer_settime.
+       * sed1v2.inp, sed3v2.inp (LIB_TIMER_TIME): New macro.
+
 2012-08-04  Eli Zaretskii  <address@hidden>
 
        * sedlibmk.inp (allocator.$(OBJEXT), careadlinkat.$(OBJEXT)): Fix

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2012-08-01 15:19:51 +0000
+++ b/msdos/sed1v2.inp  2012-09-27 23:02:23 +0000
@@ -106,6 +106,7 @@
 /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@//
 /^LIB_PTHREAD_SIGMASK *=/s/@address@hidden@//
 /^LIB_CLOCK_GETTIME *=/s/@address@hidden@//g
+/^LIB_TIMER_TIME *=/s/@address@hidden@//g
 /^LIBGNUTLS_LIBS *=/s/@address@hidden@//
 /^LIBGNUTLS_CFLAGS *=/s/@address@hidden@//
 /^GETLOADAVG_LIBS *=/s/@address@hidden@//

=== modified file 'msdos/sed3v2.inp'
--- a/msdos/sed3v2.inp  2012-06-30 15:32:51 +0000
+++ b/msdos/sed3v2.inp  2012-09-27 23:02:23 +0000
@@ -36,6 +36,7 @@
 /^LIBS_MAIL *=/s/@address@hidden@//g
 /^LIBS_SYSTEM *=/s/@address@hidden@//g
 /^LIB_CLOCK_GETTIME *=/s/@address@hidden@//g
+/^LIB_TIMER_TIME *=/s/@address@hidden@//g
 /^CFLAGS *=/s!=.*$!=-O2 -g!
 /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS -I../msdos!
 /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-27 01:06:23 +0000
+++ b/src/ChangeLog     2012-09-27 23:02:23 +0000
@@ -1,6 +1,8 @@
 2012-09-27  Paul Eggert  <address@hidden>
 
        Check more robustly for timer_settime.
+       * Makefile.in (LIB_TIMER_TIME): New macro.
+       (LIBES): Add it.
        * atimer.c (alarm_timer, alarm_timer_ok, set_alarm, init_atimer):
        Use HAVE_TIMER_SETTIME, not SIGEV_SIGNAL, to decide whether to
        call timer_settime.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2012-09-26 15:19:10 +0000
+++ b/src/Makefile.in   2012-09-27 23:02:23 +0000
@@ -153,6 +153,7 @@
 M17N_FLT_LIBS = @M17N_FLT_LIBS@
 
 address@hidden@
address@hidden@
 
 DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_LIBS = @DBUS_LIBS@
@@ -385,8 +386,8 @@
 ## duplicated symbols.  If the standard libraries were compiled
 ## with GCC, we might need LIB_GCC again after them.
 LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
-   $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) \
-   $(LIB_EXECINFO) \
+   $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) $(LIB_TIMER_TIME) \
+   $(DBUS_LIBS) $(LIB_EXECINFO) \
    $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
    $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
    $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \