Skip to content

Commit

Permalink
Add FilesystemInterface_t support
Browse files Browse the repository at this point in the history
  • Loading branch information
danopernis authored and Frantisek Boranek committed Oct 3, 2018
1 parent 42ef032 commit fb17997
Show file tree
Hide file tree
Showing 33 changed files with 939 additions and 307 deletions.
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
**/.deps
**/.libs/
**/debian/*.debhelper.log
**/debian/*.substvars
**/debian/autoreconf.*
Expand All @@ -6,7 +8,9 @@
*.debhelper
*.la
*.lo
*.log
*.o
*.trs
aclocal.m4
autom4te.cache
compile
Expand All @@ -27,13 +31,14 @@ Makefile.in
missing
python/.pybuild
python/debian/python-teng/**
src/.libs/
src/Makefile
src/Makefile.in
src/tengconfig.h
src/tenglex2.cc
src/tengsyntax.cc
src/tengsyntax.hh
test-driver
test_base
test_filesystem
version
ylwrap
src/.deps
4 changes: 2 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
# Created.
#

SUBDIRS = src
# directories temporarily out of order: 'test', 'doc'
SUBDIRS = . src tests
# directories temporarily out of order: 'doc'

#
# Removed due to this request:
Expand Down
16 changes: 16 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ AM_SILENT_RULES

# tell autoconf where to find sources
AC_CONFIG_SRCDIR([src/teng.cc])
AC_CONFIG_FILES([tests/Makefile])

# check for C++ compiler
AC_PROG_CXX
Expand Down Expand Up @@ -129,6 +130,14 @@ AC_ARG_ENABLE(lock-udf,[ --disable-udf-locks compile without thread safe UDF],[
AM_PROG_LEX
AC_PROG_YACC

AX_BOOST_BASE([1.48],, [AC_MSG_ERROR([tests needs Boost, but it was not found in your system])])
AX_BOOST_SYSTEM
AX_BOOST_FILESYSTEM
AX_BOOST_UNIT_TEST_FRAMEWORK
AC_SUBST(BOOST_FILESYSTEM_LIB)
AC_SUBST(BOOST_SYSTEM_LIB)
AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)

# check for special header files
AC_CHECK_HEADERS(fenv.h)

Expand All @@ -139,6 +148,13 @@ AC_REPLACE_FUNCS([trunc round])
AC_LANG_CPLUSPLUS
AC_CHECK_LIB([pcre++], [_init],,AC_MSG_ERROR([pcre++ not installed]))

AX_CHECK_COMPILE_FLAG([-std=c++14], [
check_cpp14="true"
AC_MSG_NOTICE([Compiler with c++14, test are enabled.])
],[AC_MSG_NOTICE([Compiler without c++14, test are disabled.])])

AM_CONDITIONAL([CPP14], [test x$check_cpp14 == xtrue])

AS_IF([test x$check_pthreads == xyes], [
# Check for nonglibc header from serr library. The library is not
# needed just this header.
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: libteng
Section: Seznam
Priority: optional
Maintainer: Seznam.cz a.s. <opensource@firma.seznam.cz>
Build-Depends: debhelper (>= 7.0.50), dh-autoreconf, bison, flex, libpcre++-dev, libpcre++0 | libpcre++0v5, libglib2.0-dev, pkg-config, libcurl-dev
Build-Depends: debhelper (>= 7.0.50), dh-autoreconf, bison, flex, libpcre++-dev, libpcre++0 | libpcre++0v5, libglib2.0-dev, pkg-config, libcurl-dev, libboost-test-dev, libboost-filesystem-dev
Standards-Version: 3.7.2.2
Vcs-Git: git://github.com/seznam/teng.git
Vcs-Browser: https://github.com/seznam/teng
Expand Down
Loading

0 comments on commit fb17997

Please sign in to comment.