diff options
| author | Jan Djärv | 2011-08-04 19:04:39 +0200 |
|---|---|---|
| committer | Jan Djärv | 2011-08-04 19:04:39 +0200 |
| commit | ae9e757af16bd39c21496430f66bcca2a47b4835 (patch) | |
| tree | c442ffcf54a7946841d42365b4f426200a5f3cb1 /src/Makefile.in | |
| parent | 213bd7f2f126e8f69cbb9be274ea99581937f193 (diff) | |
| download | emacs-ae9e757af16bd39c21496430f66bcca2a47b4835.tar.gz emacs-ae9e757af16bd39c21496430f66bcca2a47b4835.zip | |
Check for pthread and use it if found.
* configure.in (HAVE_PTHREAD): Add check for -lpthread.
(HAVE_GTK_AND_PTHREAD): Remove.
* src/Makefile.in (LIB_PTHREAD): New variable.
(LIBES): Add LIB_PTHREAD (Bug#9216).
* src/alloc.c, src/emacs.c, src/gmalloc.c, src/gtkutil.c, src/keyboard.c, src/syssignal.h:
Rename HAVE_GTK_AND_PTHREAD to HAVE_PTHREAD (Bug#9216).
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index f68fa5c2240..af4d6df9f8f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -130,6 +130,9 @@ START_FILES = @START_FILES@ | |||
| 130 | ## -lm, or empty. | 130 | ## -lm, or empty. |
| 131 | LIB_MATH=@LIB_MATH@ | 131 | LIB_MATH=@LIB_MATH@ |
| 132 | 132 | ||
| 133 | ## -lpthreads, or empty. | ||
| 134 | LIB_PTHREAD=@LIB_PTHREAD@ | ||
| 135 | |||
| 133 | LIBTIFF=@LIBTIFF@ | 136 | LIBTIFF=@LIBTIFF@ |
| 134 | LIBJPEG=@LIBJPEG@ | 137 | LIBJPEG=@LIBJPEG@ |
| 135 | LIBPNG=@LIBPNG@ | 138 | LIBPNG=@LIBPNG@ |
| @@ -385,7 +388,7 @@ LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ | |||
| 385 | $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ | 388 | $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ |
| 386 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ | 389 | $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ |
| 387 | $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ | 390 | $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ |
| 388 | $(LIBGNUTLS_LIBS) $(LIB_PTHREAD_SIGMASK) \ | 391 | $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(LIB_PTHREAD_SIGMASK) \ |
| 389 | $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC) | 392 | $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC) |
| 390 | 393 | ||
| 391 | all: emacs$(EXEEXT) $(OTHER_FILES) | 394 | all: emacs$(EXEEXT) $(OTHER_FILES) |