瀏覽代碼

the first arg of LOC_CHECK_LIB_PATH() needs to match the --with-xx-libs= line (https://trac.osgeo.org/grass/ticket/1943)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@55961 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 12 年之前
父節點
當前提交
354147d4c9
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 5 5
      configure
  2. 1 1
      configure.in

+ 5 - 5
configure

@@ -13126,15 +13126,15 @@ fi
 
 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

+ 1 - 1
configure.in

@@ -1774,7 +1774,7 @@ fi
 
 # 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,,,)