Skip to content

Commit

Permalink
improved BE13 roadmap
Browse files Browse the repository at this point in the history
  • Loading branch information
simsong committed Jul 3, 2020
1 parent 8c8b396 commit 44c8105
Show file tree
Hide file tree
Showing 8 changed files with 136 additions and 321 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,4 @@ tests/Data-*/
tests/Makefile
win32
win64
ar-lib
2 changes: 2 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# This file is compiled with automake to create Makefile.in.
# Makefile.in is transformed by "configure" to create Makefile
#
# (C) 2020 Simson L. Garfinkel
# https://www.gnu.org/licenses/lgpl-3.0.en.html

SUBDIRS = doc doc/latex_manuals src man plugins python specfiles tests $(BE_VIEWER_DIR)

Expand Down
8 changes: 3 additions & 5 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
# Make sure it was checked out with git clone --recursive ...
# If not, update the submodules

for sub in be13_api dfxml
for sub in be13_api be13_api/dfxml
do
if [ ! -r src/$sub/.git ] ; then
echo bringing in submodules
echo next time check out with git clone --recursive
git submodule init
git submodule update
echo submodule $sub is not present.
exit 1
fi
done

Expand Down
18 changes: 6 additions & 12 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,11 @@ AC_PROG_LEX
# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html

m4_include([m4/ax_cxx_compile_stdcxx_11.m4])
AC_LANG_PUSH(C++)
AX_CXX_COMPILE_STDCXX_11(noext, optional)
AC_LANG_POP()


# Endian check is required for MD5 implementation
AC_C_BIGENDIAN

# These are needed for bulk_extractor. They are not needed for tcpflow
AC_DEFINE([BULK_EXTRACTOR],1,[We are compiling bulk_extractor])

Expand All @@ -66,7 +65,6 @@ else
AC_MSG_ERROR([$LEX does not support -R. Please get a modern version of gnu flex])
fi


m4_include([m4/slg_mingw_support.m4])
m4_include([m4/slg_searchdirs.m4])
m4_include([m4/slg_gcc_all_warnings.m4])
Expand All @@ -76,7 +74,7 @@ m4_include([m4/slg_gcc_all_warnings.m4])

CFLAGS="$CFLAGS"

m4_include([src/dfxml/src/dfxml_configure.m4])
m4_include([src/be13_api/dfxml/src/dfxml_configure.m4])
m4_include([src/be13_api/be13_configure.m4])

################################################################
Expand Down Expand Up @@ -240,9 +238,8 @@ AC_CHECK_HEADERS([expat.h])
AC_CHECK_LIB([expat],[XML_ParserCreate])

################################################################
## regex support
## there are several options
## tre is better than regex
## Lightgrep support
##
AC_CHECK_LIB([stdc++],[main])

if test x"$lightgrep" == x"yes"; then
Expand Down Expand Up @@ -271,10 +268,7 @@ if test x"$lightgrep" == x"yes"; then
LDFLAGS="$LDFLAGS `$PKG_CONFIG --libs-only-L --libs-only-other lightgrep`"
fi

AC_CHECK_HEADERS([regex.h tre/tre.h])
AC_CHECK_LIB([regex],[regcomp])
AC_CHECK_LIB([tre],[tre_regcomp])
AC_CHECK_FUNCS([regcomp tre_regcomp tre_version])
# We can also use C++11 regex, which we just assume we have, because it's the standard.

################################################################
## AFFLIB support
Expand Down
Loading

0 comments on commit 44c8105

Please sign in to comment.