[Forensics-changes] [yara] 62/407: Improve ACX_PTHREAD usage

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.3.0
in repository yara.

commit 4db20e7c8a3f7eb07aa952cdc978c324a2a57d6c
Author: Victor Manuel Alvarez <vmalvarez at virustotal.com>
Date:   Wed Sep 24 10:54:41 2014 +0200

    Improve ACX_PTHREAD usage
---
 Makefile.am  | 2 +-
 configure.ac | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7b5447d..04dee0e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS=-O3 -Wall -I$(srcdir)/libyara/include $(PTHREAD_CFLAGS)
+AM_CFLAGS=-O3 -Wall -I$(srcdir)/libyara/include
 
 # Build the library in the hand subdirectory first.
 SUBDIRS = libyara
diff --git a/configure.ac b/configure.ac
index c53302f..5bb5677 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,11 @@ AC_ARG_ENABLE([magic],
     AC_DEFINE([MAGIC], [1], [enable magic module])
   fi])
 
-ACX_PTHREAD
+ACX_PTHREAD(
+    [LIBS="$PTHREAD_LIBS $LIBS"
+     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+     CC="$PTHREAD_CC"],
+    [AC_MSG_ERROR([pthread API support is required.])])
 
 AC_CHECK_FUNCS_ONCE(strlcpy strlcat)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git