[GRASS-SVN] r55961 - grass/trunk

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-04-23 19:34:57 -0700 (Tue, 23 Apr 2013)
New Revision: 55961

Modified:
   grass/trunk/configure
   grass/trunk/configure.in
Log:
the first arg of LOC_CHECK_LIB_PATH() needs to match the --with-xx-libs= line (#1943)

Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure	2013-04-23 23:29:57 UTC (rev 55960)
+++ grass/trunk/configure	2013-04-24 02:34:57 UTC (rev 55961)
@@ -13126,15 +13126,15 @@
 
 echo $ac_n "checking for location of OpenCL library""... $ac_c" 1>&6
 echo "configure:13129: checking for location of OpenCL library" >&5
-case "$with_OpenCL_libs" in
+case "$with_opencl_libs" in
 y | ye | yes | n | no)
-	{ echo "configure: error: *** You must supply a directory to --with-OpenCL-libs." 1>&2; exit 1; }
+	{ echo "configure: error: *** You must supply a directory to --with-opencl-libs." 1>&2; exit 1; }
 	;;
 esac
-echo "$ac_t""$with_OpenCL_libs" 1>&6
+echo "$ac_t""$with_opencl_libs" 1>&6
 
-if test -n "$with_OpenCL_libs"; then
-    for dir in $with_OpenCL_libs; do
+if test -n "$with_opencl_libs"; then
+    for dir in $with_opencl_libs; do
         if test -d "$dir"; then
             OCLLIBPATH="$OCLLIBPATH -L$dir"
         else

Modified: grass/trunk/configure.in
===================================================================
--- grass/trunk/configure.in	2013-04-23 23:29:57 UTC (rev 55960)
+++ grass/trunk/configure.in	2013-04-24 02:34:57 UTC (rev 55961)
@@ -1774,7 +1774,7 @@
 
 # With OpenCL library directory
 
-LOC_CHECK_LIB_PATH(OpenCL,OpenCL,OCLLIBPATH)
+LOC_CHECK_LIB_PATH(opencl,OpenCL,OCLLIBPATH)
 # FIXME: -L${OCLLIBPATH} is not being added to the gcc conftest.c command. why not? (trac #1943?)
 LOC_CHECK_LIBS(OpenCL,clGetPlatformInfo,OpenCL,$OCLLIBPATH,OCLLIB,,,)