[Forensics-changes] [yara] 236/407: Fix issues while building in some systems

[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 a9bbb7990dc970384c888c9e61ea8c4ad6f81efb
Author: Victor Manuel Alvarez <vmalvarez at virustotal.com>
Date:   Mon Dec 1 12:33:52 2014 +0100

    Fix issues while building in some systems
---
 bootstrap.sh | 70 +-----------------------------------------------------------
 configure.ac |  3 ++-
 2 files changed, 3 insertions(+), 70 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index f3ee6fa..3f026c4 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,70 +1,2 @@
 #!/bin/sh
-
-die() {
-    echo "$@"
-    exit 1
-}
-
-# Try to locate a program by using which, and verify that the file is an
-# executable
-locate_binary() {
-  for f in $@
-  do
-    file=`which $f 2>/dev/null | grep -v '^no '`
-    if test -n "$file" -a -x "$file"; then
-      echo $file
-      return 0
-    fi
-  done
-
-  echo ""
-  return 1
-}
-
-autogen() {
-
-  echo "libtoolize..."
-  if test x$LIBTOOLIZE = x; then
-    LIBTOOLIZE=`locate_binary libtoolize glibtoolize`
-    if test x$LIBTOOLIZE = x; then
-      die "Did not find a supported libtoolize"
-    fi
-  fi
-  $LIBTOOLIZE --force || exit 1
-
-  echo "aclocal..."
-  if test x$ACLOCAL = x; then
-    ACLOCAL=`locate_binary aclocal aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal19 aclocal-1.7 aclocal17 aclocal-1.5 aclocal15`
-    if test x$ACLOCAL = x; then
-      die "Did not find a supported aclocal"
-    fi
-  fi
-  $ACLOCAL || exit 1
-
-  echo "autoheader..."
-  AUTOHEADER=${AUTOHEADER:-autoheader}
-  $AUTOHEADER || exit 1
-
-  echo "automake..."
-  if test x$AUTOMAKE = x; then
-    AUTOMAKE=`locate_binary automake automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.7`
-    if test x$AUTOMAKE = x; then
-      die "Did not find a supported automake"
-    fi
-  fi
-  $AUTOMAKE --foreign --add-missing || $AUTOMAKE --gnu --add-missing || exit 1
-
-  echo "autoconf..."
-  AUTOCONF=${AUTOCONF:-autoconf}
-  $AUTOCONF || exit 1
-
-}
-
-echo "== bootstraping yara"
-
-if [ ! -d m4 ]; then
-  echo "mkdir m4..."
-  mkdir m4
-fi
-
-autogen
+autoreconf --force --install
diff --git a/configure.ac b/configure.ac
index 2e7c4b4..9a01727 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,7 @@ ${CFLAGS=""}
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AM_PROG_LEX
 AC_PROG_YACC
 
@@ -81,7 +82,7 @@ ACX_PTHREAD(
      CC="$PTHREAD_CC"],
     [AC_MSG_ERROR([pthread API support is required.])])
 
-AC_CHECK_FUNCS_ONCE(strlcpy strlcat memmem timegm)
+AC_CHECK_FUNCS([strlcpy strlcat memmem timegm])
 
 AM_CONDITIONAL([CUCKOO], [test x$build_cuckoo_module = xtrue])
 AM_CONDITIONAL([MAGIC], [test x$build_magic_module = xtrue])

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