[Forensics-changes] [yara] 248/415: Improve 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 bf08c4d3e464c1400aea2234ea40c27bc7c44d29
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Mon Nov 25 12:40:07 2013 +0100

    Improve build system
---
 REVISION             |  2 +-
 bootstrap.sh         | 34 ++++++++++++++++++++++++++--------
 configure.ac         | 13 +++++++------
 libyara/configure.ac | 18 +++++++++---------
 4 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/REVISION b/REVISION
index 4f24f90..7e6742d 100644
--- a/REVISION
+++ b/REVISION
@@ -1 +1 @@
-#define REVISION "167"
+#define REVISION "176"
diff --git a/bootstrap.sh b/bootstrap.sh
index c4cda01..96c84ea 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -3,21 +3,39 @@
 # Quick and dirty script to reset everything
 # regarding libtool, autoconf, automake, etc.
 
+rm -rf m4
+rm -rf libyara/m4
 
 mkdir m4
 mkdir libyara/m4
 
-# Check if libtoolize exists, if not, try with glibtoolize (Mac OS X name it that way)
-hash libtoolize &> /dev/null
+cd libyara
+
+# Check if libtoolize exists, if not,
+# try with glibtoolize (Mac OS X name it that way)
 
+hash libtoolize &> /dev/null
 if [ $? -eq 1 ]; then
-    glibtoolize
+    glibtoolize --force
 else
-    libtoolize
+    libtoolize --force
 fi
 
-automake --add-missing 
-cd libyara  && aclocal && automake --add-missing && cd ..
+aclocal
+autoheader
+automake --add-missing
+autoreconf
+
+cd ..
+
+hash libtoolize &> /dev/null
+if [ $? -eq 1 ]; then
+    glibtoolize --force
+else
+    libtoolize --force
+fi
 
-autoreconf -vif
-cd libyara && aclocal && autoreconf -vif && cd ..
+aclocal
+autoheader
+automake --add-missing
+autoreconf
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 6c7a923..ea05d54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,17 +3,18 @@ LT_INIT
 AM_INIT_AUTOMAKE([-Wall -Werror])
 AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR([m4])
 AC_ARG_WITH([re2],
-	[AS_HELP_STRING([--with-re2],[use RE2 instead of PCRE])],
+  [AS_HELP_STRING([--with-re2],[use RE2 instead of PCRE])],
         [
-			AC_LANG_CPLUSPLUS
-			AC_CHECK_LIB(re2, main,,AC_MSG_ERROR(please install RE2 library))
-			[re2=true]
+      AC_LANG_CPLUSPLUS
+      AC_CHECK_LIB(re2, main,,AC_MSG_ERROR(please install RE2 library))
+      [re2=true]
         ],
         [
-        	AC_CHECK_LIB(pcre, main,,AC_MSG_ERROR(please install PCRE library))
-        	[re2=false]
+          AC_CHECK_LIB(pcre, main,,AC_MSG_ERROR(please install PCRE library))
+          [re2=false]
         ])
 AM_CONDITIONAL([RE2], [test x$re2 = xtrue])
 AC_CONFIG_HEADERS([config.h])
diff --git a/libyara/configure.ac b/libyara/configure.ac
index 8ad4556..a19d984 100644
--- a/libyara/configure.ac
+++ b/libyara/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT([libyara], [1.7], [vmalvarez at virustotal.com])
 LT_INIT
-AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-extra-portability])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_YACC
@@ -8,19 +8,19 @@ AM_PROG_LEX
 AC_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR([m4])
 AC_ARG_WITH([re2],
-	[AS_HELP_STRING([--with-re2],[use RE2])],
+  [AS_HELP_STRING([--with-re2],[use RE2])],
         [
-		AC_LANG_CPLUSPLUS
-		AC_CHECK_LIB(re2, main,,AC_MSG_ERROR(please install RE2 library))
-		[re2=true]
+    AC_LANG_CPLUSPLUS
+    AC_CHECK_LIB(re2, main,,AC_MSG_ERROR(please install RE2 library))
+    [re2=true]
         ],
         [
-        	AC_CHECK_LIB(pcre, main,,AC_MSG_ERROR(please install PCRE library))
+          AC_CHECK_LIB(pcre, main,,AC_MSG_ERROR(please install PCRE library))
         ])
 AM_CONDITIONAL([RE2], [test x$re2 = xtrue])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
-			Makefile 
-			regex/Makefile
-		])
+      Makefile
+      regex/Makefile
+    ])
 AC_OUTPUT

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