Fix OpenCV tests on Unix

git-svn-id: https://valelab.ucsf.edu/svn/micromanager2/trunk@8113 d0ab736e-dc22-4aeb-8dc9-08def0aa14fd
mahogny · Nov 14, 2011 · 69917f9 · 69917f9
1 parent 8f28bac
commit 69917f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/DeviceAdapters/configure.in b/DeviceAdapters/configure.in
@@ -212,7 +212,7 @@ fi
 
 # OpenCV
 AX_OPENCV
-AM_CONDITIONAL([BUILD_OPENCV],[test -n OPENCV_LDFLAGS])
+AM_CONDITIONAL(BUILD_OPENCV,test x$hasopencv = xtrue)
 
 # Only build ... when the code is there
 AM_CONDITIONAL([BUILD_TEST],[test -f "Test/Test.h"])
@@ -274,7 +274,6 @@ AC_MSG_CHECKING(library prefix)
 AC_MSG_RESULT($MMPREFIX)
 AC_SUBST(MMPREFIX)
 
-
 # Checks for library functions.
 AC_HEADER_STDC
 AC_CHECK_FUNCS([memset])

diff --git a/m4/ax_opencv.m4 b/m4/ax_opencv.m4
@@ -45,6 +45,7 @@ if test "x$want_opencv" = "xyes"; then
        done
    fi
    if test "$succeeded" = "yes"; then
+      hasopencv=true
       AC_MSG_RESULT(yes)
       OPENCV_LDFLAGS="$OPENCV_LDFLAGS -lopencv_video -lopencv_core -lopencv_highgui"
       AC_SUBST(OPENCV_CPPFLAGS)