From 89d17fd0f291f4ea6d14fe1bc0143554dba6e951 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 27 Sep 2012 16:02:23 -0700 Subject: [PATCH] Link with LIB_TIMER_TIME as needed. --- ChangeLog | 1 + msdos/ChangeLog | 5 +++++ msdos/sed1v2.inp | 1 + msdos/sed3v2.inp | 1 + src/ChangeLog | 2 ++ src/Makefile.in | 5 +++-- 6 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40c8f1550e6..c7de7d7c14d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ . * 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 diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 45666a335de..525868b2c70 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,8 @@ +2012-09-27 Paul Eggert + + Check more robustly for timer_settime. + * sed1v2.inp, sed3v2.inp (LIB_TIMER_TIME): New macro. + 2012-08-04 Eli Zaretskii * sedlibmk.inp (allocator.$(OBJEXT), careadlinkat.$(OBJEXT)): Fix diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 0ed88931691..fbee1dd03f9 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -106,6 +106,7 @@ s/\.h\.in/.h-in/ /^LIBSELINUX_LIBS *=/s/@LIBSELINUX_LIBS@// /^LIB_PTHREAD_SIGMASK *=/s/@[^@\n]*@// /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g +/^LIB_TIMER_TIME *=/s/@[^@\n]*@//g /^LIBGNUTLS_LIBS *=/s/@[^@\n]*@// /^LIBGNUTLS_CFLAGS *=/s/@[^@\n]*@// /^GETLOADAVG_LIBS *=/s/@[^@\n]*@// diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index bfa008b3e81..cd58e47305c 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -36,6 +36,7 @@ s/-DVERSION[^ ]* // /^LIBS_MAIL *=/s/@[^@\n]*@//g /^LIBS_SYSTEM *=/s/@[^@\n]*@//g /^LIB_CLOCK_GETTIME *=/s/@[^@\n]*@//g +/^LIB_TIMER_TIME *=/s/@[^@\n]*@//g /^CFLAGS *=/s!=.*$!=-O2 -g! /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS -I../msdos! /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// diff --git a/src/ChangeLog b/src/ChangeLog index c920f091063..b0899d67ca8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,8 @@ 2012-09-27 Paul Eggert 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. diff --git a/src/Makefile.in b/src/Makefile.in index e43f83e1172..f8da0091711 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -153,6 +153,7 @@ M17N_FLT_CFLAGS = @M17N_FLT_CFLAGS@ M17N_FLT_LIBS = @M17N_FLT_LIBS@ LIB_CLOCK_GETTIME=@LIB_CLOCK_GETTIME@ +LIB_TIMER_TIME=@LIB_TIMER_TIME@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ @@ -385,8 +386,8 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \ ## 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) \