[Forensics-changes] [yara] 244/415: Remove REVISION file and fix configure.ac to work with automake 1.12

[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 84ac31126c21abc8936191036ee0f590630adb37
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Sun Nov 24 21:36:35 2013 +0100

    Remove REVISION file and fix configure.ac to work with automake 1.12
---
 REVISION             |  1 -
 configure.ac         | 11 +++++------
 libyara/configure.ac |  5 +++++
 yara.c               |  1 -
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/REVISION b/REVISION
deleted file mode 100644
index 5e7f3e2..0000000
--- a/REVISION
+++ /dev/null
@@ -1 +0,0 @@
-#define REVISION "223:230"
diff --git a/configure.ac b/configure.ac
index 484a7c2..7fbd5a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,11 @@ AC_INIT([yara], [2.0], [vmalvarez at virustotal.com])
 
 ${CFLAGS=""}
 
+# automake 1.12 seems to require AM_PROG_AR, but automake 1.11 doesn't 
+# recognize it
+
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
 LT_INIT
 AM_INIT_AUTOMAKE([-Wall -Werror])
 AC_PROG_CC
@@ -12,11 +17,5 @@ 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; \
-if test $? -ne 0  || test "x$REVISION" = "xexported"
-  then REVISION=`cat $srcdir/REVISION`
-  else echo "#define REVISION \"$REVISION\"">$srcdir/REVISION
-fi
 AC_SUBST(REVISION)
 AC_OUTPUT
diff --git a/libyara/configure.ac b/libyara/configure.ac
index 4f9c298..d8fee1a 100644
--- a/libyara/configure.ac
+++ b/libyara/configure.ac
@@ -2,6 +2,11 @@ AC_INIT([libyara], [2.0], [vmalvarez at virustotal.com])
 
 ${CFLAGS=""}
 
+# automake 1.12 seems to require AM_PROG_AR, but automake 1.11 doesn't 
+# recognize it
+
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
 LT_INIT
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_PROG_CC
diff --git a/yara.c b/yara.c
index 9150794..b370171 100644
--- a/yara.c
+++ b/yara.c
@@ -38,7 +38,6 @@ limitations under the License.
 
 #include "threading.h"
 #include "config.h"
-#include "REVISION"
 
 #define USAGE \
 "usage:  yara [OPTION]... RULES_FILE FILE | PID\n"\

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