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

adjusted bits

This commit is contained in:
Frank Celler 2012-06-11 18:47:50 +02:00
parent 42a58a7efe
commit b0fe80896c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -5140,7 +5140,7 @@ js/server/js-%.h: @srcdir@/js/server/%.js .setup-js-directories
@ENABLE_ZEROMQ_TRUE@ @echo "--------------------------------------------------------------------------------"
@ENABLE_ZEROMQ_TRUE@ @echo
@ENABLE_ZEROMQ_TRUE@ cd @top_srcdir@/3rdParty/zeromq-2.2.0 && ./configure --disable-shared --prefix=@abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD
@ENABLE_ZEROMQ_TRUE@ cd @top_srcdir@/3rdParty/zeromq-2.2.0 && ./configure --disable-shared --prefix=@abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD --libdir=@abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD/lib@TRI_BITS@
@ENABLE_ZEROMQ_TRUE@ cd @top_srcdir@/3rdParty/zeromq-2.2.0 && $(MAKE) install
@ENABLE_ZEROMQ_TRUE@ touch .zeromq-build-@TRI_BITS@

4
configure vendored
View File

@ -9145,9 +9145,9 @@ fi
if test "x$tr_ZEROMQ" = "xyes"; then
ZEROMQ_CPPFLAGS="-I${srcdir}/3rdParty/zeromq-2.2.0/include"
ZEROMQ_CPPFLAGS="-I${srcdir}/3rdParty/zeromq-2.2.0/BUILD/include"
ZEROMQ_LDFLAGS=""
ZEROMQ_LIBS="${srcdir}/3rdParty/zeromq-2.2.0/BUILD/lib/libzeromq.a"
ZEROMQ_LIBS="${srcdir}/3rdParty/zeromq-2.2.0/BUILD/lib${tr_BITS}/libzeromq.a"
TRI_ZEROMQ_VERSION="2.2.0"

2
m4/Makefile.all-in-one-zeromq
View File

@ -19,7 +19,7 @@ BUILT_SOURCES += @ZEROMQ_LIBS@
@echo "--------------------------------------------------------------------------------"
@echo
cd @top_srcdir@/3rdParty/zeromq-2.2.0 && ./configure --disable-shared --prefix=@abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD
cd @top_srcdir@/3rdParty/zeromq-2.2.0 && ./configure --disable-shared --prefix=@abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD --libdir=@abs_top_srcdir@/3rdParty/zeromq-2.2.0/BUILD/lib@TRI_BITS@
cd @top_srcdir@/3rdParty/zeromq-2.2.0 && $(MAKE) install
touch .zeromq-build-@TRI_BITS@

4
m4/all-in-one.zeromq
View File

@ -11,9 +11,9 @@ AC_ARG_ENABLE(zeromq,
)
if test "x$tr_ZEROMQ" = "xyes"; then
ZEROMQ_CPPFLAGS="-I${srcdir}/3rdParty/zeromq-2.2.0/include"
ZEROMQ_CPPFLAGS="-I${srcdir}/3rdParty/zeromq-2.2.0/BUILD/include"
ZEROMQ_LDFLAGS=""
ZEROMQ_LIBS="${srcdir}/3rdParty/zeromq-2.2.0/BUILD/lib/libzeromq.a"
ZEROMQ_LIBS="${srcdir}/3rdParty/zeromq-2.2.0/BUILD/lib${tr_BITS}/libzeromq.a"
TRI_ZEROMQ_VERSION="2.2.0"