mirror of https://gitee.com/bigwinds/arangodb
removed external icu, v8, and libev
This commit is contained in:
parent
537e56a5c2
commit
fdc04a5900
|
@ -1,6 +1,8 @@
|
||||||
v2.4.0 (XXXX-XX-XX)
|
v2.4.0 (XXXX-XX-XX)
|
||||||
-------------------
|
-------------------
|
||||||
|
|
||||||
|
* removed enable-all-in-one-v8, enable-all-in-one-icu and enable-all-in-one-libev
|
||||||
|
|
||||||
* AQL: range optimizations for IN and OR
|
* AQL: range optimizations for IN and OR
|
||||||
|
|
||||||
* fixed missing makeDirectory when fetching a Foxx application from a zip file
|
* fixed missing makeDirectory when fetching a Foxx application from a zip file
|
||||||
|
|
|
@ -516,9 +516,7 @@ endif
|
||||||
### @brief libev
|
### @brief libev
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
if ENABLE_ALL_IN_ONE_LIBEV
|
|
||||||
include 3rdParty/Makefile.all-in-one-libev
|
include 3rdParty/Makefile.all-in-one-libev
|
||||||
endif
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
### @brief mruby
|
### @brief mruby
|
||||||
|
@ -532,9 +530,7 @@ endif
|
||||||
### @brief V8
|
### @brief V8
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
if ENABLE_ALL_IN_ONE_V8
|
|
||||||
include 3rdParty/Makefile.all-in-one-v8
|
include 3rdParty/Makefile.all-in-one-v8
|
||||||
endif
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
### @brief zlib
|
### @brief zlib
|
||||||
|
|
149
configure.ac
149
configure.ac
|
@ -70,43 +70,6 @@ dnl ============================================================================
|
||||||
dnl --SECTION-- 3RD-PARTY LIBRARIES
|
dnl --SECTION-- 3RD-PARTY LIBRARIES
|
||||||
dnl ============================================================================
|
dnl ============================================================================
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl LIBEV
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
AC_ARG_ENABLE(all-in-one-libev,
|
|
||||||
AS_HELP_STRING([--enable-all-in-one-libev], [use supplied LIBEV from 3rdParty directory (default: yes)]),
|
|
||||||
[tr_ALL_IN_ONE_LIBEV="${enableval:-yes}"],
|
|
||||||
[tr_ALL_IN_ONE_LIBEV=yes]
|
|
||||||
)
|
|
||||||
|
|
||||||
AM_CONDITIONAL(ENABLE_ALL_IN_ONE_LIBEV, test "x$tr_ALL_IN_ONE_LIBEV" = xyes)
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl V8
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
AC_ARG_ENABLE(all-in-one-v8,
|
|
||||||
AS_HELP_STRING([--enable-all-in-one-v8], [use supplied V8 from 3rdParty directory (default: yes)]),
|
|
||||||
[tr_ALL_IN_ONE_V8="${enableval:-yes}"],
|
|
||||||
[tr_ALL_IN_ONE_V8=yes]
|
|
||||||
)
|
|
||||||
|
|
||||||
AM_CONDITIONAL(ENABLE_ALL_IN_ONE_V8, test "x$tr_ALL_IN_ONE_V8" = xyes)
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl ICU
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
AC_ARG_ENABLE(all-in-one-icu,
|
|
||||||
AS_HELP_STRING([--enable-all-in-one-icu], [use supplied ICU from 3rdParty directory (default: no)]),
|
|
||||||
[tr_ALL_IN_ONE_ICU="${enableval:-yes}"],
|
|
||||||
[tr_ALL_IN_ONE_ICU=yes]
|
|
||||||
)
|
|
||||||
|
|
||||||
AM_CONDITIONAL(ENABLE_ALL_IN_ONE_ICU, test "x$tr_ALL_IN_ONE_ICU" = xyes)
|
|
||||||
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
dnl ----------------------------------------------------------------------------
|
||||||
dnl ETCD
|
dnl ETCD
|
||||||
dnl ----------------------------------------------------------------------------
|
dnl ----------------------------------------------------------------------------
|
||||||
|
@ -212,42 +175,122 @@ dnl ----------------------------------------------------------------------------
|
||||||
|
|
||||||
m4_include([m4/all-in-one.zlib])
|
m4_include([m4/all-in-one.zlib])
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl LIBEV
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
if test "x$tr_ALL_IN_ONE_LIBEV" = xyes; then
|
|
||||||
m4_include([m4/all-in-one.libev])
|
|
||||||
else
|
|
||||||
m4_include([m4/external.libev])
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
dnl ----------------------------------------------------------------------------
|
||||||
dnl MRUBY
|
dnl MRUBY
|
||||||
dnl ----------------------------------------------------------------------------
|
dnl ----------------------------------------------------------------------------
|
||||||
|
|
||||||
m4_include([m4/all-in-one.mruby])
|
m4_include([m4/all-in-one.mruby])
|
||||||
|
|
||||||
|
dnl ----------------------------------------------------------------------------
|
||||||
|
dnl LIBEV
|
||||||
|
dnl ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
LIBEV_VERSION="4.11"
|
||||||
|
|
||||||
|
LIBEV_CPPFLAGS="-I${srcdir}/3rdParty/libev -DTRI_LIBEV_VERSION='\"${LIBEV_VERSION}\"'"
|
||||||
|
LIBEV_CPPFLAGS="${LIBEV_CPPFLAGS}"
|
||||||
|
LIBEV_LDFLAGS=""
|
||||||
|
LIBEV_LIBS="${srcdir}/3rdParty/libev/BUILD/.libs/libev.a"
|
||||||
|
|
||||||
|
AC_SUBST(LIBEV_CPPFLAGS)
|
||||||
|
AC_SUBST(LIBEV_LDFLAGS)
|
||||||
|
AC_SUBST(LIBEV_LIBS)
|
||||||
|
|
||||||
|
LIB_INFO="$LIB_INFO|LIBEV: 3rdParty version"
|
||||||
|
LIB_INFO="$LIB_INFO|LIBEV VERSION: ${LIBEV_VERSION}"
|
||||||
|
|
||||||
|
LIB_INFO="$LIB_INFO|LIBEV_CPPFLAGS: ${LIBEV_CPPFLAGS}"
|
||||||
|
LIB_INFO="$LIB_INFO|LIBEV_LDFLAGS: ${LIBEV_LDFLAGS}"
|
||||||
|
LIB_INFO="$LIB_INFO|LIBEV_LIBS: ${LIBEV_LIBS}"
|
||||||
|
|
||||||
|
LIB_INFO="$LIB_INFO|."
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
dnl ----------------------------------------------------------------------------
|
||||||
dnl V8
|
dnl V8
|
||||||
dnl ----------------------------------------------------------------------------
|
dnl ----------------------------------------------------------------------------
|
||||||
|
|
||||||
if test "x$tr_ALL_IN_ONE_V8" = xyes; then
|
V8_VERSION="3.29.59"
|
||||||
m4_include([m4/all-in-one.v8])
|
V8_CPPFLAGS="-I${srcdir}/3rdParty/V8/include -DTRI_V8_VERSION='\"${V8_VERSION}\"'"
|
||||||
|
V8_LDFLAGS=""
|
||||||
|
V8_TARGET="native"
|
||||||
|
|
||||||
|
v8_lib_dir=""
|
||||||
|
|
||||||
|
if test x$tr_ARM == xyes; then
|
||||||
|
V8_TARGET="arm.release"
|
||||||
|
v8_lib_dir="${srcdir}/3rdParty/V8/out/$V8_TARGET/obj.target/tools/gyp"
|
||||||
|
|
||||||
|
elif test x$tr_DARWIN == xyes; then
|
||||||
|
if test "x$tr_BITS" == x64; then
|
||||||
|
V8_TARGET="x64.release"
|
||||||
|
else
|
||||||
|
V8_TARGET="ia32.release"
|
||||||
|
fi
|
||||||
|
|
||||||
|
v8_lib_dir="${srcdir}/3rdParty/V8/out/$V8_TARGET"
|
||||||
|
|
||||||
else
|
else
|
||||||
m4_include([m4/external.v8])
|
if test "x$tr_BITS" == x64; then
|
||||||
|
V8_TARGET="x64.release"
|
||||||
|
else
|
||||||
|
V8_TARGET="ia32.release"
|
||||||
|
fi
|
||||||
|
|
||||||
|
v8_lib_dir="${srcdir}/3rdParty/V8/out/$V8_TARGET/obj.target/tools/gyp"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
V8_LIBS="${v8_lib_dir}/libv8_base.a ${v8_lib_dir}/libv8_libbase.a ${v8_lib_dir}/libv8_libplatform.a ${v8_lib_dir}/libv8_nosnapshot.a"
|
||||||
|
|
||||||
|
if test "x$tr_FREEBSD" == xyes; then
|
||||||
|
V8_LIBS="$V8_LIBS -lexecinfo"
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(V8_CPPFLAGS)
|
||||||
|
AC_SUBST(V8_LDFLAGS)
|
||||||
|
AC_SUBST(V8_LIBS)
|
||||||
|
AC_SUBST(V8_TARGET)
|
||||||
|
|
||||||
|
LIB_INFO="$LIB_INFO|V8: 3rdParty version"
|
||||||
|
LIB_INFO="$LIB_INFO|V8 VERSION: ${V8_VERSION}"
|
||||||
|
|
||||||
|
LIB_INFO="$LIB_INFO|V8_TARGET: ${V8_TARGET}"
|
||||||
|
|
||||||
|
LIB_INFO="$LIB_INFO|V8_CPPFLAGS: ${V8_CPPFLAGS}"
|
||||||
|
LIB_INFO="$LIB_INFO|V8_LDFLAGS: ${V8_LDFLAGS}"
|
||||||
|
LIB_INFO="$LIB_INFO|V8_LIBS: ${V8_LIBS}"
|
||||||
|
|
||||||
|
LIB_INFO="$LIB_INFO|."
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
dnl ----------------------------------------------------------------------------
|
||||||
dnl ICU
|
dnl ICU
|
||||||
dnl ----------------------------------------------------------------------------
|
dnl ----------------------------------------------------------------------------
|
||||||
|
|
||||||
if test "x$tr_ALL_IN_ONE_ICU" = xyes; then
|
ICU_VERSION="52.2"
|
||||||
m4_include([m4/all-in-one.icu])
|
ICU_CPPFLAGS="-D_REENTRANT -I${srcdir}/3rdParty/V8/third_party/icu/source/common -I${srcdir}/3rdParty/V8/third_party/icu/source/i18n -I${srcdir}/3rdParty/V8/third_party/icu/source/io -DTRI_ICU_VERSION='\"${ICU_VERSION}\"'"
|
||||||
|
ICU_LDFLAGS=""
|
||||||
|
ICU_LIBS="-ldl -lm ${icu_lib_dir}/libicui18n.a ${icu_lib_dir}/libicuuc.a ${icu_lib_dir}/libicudata.a -ldl -lm"
|
||||||
|
|
||||||
|
if test "x$tr_DARWIN" = xyes; then
|
||||||
|
icu_lib_dir="${srcdir}/3rdParty/V8/out/$V8_TARGET"
|
||||||
else
|
else
|
||||||
m4_include([m4/external.icu])
|
icu_lib_dir="${srcdir}/3rdParty/V8/out/$V8_TARGET/obj.target/third_party/icu"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(ICU_CPPFLAGS)
|
||||||
|
AC_SUBST(ICU_LDFLAGS)
|
||||||
|
AC_SUBST(ICU_LIBS)
|
||||||
|
|
||||||
|
ICU_CPPFLAGS="${ICU_CPPFLAGS}"
|
||||||
|
|
||||||
|
LIB_INFO="$LIB_INFO|."
|
||||||
|
LIB_INFO="$LIB_INFO|ICU: 3rdParty version"
|
||||||
|
LIB_INFO="$LIB_INFO|ICU VERSION: ${ICU_VERSION}"
|
||||||
|
|
||||||
|
LIB_INFO="$LIB_INFO|ICU_CPPFLAGS: ${ICU_CPPFLAGS}"
|
||||||
|
LIB_INFO="$LIB_INFO|ICU_LDFLAGS: ${ICU_LDFLAGS}"
|
||||||
|
LIB_INFO="$LIB_INFO|ICU_LIBS: ${ICU_LIBS}"
|
||||||
|
|
||||||
|
LIB_INFO="$LIB_INFO|."
|
||||||
|
|
||||||
dnl ============================================================================
|
dnl ============================================================================
|
||||||
dnl --SECTION-- GENERATE FILES
|
dnl --SECTION-- GENERATE FILES
|
||||||
|
|
|
@ -1,53 +0,0 @@
|
||||||
dnl -*- mode: Autoconf; -*-
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl --SECTION-- LIBEV
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
TRI_LIBEV_VERSION="4.11"
|
|
||||||
|
|
||||||
LIBEV_CPPFLAGS="-I${srcdir}/3rdParty/libev"
|
|
||||||
LIBEV_LDFLAGS=""
|
|
||||||
LIBEV_LIBS="${srcdir}/3rdParty/libev/BUILD/.libs/libev.a"
|
|
||||||
|
|
||||||
CMAKE_LIBEV_INCLUDE="${srcdir}/3rdParty/libev"
|
|
||||||
CMAKE_LIBEV_LIB_PATH="${srcdir}/3rdParty/libev/BUILD/.libs/"
|
|
||||||
CMAKE_LIBEV_LIBS="ev"
|
|
||||||
CMAKE_LIBEV_VERSION="${TRI_LIBEV_VERSION}"
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl add substitutions
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
AC_SUBST(LIBEV_CPPFLAGS)
|
|
||||||
AC_SUBST(LIBEV_LDFLAGS)
|
|
||||||
AC_SUBST(LIBEV_LIBS)
|
|
||||||
|
|
||||||
AC_SUBST(CMAKE_LIBEV_INCLUDE)
|
|
||||||
AC_SUBST(CMAKE_LIBEV_LIB_PATH)
|
|
||||||
AC_SUBST(CMAKE_LIBEV_LIBS)
|
|
||||||
AC_SUBST(CMAKE_LIBEV_VERSION)
|
|
||||||
|
|
||||||
LIBEV_CPPFLAGS="${LIBEV_CPPFLAGS} -DTRI_LIBEV_VERSION='\"${TRI_LIBEV_VERSION}\"'"
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl informational output
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|LIBEV: 3rdParty version"
|
|
||||||
LIB_INFO="$LIB_INFO|LIBEV VERSION: ${TRI_LIBEV_VERSION}"
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|LIBEV_CPPFLAGS: ${LIBEV_CPPFLAGS}"
|
|
||||||
LIB_INFO="$LIB_INFO|LIBEV_LDFLAGS: ${LIBEV_LDFLAGS}"
|
|
||||||
LIB_INFO="$LIB_INFO|LIBEV_LIBS: ${LIBEV_LIBS}"
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|."
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl --SECTION-- END-OF-FILE
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
dnl Local Variables:
|
|
||||||
dnl mode: outline-minor
|
|
||||||
dnl outline-regexp: "^\\(dnl --SECTION--\\)"
|
|
||||||
dnl End:
|
|
|
@ -1,93 +0,0 @@
|
||||||
dnl -*- mode: Autoconf; -*-
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl --SECTION-- V8
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
V8_CPPFLAGS="-I${srcdir}/3rdParty/V8/include"
|
|
||||||
V8_LDFLAGS=""
|
|
||||||
V8_TARGET="native"
|
|
||||||
local_v8=1
|
|
||||||
|
|
||||||
V8_DIR="${srcdir}/3rdParty/V8"
|
|
||||||
AC_ARG_WITH(v8,
|
|
||||||
AS_HELP_STRING([--with-v8=DIR], [where the v8 library and includes are located]),
|
|
||||||
[
|
|
||||||
V8_DIR="$withval"
|
|
||||||
local_v8=0
|
|
||||||
]
|
|
||||||
)
|
|
||||||
V8_OUTPUT=""
|
|
||||||
|
|
||||||
if test x$tr_ARM == xyes; then
|
|
||||||
V8_TARGET="arm.release"
|
|
||||||
V8_OUTPUT=${V8_DIR}/out/$V8_TARGET/obj.target/tools/gyp
|
|
||||||
|
|
||||||
elif test x$tr_DARWIN == xyes; then
|
|
||||||
if test "x$tr_BITS" == x64; then
|
|
||||||
V8_TARGET="x64.release"
|
|
||||||
else
|
|
||||||
V8_TARGET="ia32.release"
|
|
||||||
fi
|
|
||||||
|
|
||||||
V8_OUTPUT=${V8_DIR}/out/$V8_TARGET
|
|
||||||
|
|
||||||
else
|
|
||||||
if test "x$tr_BITS" == x64; then
|
|
||||||
V8_TARGET="x64.release"
|
|
||||||
else
|
|
||||||
V8_TARGET="ia32.release"
|
|
||||||
fi
|
|
||||||
|
|
||||||
V8_OUTPUT=${V8_DIR}/out/$V8_TARGET/obj.target/tools/gyp
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
V8_LIBS="${V8_OUTPUT}/libv8_base.a ${V8_OUTPUT}/libv8_libbase.a ${V8_OUTPUT}/libv8_libplatform.a ${V8_OUTPUT}/libv8_nosnapshot.a"
|
|
||||||
|
|
||||||
TRI_V8_VERSION="3.29.59"
|
|
||||||
|
|
||||||
if test "x$tr_FREEBSD" == xyes; then
|
|
||||||
V8_LIBS="$V8_LIBS -lexecinfo"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test $local_v8 -eq "0"; then
|
|
||||||
touch ${srcdir}/.v8-build-${TRI_BITS}
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl add substitutions
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
AC_SUBST(V8_CPPFLAGS)
|
|
||||||
AC_SUBST(V8_LDFLAGS)
|
|
||||||
AC_SUBST(V8_LIBS)
|
|
||||||
AC_SUBST(V8_TARGET)
|
|
||||||
AC_SUBST(V8_DIR)
|
|
||||||
|
|
||||||
V8_CPPFLAGS="${V8_CPPFLAGS} -DTRI_V8_VERSION='\"${TRI_V8_VERSION}\"'"
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl informational output
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|V8: 3rdParty version"
|
|
||||||
LIB_INFO="$LIB_INFO|V8 VERSION: ${TRI_V8_VERSION}"
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|V8_TARGET: ${V8_TARGET}"
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|V8_CPPFLAGS: ${V8_CPPFLAGS}"
|
|
||||||
LIB_INFO="$LIB_INFO|V8_LDFLAGS: ${V8_LDFLAGS}"
|
|
||||||
LIB_INFO="$LIB_INFO|V8_LIBS: ${V8_LIBS}"
|
|
||||||
|
|
||||||
dnl LIB_INFO="$LIB_INFO|."
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl --SECTION-- END-OF-FILE
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
dnl Local Variables:
|
|
||||||
dnl mode: outline-minor
|
|
||||||
dnl outline-regexp: "^\\(dnl --SECTION--\\)"
|
|
||||||
dnl End:
|
|
|
@ -1,83 +0,0 @@
|
||||||
dnl -*- mode: Autoconf; -*-
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl --SECTION-- ICU
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
AC_LANG(C)
|
|
||||||
|
|
||||||
AC_ARG_WITH(icu-config,
|
|
||||||
AS_HELP_STRING([--with-icu-config=FILE], [where the icu-config program is located]),
|
|
||||||
[ICU_CONFIG="$withval"]
|
|
||||||
)
|
|
||||||
|
|
||||||
AC_MSG_NOTICE([--------------------------------------------------------------------------------])
|
|
||||||
AC_MSG_NOTICE([CHECKING FOR ICU])
|
|
||||||
AC_MSG_NOTICE([--------------------------------------------------------------------------------])
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl checks for the icu-config
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
if test "x$ICU_CONFIG" == "x" ; then
|
|
||||||
ICU_CONFIG="icu-config"
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([for ICU config program "${ICU_CONFIG}"])
|
|
||||||
|
|
||||||
if $ICU_CONFIG --exists > /dev/null 2>&1; then
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
ICU_CPPFLAGS="$($ICU_CONFIG --cppflags)"
|
|
||||||
ICU_LDFLAGS=""
|
|
||||||
ICU_LIBS="$($ICU_CONFIG --ldflags)"
|
|
||||||
AC_MSG_CHECKING([ICU version])
|
|
||||||
TRI_ICU_VERSION="$($ICU_CONFIG --version)"
|
|
||||||
AC_MSG_RESULT([${TRI_ICU_VERSION}])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([error])
|
|
||||||
AC_MSG_ERROR([ICU config program "${ICU_CONFIG}" not found. Use supplied ICU from 3rdParty directory (--enable-all-in-one-icu).])
|
|
||||||
fi
|
|
||||||
|
|
||||||
ICU_CPPFLAGS="${ICU_CPPFLAGS} -DTRI_ICU_VERSION='\"${TRI_ICU_VERSION}\"'"
|
|
||||||
|
|
||||||
CMAKE_ICU_VERSION="${TRI_ICU_VERSION}"
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl add substitutions
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
AC_SUBST(ICU_CPPFLAGS)
|
|
||||||
AC_SUBST(ICU_LDFLAGS)
|
|
||||||
AC_SUBST(ICU_LIBS)
|
|
||||||
|
|
||||||
AC_SUBST(CMAKE_ICU_INCLUDE)
|
|
||||||
AC_SUBST(CMAKE_ICU_LIB_PATH)
|
|
||||||
AC_SUBST(CMAKE_ICU_LIBS)
|
|
||||||
AC_SUBST(CMAKE_ICU_VERSION)
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl informational output
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|."
|
|
||||||
if test "x$tr_ICU" = xyes; then
|
|
||||||
LIB_INFO="$LIB_INFO|ICU: system version"
|
|
||||||
LIB_INFO="$LIB_INFO|ICU VERSION: ${TRI_ICU_VERSION}"
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|ICU_CPPFLAGS: ${ICU_CPPFLAGS}"
|
|
||||||
LIB_INFO="$LIB_INFO|ICU_LDFLAGS: ${ICU_LDFLAGS}"
|
|
||||||
LIB_INFO="$LIB_INFO|ICU_LIBS: ${ICU_LIBS}"
|
|
||||||
else
|
|
||||||
LIB_INFO="$LIB_INFO|ICU: disabled"
|
|
||||||
fi
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|."
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl --SECTION-- END-OF-FILE
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
dnl Local Variables:
|
|
||||||
dnl mode: outline-minor
|
|
||||||
dnl outline-regexp: "^\\(dnl --SECTION--\\)"
|
|
||||||
dnl End:
|
|
|
@ -1,120 +0,0 @@
|
||||||
dnl -*- mode: Autoconf; -*-
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl --SECTION-- LIBEV
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
AC_ARG_WITH(libev,
|
|
||||||
AS_HELP_STRING([--with-libev=DIR], [where the libev library and includes are located]),
|
|
||||||
[LIBEV_CPPFLAGS="-I$withval/include"
|
|
||||||
LIBEV_LDFLAGS="-L$withval/lib"
|
|
||||||
LIBEV="$withval"]
|
|
||||||
)
|
|
||||||
|
|
||||||
AC_ARG_WITH(libev-lib,
|
|
||||||
AS_HELP_STRING([--with-libev-lib=DIR], [where the libev library is located]),
|
|
||||||
[LIBEV_LDFLAGS="-L$withval"]
|
|
||||||
)
|
|
||||||
|
|
||||||
AC_MSG_NOTICE([--------------------------------------------------------------------------------])
|
|
||||||
AC_MSG_NOTICE([CHECKING FOR LIBEV])
|
|
||||||
AC_MSG_NOTICE([--------------------------------------------------------------------------------])
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl checks for the LIBEV library
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
AC_LANG(C)
|
|
||||||
|
|
||||||
if test "x$LIBEV_CPPFLAGS" != x; then
|
|
||||||
TR_INCLUDE([LIBEV_CPPFLAGS])
|
|
||||||
|
|
||||||
LIBEV_CPPFLAGS="$LIBEV_CPPFLAGS -DEV_MINIMAL=0"
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl save flags
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
SAVE_CPPFLAGS="$CPPFLAGS"
|
|
||||||
CPPFLAGS="$CPPFLAGS $LIBEV_CPPFLAGS"
|
|
||||||
|
|
||||||
SAVE_LDFLAGS="$LDFLAGS"
|
|
||||||
LDFLAGS="$LDFLAGS $LIBEV_LDFLAGS"
|
|
||||||
|
|
||||||
SAVE_LIBS="$LIBS"
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl check for header and library
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
tr_LIBEV="yes"
|
|
||||||
|
|
||||||
AC_CHECK_HEADERS(ev.h, [], [tr_LIBEV="no"])
|
|
||||||
|
|
||||||
AC_CHECK_LIB([rt], [clock_gettime], [LIBEV_LIBS="-lrt $LIBEV_LIBS" LIBS="-lrt $LIBS"], [])
|
|
||||||
AC_CHECK_LIB([m], [floor], [LIBEV_LIBS="-lm $LIBEV_LIBS" LIBS="-lm $LIBS"], [])
|
|
||||||
AC_CHECK_LIB([ev], [ev_now], [LIBEV_LIBS="-lev $LIBEV_LIBS" tr_LIBEV="yes"], [tr_LIBEV="no"])
|
|
||||||
|
|
||||||
if test "x$tr_LIBEV" != xyes; then
|
|
||||||
AC_MSG_ERROR([Please install libev from http://software.schmorp.de/pkg/libev.html])
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl add substitutions
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
AC_SUBST(LIBEV_CPPFLAGS)
|
|
||||||
AC_SUBST(LIBEV_LDFLAGS)
|
|
||||||
AC_SUBST(LIBEV_LIBS)
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl grep libev version number
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <ev.h>
|
|
||||||
|
|
||||||
main () {
|
|
||||||
long sdnhg36ed = EV_VERSION_MAJOR EV_VERSION_MINOR ;
|
|
||||||
}
|
|
||||||
|
|
||||||
_ACEOF
|
|
||||||
AC_MSG_CHECKING([LIBEV version])
|
|
||||||
eval "$ac_cpp conftest.$ac_ext" | fgrep "long sdnhg36ed" | awk '{print $4 "." $5}' > conftest.output
|
|
||||||
TRI_LIBEV_VERSION=`cat conftest.output`
|
|
||||||
AC_MSG_RESULT([$TRI_LIBEV_VERSION])
|
|
||||||
rm -f conftest*
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl restore flags
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
LIBS="$SAVE_LIBS"
|
|
||||||
LDFLAGS="$SAVE_LDFLAGS"
|
|
||||||
CPPFLAGS="$SAVE_CPPFLAGS"
|
|
||||||
|
|
||||||
LIBEV_CPPFLAGS="${LIBEV_CPPFLAGS} -DTRI_LIBEV_VERSION='\"${TRI_LIBEV_VERSION}\"'"
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl informational output
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|LIBEV: system version"
|
|
||||||
LIB_INFO="$LIB_INFO|LIBEV VERSION: ${TRI_LIBEV_VERSION}"
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|LIBEV_CPPFLAGS: ${LIBEV_CPPFLAGS}"
|
|
||||||
LIB_INFO="$LIB_INFO|LIBEV_LDFLAGS: ${LIBEV_LDFLAGS}"
|
|
||||||
LIB_INFO="$LIB_INFO|LIBEV_LIBS: ${LIBEV_LIBS}"
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|."
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl --SECTION-- END-OF-FILE
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
dnl Local Variables:
|
|
||||||
dnl mode: outline-minor
|
|
||||||
dnl outline-regexp: "^\\(dnl --SECTION--\\)"
|
|
||||||
dnl End:
|
|
173
m4/external.v8
173
m4/external.v8
|
@ -1,173 +0,0 @@
|
||||||
dnl -*- mode: Autoconf; -*-
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl --SECTION-- V8
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
V8_CPPFLAGS=""
|
|
||||||
V8_LDFLAGS=""
|
|
||||||
V8_LIBS=""
|
|
||||||
|
|
||||||
AC_ARG_WITH(v8,
|
|
||||||
AS_HELP_STRING([--with-v8=DIR], [where the v8 library and includes are located]),
|
|
||||||
[V8_CPPFLAGS="-I$withval/include"
|
|
||||||
V8_LDFLAGS="-L$withval/lib"
|
|
||||||
V8_LIB_PATH="$withval/lib"
|
|
||||||
V8_DIR="$withval"
|
|
||||||
local_v8=0
|
|
||||||
V8="$withval"]
|
|
||||||
)
|
|
||||||
|
|
||||||
AC_ARG_WITH(v8-lib,
|
|
||||||
AS_HELP_STRING([--with-v8-lib=DIR], [where the v8 library is located]),
|
|
||||||
[V8_LDFLAGS="-L$withval"
|
|
||||||
V8_LIB_PATH="$withval"]
|
|
||||||
)
|
|
||||||
|
|
||||||
AC_MSG_NOTICE([--------------------------------------------------------------------------------])
|
|
||||||
AC_MSG_NOTICE([CHECKING FOR GOOGLE V8])
|
|
||||||
AC_MSG_NOTICE([--------------------------------------------------------------------------------])
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl save flags
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
SAVE_CPPFLAGS="$CPPFLAGS"
|
|
||||||
CPPFLAGS="$CPPFLAGS $V8_CPPFLAGS"
|
|
||||||
|
|
||||||
SAVE_LDFLAGS="$LDFLAGS"
|
|
||||||
LDFLAGS="$LDFLAGS $V8_LDFLAGS"
|
|
||||||
|
|
||||||
SAVE_LIBS="$LIBS"
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl checks for the V8 library
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
AC_LANG(C++)
|
|
||||||
|
|
||||||
tr_V8="yes"
|
|
||||||
|
|
||||||
LIBS="$LIBS -lv8_nosnapshot"
|
|
||||||
|
|
||||||
AX_CXX_CHECK_LIB([v8_base], [#include <v8.h>], [v8::V8::GetVersion()], [V8_LIBS="-lv8_base -lv8_nosnapshot"], [tr_V8="no"])
|
|
||||||
|
|
||||||
if test "x$tr_V8" != xyes; then
|
|
||||||
AC_MSG_ERROR([Please install the V8 library from Google])
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$V8_CPPFLAGS" != x; then
|
|
||||||
TR_INCLUDE([V8_CPPFLAGS])
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl add substitutions
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
AC_SUBST(V8_CPPFLAGS)
|
|
||||||
AC_SUBST(V8_LDFLAGS)
|
|
||||||
AC_SUBST(V8_LIBS)
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl save flags
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
LIBS="$LIBS ${V8_LIBS}"
|
|
||||||
LDFLAGS="$LDFLAGS ${V8_LDFLAGS}"
|
|
||||||
CPPFLAGS="$CPPFLAGS ${V8_CPPFLAGS}"
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl grep V8 version number
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
if test "$cross_compiling" = yes; then :
|
|
||||||
TRI_V8_VERSION="V8"
|
|
||||||
AC_MSG_WARN([cannot compute V8 version number when cross compiling])
|
|
||||||
else
|
|
||||||
if test "x`type -t ac_fn_cxx_try_run`" = "xfunction" 2> /dev/null; then
|
|
||||||
|
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <v8.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
int main (int, char**) {
|
|
||||||
printf("%s\n", v8::V8::GetVersion());
|
|
||||||
}
|
|
||||||
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
if test "x$V8_LIB_PATH" != x; then
|
|
||||||
if test "$USE_DYLD" = yes; then
|
|
||||||
save_DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH"
|
|
||||||
DYLD_LIBRARY_PATH="$V8_LIB_PATH:$DYLD_LIBRARY_PATH"
|
|
||||||
else
|
|
||||||
save_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
|
|
||||||
DYLD_LIBRARY_PATH="$V8_LIB_PATH:$LD_LIBRARY_PATH"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([V8 version])
|
|
||||||
|
|
||||||
if ac_fn_cxx_try_run "$LINENO" >conftest.output; then
|
|
||||||
TRI_V8_VERSION=`cat conftest.output`
|
|
||||||
AC_MSG_RESULT([$TRI_V8_VERSION])
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT([failed])
|
|
||||||
AC_MSG_ERROR([Please install the V8 library from Google])
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.beam conftest.$ac_ext conftest.output
|
|
||||||
|
|
||||||
if test "x$V8_LIB_PATH" != x; then
|
|
||||||
if test "$USE_DYLD" = yes; then
|
|
||||||
DYLD_LIBRARY_PATH="$save_DYLD_LIBRARY_PATH"
|
|
||||||
else
|
|
||||||
LD_LIBRARY_PATH="$save_LD_LIBRARY_PATH"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
TRI_V8_VERSION="V8"
|
|
||||||
AC_MSG_WARN([cannot compute V8 version number, old autoconf version])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$TRI_V8_VERSION" != "xV8"; then
|
|
||||||
[tr_v8_version=`echo "$TRI_V8_VERSION" | awk -F. '{print $1 * 10000 + $2 * 100 + $3}'`]
|
|
||||||
|
|
||||||
if test "$tr_v8_version" -lt 31600; then
|
|
||||||
AC_MSG_ERROR([V8 version found is too low: $TRI_V8_VERSION. Please install V8 with version 3.16.0 or higher or use the option --enable-all-in-one-v8.])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl restore flags
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
LIBS="$SAVE_LIBS"
|
|
||||||
LDFLAGS="$SAVE_LDFLAGS"
|
|
||||||
CPPFLAGS="$SAVE_CPPFLAGS"
|
|
||||||
|
|
||||||
V8_CPPFLAGS="${V8_CPPFLAGS} -DTRI_V8_VERSION='\"${TRI_V8_VERSION}\"'"
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl informational output
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|V8: system version"
|
|
||||||
LIB_INFO="$LIB_INFO|V8 VERSION: ${TRI_V8_VERSION}"
|
|
||||||
|
|
||||||
LIB_INFO="$LIB_INFO|V8_CPPFLAGS: ${V8_CPPFLAGS}"
|
|
||||||
LIB_INFO="$LIB_INFO|V8_LDFLAGS: ${V8_LDFLAGS}"
|
|
||||||
LIB_INFO="$LIB_INFO|V8_LIBS: ${V8_LIBS}"
|
|
||||||
|
|
||||||
dnl LIB_INFO="$LIB_INFO|."
|
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
dnl --SECTION-- END-OF-FILE
|
|
||||||
dnl ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
dnl Local Variables:
|
|
||||||
dnl mode: outline-minor
|
|
||||||
dnl outline-regexp: "^\\(dnl --SECTION--\\)"
|
|
||||||
dnl End:
|
|
Loading…
Reference in New Issue