diff options
| author | Patrick Simianer <p@simianer.de> | 2014-07-04 13:32:22 +0200 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2014-07-04 13:32:22 +0200 |
| commit | 49671a7f685eb364f7735f4bbda0c05a2dbfe76c (patch) | |
| tree | ac4a20c1e1112ccf8e2f7b61ea66ca31152ac9c0 /configure.ac | |
| parent | 48027e9eeebda4f8506c00ff259fb3426149f85b (diff) | |
| parent | d124d4aaa78b52b46f7ac8d7306be342d3405124 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6b128768..d7ced0ea 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_CONFIG_MACRO_DIR([m4]) -AC_INIT([cdec],[2014-01-28]) +AC_INIT([cdec],[2014-06-15]) AC_CONFIG_SRCDIR([decoder/cdec.cc]) AM_INIT_AUTOMAKE AC_CONFIG_HEADERS(config.h) @@ -19,6 +19,7 @@ BOOST_REQUIRE([1.44]) BOOST_FILESYSTEM BOOST_PROGRAM_OPTIONS BOOST_SYSTEM +BOOST_REGEX BOOST_SERIALIZATION BOOST_TEST BOOST_THREADS @@ -178,9 +179,9 @@ fi #BOOST_THREADS CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" -LDFLAGS="$LDFLAGS $BOOST_PROGRAM_OPTIONS_LDFLAGS $BOOST_SERIALIZATION_LDFLAGS $BOOST_SYSTEM_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS" +LDFLAGS="$LDFLAGS $BOOST_PROGRAM_OPTIONS_LDFLAGS $BOOST_REGEX_LDFLAGS $BOOST_SERIALIZATION_LDFLAGS $BOOST_SYSTEM_LDFLAGS $BOOST_FILESYSTEM_LDFLAGS" # $BOOST_THREAD_LDFLAGS" -LIBS="$LIBS $BOOST_PROGRAM_OPTIONS_LIBS $BOOST_SERIALIZATION_LIBS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LIBS $ZLIBS" +LIBS="$LIBS $BOOST_PROGRAM_OPTIONS_LIBS $BOOST_REGEX_LIBS $BOOST_SERIALIZATION_LIBS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LIBS $ZLIBS" # $BOOST_THREAD_LIBS" AC_CHECK_HEADER(google/dense_hash_map, |