diff options
Diffstat (limited to '')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index abc8015..c2e553d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([lnav],[0.11.2],[lnav@googlegroups.com],[lnav],[http://lnav.org]) +AC_INIT([lnav],[0.12.2],[lnav@googlegroups.com],[lnav],[http://lnav.org]) AC_CONFIG_SRCDIR([src/lnav.cc]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign subdir-objects]) @@ -13,6 +13,8 @@ AX_PTHREAD() LIBS="$PTHREAD_LIBS $LIBS" CFLAGS="$CFLAGS $PTHREAD_CFLAGS" CC="$PTHREAD_CC" +CXX="$PTHREAD_CXX" +CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" AC_LANG(C++) AX_CXX_COMPILE_STDCXX_14([noext], [mandatory]) @@ -27,9 +29,8 @@ AS_CASE([x$srcdir], AC_SUBST(abssrcdir) -AC_PROG_CXX - -CPPFLAGS="$CPPFLAGS -D_ISOC99_SOURCE -D__STDC_LIMIT_MACROS -D_GNU_SOURCE" +CXX=`echo $CXX | sed -e 's/-std=gnu++11//g'` +CPPFLAGS="$CPPFLAGS -D_ISOC99_SOURCE -D__STDC_LIMIT_MACROS -D_GNU_SOURCE -DUSE_OS_TZDB=1 -DHAS_REMOTE_API=0" AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], @@ -49,11 +50,13 @@ AM_PROG_AR AC_PROG_LN_S AC_PROG_MAKE_SET +AC_PATH_PROG(CARGO_CMD, [cargo]) AC_PATH_PROG(BZIP2_CMD, [bzip2]) AC_PATH_PROG(RE2C_CMD, [re2c]) AM_CONDITIONAL(HAVE_RE2C, test x"$RE2C_CMD" != x"") AC_PATH_PROG(XZ_CMD, [xz]) AC_PATH_PROG(TSHARK_CMD, [tshark]) +AC_PATH_PROG(CHECK_JSONSCHEMA, [check-jsonschema]) AC_CHECK_SIZEOF(off_t) AC_CHECK_SIZEOF(size_t) @@ -264,7 +267,7 @@ AC_SUBST(STATIC_LDFLAGS) AS_CASE(["$host_os"], [darwin*], - [], + [LDFLAGS="$LDFLAGS -framework CoreFoundation"], [ curses_lib=$(echo $CURSES_LIB | sed -e 's/-l//') AS_IF([test $? -eq 0], @@ -295,7 +298,7 @@ AS_CASE(["$host_os"], saved_location=$(pwd) cd $srcdir -version=$(expr $(git describe --abbrev=7 --dirty --always --tags 2>/dev/null) : 'v\([[0-9]]*\.[[0-9]]*\.[[0-9]]*.*\)' 2>/dev/null) +version=$(echo $(git describe --abbrev=7 --dirty --always --tags 2>/dev/null) | sed -e 's/^v//' 2>/dev/null) cd $saved_location AS_IF([test $? -eq 0], [version=$(echo $version | tr -d '\n') @@ -304,11 +307,13 @@ AS_IF([test $? -eq 0], [VCS package string])], AC_DEFINE_UNQUOTED([VCS_PACKAGE_STRING], ["$PACKAGE_STRING"], [VCS package string])) +AM_CONDITIONAL(HAVE_CARGO, test x"$CARGO_CMD" != x"") AM_CONDITIONAL(USE_INCLUDED_YAJL, test $HAVE_LOCAL_YAJL -eq 0) AM_CONDITIONAL(HAVE_LIBCURL, test x"$LIBCURL" != x"") -AM_CONDITIONAL([DISABLE_DOCUMENTATION], [ test x"$cross_compiling" != x"no" ]) +AM_CONDITIONAL([CROSS_COMPILING], [ test x"$cross_compiling" != x"no" ]) +AM_CONDITIONAL(HAVE_CHECK_JSONSCHEMA, test x"$CHECK_JSONSCHEMA" != x"") -USER_CXXFLAGS="${CXXFLAGS}" +AS_VAR_SET(USER_CXXFLAGS, ["$CXXFLAGS"]) AC_SUBST(USER_CXXFLAGS) AC_CONFIG_HEADERS([src/config.h]) @@ -325,6 +330,7 @@ AC_CONFIG_FILES([src/tailer/Makefile]) AC_CONFIG_FILES([src/yajl/Makefile]) AC_CONFIG_FILES([src/yajlpp/Makefile]) AC_CONFIG_FILES([src/third-party/base64/lib/Makefile]) +AC_CONFIG_FILES([src/third-party/date/src/Makefile]) AC_CONFIG_FILES([src/third-party/scnlib/src/Makefile]) AC_CONFIG_FILES([test/Makefile]) |