Permalink
Browse files

Have ASP pull protoc like we do in VW

This is so ASP won't pull protoc from $PATH ... allowing the user to
select a protobuf library that is not the system's.
  • Loading branch information...
1 parent 9a734a5 commit 66c8ad22d3d6370a1517477844609917ced1b001 Zachary Moratto committed Nov 2, 2011
Showing with 4 additions and 0 deletions.
  1. +4 −0 configure.ac
View
@@ -193,6 +193,10 @@ AX_PKG_ONE_OF(LAPACK,
AX_PKG(RABBITMQ_C, [], [-lrabbitmq], [stdlib.h stdint.h amqp.h])
AX_PKG(ZEROMQ, [], [-lzmq], [zmq.hpp])
AX_PKG(PROTOBUF, [PTHREADS], [-lprotobuf], [google/protobuf/stubs/common.h])
+AC_PATH_TOOL( PROTOC, [protoc], [no], [$PKG_PATHS_PROTOBUF/bin$PATH_SEPARATOR$PATH])
+if test x"$PROTOC" = "xno" && test x"$HAVE_PKG_PROTOBUF" = "xyes"; then
+ AC_MSG_ERROR([cannot find protoc used by protobuf])
+fi
# Vision Workbench Core
AX_PKG(VW_CORE, [BOOST_THREAD BOOST BOOST_PROGRAM_OPTIONS LAPACK], [-lvwCore], [vw/Core/Log.h] )

0 comments on commit 66c8ad2

Please sign in to comment.