Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

issue #241

This commit is contained in:
Jan Steemann 2012-10-15 10:14:06 +02:00
parent 589a712739
commit db7d1ec6be
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdParty/Makefile.all-in-one-icu vendored
View File

@ -8,7 +8,7 @@
### @brief ICU ### @brief ICU
################################################################################ ################################################################################
BUILT_SOURCES += @ICU_LIBS@ BUILT_SOURCES += @ICU_BUILT@
ICUDIR = @abs_top_srcdir@/3rdParty/icu/BUILD ICUDIR = @abs_top_srcdir@/3rdParty/icu/BUILD
CLEANUP += @srcdir@/.icu-build-@TRI_BITS@ $(ICUDIR) CLEANUP += @srcdir@/.icu-build-@TRI_BITS@ $(ICUDIR)

4
Makefile.files
View File

@ -37,12 +37,16 @@ BUILT_SOURCES += $(JAVASCRIPT_BROWSER)
### @brief MRuby source code as header ### @brief MRuby source code as header
################################################################################ ################################################################################
if ENABLE_MRUBY
MRUBY_HEADER = \ MRUBY_HEADER = \
mr/common/bootstrap/mr-error.h \ mr/common/bootstrap/mr-error.h \
mr/server/mr-server.h mr/server/mr-server.h
BUILT_SOURCES += $(MRUBY_HEADER) BUILT_SOURCES += $(MRUBY_HEADER)
endif
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------
## --SECTION-- END-OF-FILE ## --SECTION-- END-OF-FILE
## ----------------------------------------------------------------------------- ## -----------------------------------------------------------------------------

2
m4/all-in-one.icu
View File

@ -13,6 +13,7 @@ dnl --- ICU_LIBS was: " -lpthread -ldl -lm ${icu_lib_dir}/libicui18n.a ${icu_lib
ICU_CPPFLAGS="-D_REENTRANT -I${icu_build_dir}/include" ICU_CPPFLAGS="-D_REENTRANT -I${icu_build_dir}/include"
ICU_LDFLAGS="" ICU_LDFLAGS=""
ICU_LIBS=" -ldl -lm ${icu_lib_dir}/libicui18n.a ${icu_lib_dir}/libicuuc.a ${icu_lib_dir}/libicudata.a -ldl -lm " ICU_LIBS=" -ldl -lm ${icu_lib_dir}/libicui18n.a ${icu_lib_dir}/libicuuc.a ${icu_lib_dir}/libicudata.a -ldl -lm "
ICU_BUILT="${icu_lib_dir}/libicui18n.a ${icu_lib_dir}/libicuuc.a ${icu_lib_dir}/libicudata.a "
TRI_ICU_VERSION="49.1.2" TRI_ICU_VERSION="49.1.2"
@ -23,6 +24,7 @@ dnl ----------------------------------------------------------------------------
AC_SUBST(ICU_CPPFLAGS) AC_SUBST(ICU_CPPFLAGS)
AC_SUBST(ICU_LDFLAGS) AC_SUBST(ICU_LDFLAGS)
AC_SUBST(ICU_LIBS) AC_SUBST(ICU_LIBS)
AC_SUBST(ICU_BUILT)
ICU_CPPFLAGS="${ICU_CPPFLAGS} -DTRI_ICU_VERSION='\"${TRI_ICU_VERSION}\"' -DTRI_HAVE_ICU=1" ICU_CPPFLAGS="${ICU_CPPFLAGS} -DTRI_ICU_VERSION='\"${TRI_ICU_VERSION}\"' -DTRI_HAVE_ICU=1"