Skip to content

Commit a9bbb79

Browse files
committed
Fix issues while building in some systems
1 parent a292777 commit a9bbb79

File tree

2 files changed

+3
-70
lines changed

2 files changed

+3
-70
lines changed

bootstrap.sh

+1-69
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,2 @@
11
#!/bin/sh
2-
3-
die() {
4-
echo "$@"
5-
exit 1
6-
}
7-
8-
# Try to locate a program by using which, and verify that the file is an
9-
# executable
10-
locate_binary() {
11-
for f in $@
12-
do
13-
file=`which $f 2>/dev/null | grep -v '^no '`
14-
if test -n "$file" -a -x "$file"; then
15-
echo $file
16-
return 0
17-
fi
18-
done
19-
20-
echo ""
21-
return 1
22-
}
23-
24-
autogen() {
25-
26-
echo "libtoolize..."
27-
if test x$LIBTOOLIZE = x; then
28-
LIBTOOLIZE=`locate_binary libtoolize glibtoolize`
29-
if test x$LIBTOOLIZE = x; then
30-
die "Did not find a supported libtoolize"
31-
fi
32-
fi
33-
$LIBTOOLIZE --force || exit 1
34-
35-
echo "aclocal..."
36-
if test x$ACLOCAL = x; then
37-
ACLOCAL=`locate_binary aclocal aclocal-1.11 aclocal-1.10 aclocal-1.9 aclocal19 aclocal-1.7 aclocal17 aclocal-1.5 aclocal15`
38-
if test x$ACLOCAL = x; then
39-
die "Did not find a supported aclocal"
40-
fi
41-
fi
42-
$ACLOCAL || exit 1
43-
44-
echo "autoheader..."
45-
AUTOHEADER=${AUTOHEADER:-autoheader}
46-
$AUTOHEADER || exit 1
47-
48-
echo "automake..."
49-
if test x$AUTOMAKE = x; then
50-
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`
51-
if test x$AUTOMAKE = x; then
52-
die "Did not find a supported automake"
53-
fi
54-
fi
55-
$AUTOMAKE --foreign --add-missing || $AUTOMAKE --gnu --add-missing || exit 1
56-
57-
echo "autoconf..."
58-
AUTOCONF=${AUTOCONF:-autoconf}
59-
$AUTOCONF || exit 1
60-
61-
}
62-
63-
echo "== bootstraping yara"
64-
65-
if [ ! -d m4 ]; then
66-
echo "mkdir m4..."
67-
mkdir m4
68-
fi
69-
70-
autogen
2+
autoreconf --force --install

configure.ac

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ${CFLAGS=""}
1313
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
1414

1515
AC_PROG_CC
16+
AM_PROG_CC_C_O
1617
AM_PROG_LEX
1718
AC_PROG_YACC
1819

@@ -81,7 +82,7 @@ ACX_PTHREAD(
8182
CC="$PTHREAD_CC"],
8283
[AC_MSG_ERROR([pthread API support is required.])])
8384

84-
AC_CHECK_FUNCS_ONCE(strlcpy strlcat memmem timegm)
85+
AC_CHECK_FUNCS([strlcpy strlcat memmem timegm])
8586

8687
AM_CONDITIONAL([CUCKOO], [test x$build_cuckoo_module = xtrue])
8788
AM_CONDITIONAL([MAGIC], [test x$build_magic_module = xtrue])

0 commit comments

Comments
 (0)