diff options
| author | Rafael G. Martins <rafael@rafaelmartins.eng.br> | 2017-02-11 18:51:12 +0100 |
|---|---|---|
| committer | Rafael G. Martins <rafael@rafaelmartins.eng.br> | 2017-02-11 18:51:12 +0100 |
| commit | cbeba5720d1b98cd7db013038b741b1a6ac9e48c (patch) | |
| tree | 01c84556d6a799847e287c4f1eb73cabc3d06d38 | |
| parent | ee6b177bc1cbc55472c85497e5043163d89ff814 (diff) | |
| download | blogc-cbeba5720d1b98cd7db013038b741b1a6ac9e48c.tar.gz blogc-cbeba5720d1b98cd7db013038b741b1a6ac9e48c.tar.bz2 blogc-cbeba5720d1b98cd7db013038b741b1a6ac9e48c.zip | |
Revert "make: do not require pthreads"
This reverts commit dd0ff8219b749f89ae66261830d10f1c27940b19.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 8514766..d1317d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -215,9 +215,11 @@ blogc_make_SOURCES = \ blogc_make_CFLAGS = \ $(AM_CFLAGS) \ + $(PTHREAD_CFLAGS) \ $(NULL) blogc_make_LDADD = \ + $(PTHREAD_LIBS) \ libblogc_make.la \ libblogc_common.la \ $(NULL) @@ -235,10 +237,12 @@ libblogc_make_la_SOURCES = \ libblogc_make_la_CFLAGS = \ $(AM_CFLAGS) \ + $(PTHREAD_CFLAGS) \ $(NULL) libblogc_make_la_LIBADD = \ $(LIBM) \ + $(PTHREAD_LIBS) \ libblogc_common.la \ $(NULL) endif diff --git a/configure.ac b/configure.ac index 2dfc43e..6e6b490 100644 --- a/configure.ac +++ b/configure.ac @@ -106,6 +106,9 @@ AS_IF([test "x$enable_make" = "xyes" -o "x$enable_make_embedded" = "xyes"], [ AC_CHECK_HEADERS([dirent.h fcntl.h libgen.h sys/stat.h sys/wait.h time.h unistd.h],, [ AC_MSG_ERROR([blogc-make tool requested but required headers not found]) ]) + AX_PTHREAD([], [ + AC_MSG_ERROR([blogc-make tool requested but pthread is not supported]) + ]) have_make_lib=yes AS_IF([test "x$enable_make_embedded" = "xyes"], [ MAKE_="enabled (embedded)" |