Permalink
Browse files

Bug fix for detecting VW_PLATE

Need to depend on protobuf and rabbit mq. Seems no brainer but I guess I forgot it before.
  • Loading branch information...
1 parent fe001d3 commit ebca1671fabbd6c278439005043ce48c41f18068 Zack Moratto committed May 22, 2010
Showing with 4 additions and 4 deletions.
  1. +4 −4 configure.ac
View
@@ -184,6 +184,9 @@ AX_PKG_ONE_OF(LAPACK,
AX_PKG(STANDALONE_FLAPACK, [STANDALONE_FBLAS STANDALONE_F2C], [-llapack], [], [], [], [dgelss_])
AX_GROUP_PKG(STANDALONE_FLAPACK_FBLAS, [STANDALONE_FLAPACK STANDALONE_FBLAS STANDALONE_F2C])])
+AX_PKG(RABBITMQ_C, [], [-lrabbitmq], [stdlib.h stdint.h amqp.h])
+AX_PKG(PROTOBUF, [PTHREADS], [-lprotobuf], [google/protobuf/stubs/common.h])
+
# Vision Workbench Core
AX_PKG(VW_CORE, [BOOST_THREAD BOOST BOOST_PROGRAM_OPTIONS LAPACK], [-lvwCore], [vw/Core/Log.h] )
AX_PKG(VW_MATH, [VW_CORE], [-lvwMath], [vw/Math/LinearAlgebra.h])
@@ -206,7 +209,7 @@ if test x"$HAVE_PKG_VW_CORE" = "xyes"; then
fi
# Vision Workbench Secondaries
-AX_PKG(VW_PLATE, [VW_FILEIO], [-lvwPlate], [vw/Plate/PlateFile.h])
+AX_PKG(VW_PLATE, [VW_FILEIO PROTOBUF RABBITMQ_C], [-lvwPlate], [vw/Plate/PlateFile.h])
AX_PKG(VW_CAMERA, [VW BOOST_IOSTREAMS], [-lvwCamera], [vw/Camera/CAHVModel.h])
AX_PKG(VW_STEREO, [VW_CAMERA], [-lvwStereo], [vw/Stereo/OptimizedCorrelator.h])
AX_PKG(VW_CARTOGRAPHY, [VW_CAMERA], [-lvwCartography], [vw/Cartography/GeoReference.h])
@@ -305,9 +308,6 @@ fi
AX_PKG(ISIS, [ISIS3RDPARTY QT], [-lisis3], [SpecialPixel.h])
-AX_PKG(RABBITMQ_C, [], [-lrabbitmq], [stdlib.h stdint.h amqp.h])
-AX_PKG(PROTOBUF, [PTHREADS], [-lprotobuf], [google/protobuf/stubs/common.h])
-
dnl check for recent rabbitmq; this can go away soon, it's just to prevent a
dnl flag-day upgrade
if test x"$HAVE_PKG_RABBITMQ_C" = "xyes"; then

0 comments on commit ebca167

Please sign in to comment.