Commit 8fb777a2dd2d1069d5be6f8d431c5687ae2c75d0

Con Kolivas 2012-10-17T23:14:39

Cope with both ATI stream and AMD APP SDK roots being set when building.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
diff --git a/configure.ac b/configure.ac
index 769e7bd..8010e11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,7 +114,9 @@ fi
 if test "x$ATISTREAMSDKROOT" != x; then
 	OPENCL_FLAGS="-I$ATISTREAMSDKROOT/include $OPENCL_FLAGS"
 	OPENCL_LIBS="-L$ATISTREAMSDKROOT/lib/$ARCH_DIR $OPENCL_LIBS"
-elif test "x$AMDAPPSDKROOT" != x; then
+fi
+
+if test "x$AMDAPPSDKROOT" != x; then
 	OPENCL_FLAGS="-I$AMDAPPSDKROOT/include $OPENCL_FLAGS"
 	OPENCL_LIBS="-L$AMDAPPSDKROOT/lib/$ARCH_DIR $OPENCL_LIBS"
 fi