diff options
| author | Paul Eggert | 2011-07-08 13:20:19 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-08 13:20:19 -0700 |
| commit | 2a84b02da8b20138fad7fafdea92d7c8f0564ee0 (patch) | |
| tree | da64c1fd303aa85b53ad485779b05fbdd2685a28 /src | |
| parent | 1692ae2dd5ff8f6f1fc6f6f62b9a44ab7e615615 (diff) | |
| download | emacs-2a84b02da8b20138fad7fafdea92d7c8f0564ee0.tar.gz emacs-2a84b02da8b20138fad7fafdea92d7c8f0564ee0.zip | |
Simplify Emacs part of pthread_sigmask support.
* Makefile.in (GNULIB_TOOL_FLAGS): Do not avoid sigprocmask.
* configure.in (AC_TYPE_UID_T): New dummy macro.
Configure gnulib after adjusting LIBS,
so that gnulib can assume the libraries in LIBS.
* lib/pthread_sigmask.c, lib/sigprocmask.c, m4/signalblocking.m4:
New files, automatically imported from gnulib.
* lib/gnulib.mk, m4/gl-comp.m4: Regenerate.
* src/Makefile.in (LIB_PTHREAD_SIGMASK): New macro.
(LIBES): Use it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index f628c321f70..f68fa5c2240 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -269,6 +269,8 @@ LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ | |||
| 269 | LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ | 269 | LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ |
| 270 | LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ | 270 | LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ |
| 271 | 271 | ||
| 272 | LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ | ||
| 273 | |||
| 272 | INTERVALS_H = dispextern.h intervals.h composite.h | 274 | INTERVALS_H = dispextern.h intervals.h composite.h |
| 273 | 275 | ||
| 274 | GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ | 276 | GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ |
| @@ -383,7 +385,7 @@ LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ | |||
| 383 | $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ | 385 | $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ |
| 384 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ | 386 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ |
| 385 | $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ | 387 | $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ |
| 386 | $(LIBGNUTLS_LIBS) \ | 388 | $(LIBGNUTLS_LIBS) $(LIB_PTHREAD_SIGMASK) \ |
| 387 | $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC) | 389 | $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC) |
| 388 | 390 | ||
| 389 | all: emacs$(EXEEXT) $(OTHER_FILES) | 391 | all: emacs$(EXEEXT) $(OTHER_FILES) |