From b0fe80896cccf33719f544a23c59b01d67d9639a Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Mon, 11 Jun 2012 18:47:50 +0200 Subject: [PATCH] adjusted bits --- Makefile.in | 2 +- configure | 4 ++-- m4/Makefile.all-in-one-zeromq | 2 +- m4/all-in-one.zeromq | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5b7726ffb1..74eb878bdb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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@ diff --git a/configure b/configure index 58af5dd529..1bf6664025 100755 --- a/configure +++ b/configure @@ -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" diff --git a/m4/Makefile.all-in-one-zeromq b/m4/Makefile.all-in-one-zeromq index 6705b1c96d..fd95e2dee0 100644 --- a/m4/Makefile.all-in-one-zeromq +++ b/m4/Makefile.all-in-one-zeromq @@ -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@ diff --git a/m4/all-in-one.zeromq b/m4/all-in-one.zeromq index 9198102c54..0b26705fdd 100644 --- a/m4/all-in-one.zeromq +++ b/m4/all-in-one.zeromq @@ -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"