[Forensics-changes] [yara] 208/415: Fix build system

[Hilko Bengen]

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

bengen pushed a commit to branch debian
in repository yara.

commit 224aa4b8bb813acdfd3362876e030e0054aecbbb
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Mon Nov 4 12:46:26 2013 +0000

    Fix build system
---
 Makefile.am          | 2 +-
 REVISION             | 2 +-
 config.h             | 3 +++
 configure.ac         | 1 +
 libyara/Makefile.am  | 4 ++--
 libyara/configure.ac | 3 +++
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index affb76f..9050eb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS=-g -O0
+AM_CFLAGS=-g -O4 -I$(srcdir)/libyara
 
 # Build the library in the hand subdirectory first.
 SUBDIRS = libyara
diff --git a/REVISION b/REVISION
index e8fb9b5..5e7f3e2 100644
--- a/REVISION
+++ b/REVISION
@@ -1 +1 @@
-#define REVISION "223"
+#define REVISION "223:230"
diff --git a/config.h b/config.h
index 37b4028..f5b0484 100644
--- a/config.h
+++ b/config.h
@@ -7,6 +7,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+#define HAVE_LIBPTHREAD 1
+
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
diff --git a/configure.ac b/configure.ac
index 45af6b1..484a7c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_SUBDIRS([libyara])
+AC_CHECK_LIB(pthread, pthread_create)
 
 REVISION=`svnversion $srcdir | sed 's/[[A-Z]]//g'`
 which svnversion > /dev/null; \
diff --git a/libyara/Makefile.am b/libyara/Makefile.am
index c657db8..f727481 100644
--- a/libyara/Makefile.am
+++ b/libyara/Makefile.am
@@ -1,6 +1,6 @@
-AM_YFLAGS = -d
+AM_YFLAGS=-d
 
-CFLAGS=-g -O0
+AM_CFLAGS=-g -O4
 
 ACLOCAL_AMFLAGS=-I m4
 
diff --git a/libyara/configure.ac b/libyara/configure.ac
index 0e088ea..4f9c298 100644
--- a/libyara/configure.ac
+++ b/libyara/configure.ac
@@ -1,4 +1,7 @@
 AC_INIT([libyara], [2.0], [vmalvarez at virustotal.com])
+
+${CFLAGS=""}
+
 LT_INIT
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_PROG_CC

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