[patch] files/configure-ipp7.1.patch

configure-ipp7.1.patch (text/plain), 2.12 KB, created by Jaco Kroon on 2012-10-29 09:12:12 UTC

--- a/configure.ac	2012-10-26 19:49:22.019498524 +0200
+++ b/configure.ac	2012-10-26 19:50:52.565495498 +0200
@@ -265,7 +265,8 @@
         AC_MSG_RESULT([$ipp_ver])
     fi
 
-    if test "$ipp_ver" = "7.x" -a "$ipp_arch" = "em64t"; then
+    ipp_major_ver="`echo "$ipp_ver" | cut -d. -f1`"
+    if test "$ipp_major_ver" = "7" -a "$ipp_arch" = "em64t"; then
         ipp_arch=intel64
     fi
 
@@ -288,7 +289,7 @@
             ;;
         # 32-bit SSE3 removed in 7.0
         t7)
-            if test "$ipp_ver" = "7.x"; then
+            if test "$ipp_major_ver" = "7"; then
                 ipp_core=w7;
                 case "$build_cpu" in
                     i?86)
@@ -305,7 +306,7 @@
             ;;
         # missing staticlib/ include
         g9)
-            if test "$ipp_ver" != "7.x"; then
+            if test "$ipp_major_ver" != "7"; then
                 AC_MSG_ERROR([Use IPP 7.0+ for Sandy Bridge AVX])
             fi
             case "$build_cpu" in
@@ -323,7 +324,7 @@
     esac
 
     IPP_CFLAGS="-I\"$ipp_root/include\" $ipp_cdefs";
-    if test "$ipp_ver" = "7.x"; then
+    if test "$ipp_major_ver" = "7"; then
         IPP_LDFLAGS="-L\"$ipp_root/lib/$ipp_arch\"";
     else
         IPP_LDFLAGS="-L\"$ipp_root/lib\"";
@@ -331,7 +332,7 @@
 
     case "$build_cpu" in
         i?86)
-            if test "$ipp_ver" = "7.x"; then
+            if test "$ipp_major_ver" = "7"; then
                 IPP_CFLAGS="$IPP_CFLAGS -include \"$ipp_root/tools/$ipp_arch/staticlib/ipp_$ipp_core.h\""
                 IPP_LIBS="-lippsc_l -lipps_l -lippcore_l"
              else
@@ -344,7 +345,7 @@
             if test "$ipp_ver" = "5.3"; then
                 IPP_CFLAGS="$IPP_CFLAGS -DIPPCORE_STATIC_INIT"
                 IPP_LIBS="-lippscemergedem64t -lippsremergedem64t -lippsemergedem64t -lippscmergedem64t -lippsrmergedem64t -lippsmergedem64t -lippcoreem64t"
-            elif test "$ipp_ver" = "7.x"; then
+            elif test "$ipp_major_ver" = "7"; then
                 IPP_CFLAGS="$IPP_CFLAGS -include \"$ipp_root/tools/$ipp_arch/staticlib/ipp_$ipp_core64.h\""
                 IPP_LIBS="-lippsc_l -lipps_l -lippcore_l"
             else