mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-24 10:38:38 +00:00
Link with LIB_TIMER_TIME as needed.
This commit is contained in:
parent
e28e67b3a3
commit
89d17fd0f2
@ -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 <eggert@cs.ucla.edu>
|
||||
|
||||
|
@ -1,3 +1,8 @@
|
||||
2012-09-27 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Check more robustly for timer_settime.
|
||||
* sed1v2.inp, sed3v2.inp (LIB_TIMER_TIME): New macro.
|
||||
|
||||
2012-08-04 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* sedlibmk.inp (allocator.$(OBJEXT), careadlinkat.$(OBJEXT)): Fix
|
||||
|
@ -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]*@//
|
||||
|
@ -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@//
|
||||
|
@ -1,6 +1,8 @@
|
||||
2012-09-27 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
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.
|
||||
|
@ -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) \
|
||||
|
Loading…
Reference in New Issue
Block a user