Commit 0940559a authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Remove MKL flags from LAPACK configuration if MKL is not detected

parent 2b37ce08

build/configure

+4 −4
Original line number Original line Diff line number Diff line
@@ -25201,7 +25201,7 @@ then : 
        if test "x$result" = "x0"; then

        if test "x$result" = "x0"; then

          # LAPACKe was found

          # LAPACKe was found

          LAPACK_INCLUDE=$(pkg-config --cflags-only-I lapacke${LAPACK_LDSPEC})

          LAPACK_INCLUDE=$(pkg-config --cflags-only-I lapacke${LAPACK_LDSPEC})

          export LAPACKFLAGS="-DUSE_LAPACK -DUSE_MKL ${LAPACK_ILP64_FLAG} ${LAPACK_INCLUDE}"

          export LAPACKFLAGS="-DUSE_LAPACK ${LAPACK_ILP64_FLAG} ${LAPACK_INCLUDE}"

          export LAPACKLDFLAGS=$(pkg-config --libs lapacke${LAPACK_LDSPEC})

          export LAPACKLDFLAGS=$(pkg-config --libs lapacke${LAPACK_LDSPEC})

        fi # end of LAPACKe decision tree

        fi # end of LAPACKe decision tree

        if test "x${LAPACKFLAGS}${LAPACKLDFLAGS}" = "x"; then

        if test "x${LAPACKFLAGS}${LAPACKLDFLAGS}" = "x"; then
@@ -25212,7 +25212,7 @@ then : 
          if test "x$result" = "x0"; then

          if test "x$result" = "x0"; then

            # LAPACK was found

            # LAPACK was found

            LAPACK_INCLUDE=$(pkg-config --cflags-only-I lapack${LAPACK_LDSPEC})

            LAPACK_INCLUDE=$(pkg-config --cflags-only-I lapack${LAPACK_LDSPEC})

            export LAPACKFLAGS="-DUSE_LAPACK -DUSE_MKL ${LAPACK_ILP64_FLAG} ${LAPACK_INCLUDE}"

            export LAPACKFLAGS="-DUSE_LAPACK ${LAPACK_ILP64_FLAG} ${LAPACK_INCLUDE}"

            export LAPACKLDFLAGS=$(pkg-config --libs lapack${LAPACK_LDSPEC})

            export LAPACKLDFLAGS=$(pkg-config --libs lapack${LAPACK_LDSPEC})

          fi # end of LAPACK decision tree

          fi # end of LAPACK decision tree

        fi # end of LAPACKe decision tree

        fi # end of LAPACKe decision tree
@@ -25285,7 +25285,7 @@ else case e in #( 
        if test "x$result" = "x0"; then

        if test "x$result" = "x0"; then

          # LAPACKe was found

          # LAPACKe was found

          LAPACK_INCLUDE=$(pkg-config --cflags-only-I lapacke${LAPACK_LDSPEC})

          LAPACK_INCLUDE=$(pkg-config --cflags-only-I lapacke${LAPACK_LDSPEC})

          export LAPACKFLAGS="-DUSE_LAPACK -DUSE_MKL ${LAPACK_ILP64_FLAG} ${LAPACK_INCLUDE}"

          export LAPACKFLAGS="-DUSE_LAPACK ${LAPACK_ILP64_FLAG} ${LAPACK_INCLUDE}"

          export LAPACKLDFLAGS=$(pkg-config --libs lapacke${LAPACK_LDSPEC})

          export LAPACKLDFLAGS=$(pkg-config --libs lapacke${LAPACK_LDSPEC})

        fi # end of LAPACKe decision tree

        fi # end of LAPACKe decision tree

        if test "x${LAPACKFLAGS}${LAPACKLDFLAGS}" = "x"; then

        if test "x${LAPACKFLAGS}${LAPACKLDFLAGS}" = "x"; then
@@ -25296,7 +25296,7 @@ else case e in #( 
          if test "x$result" = "x0"; then

          if test "x$result" = "x0"; then

            # LAPACK was found

            # LAPACK was found

            LAPACK_INCLUDE=$(pkg-config --cflags-only-I lapack${LAPACK_LDSPEC})

            LAPACK_INCLUDE=$(pkg-config --cflags-only-I lapack${LAPACK_LDSPEC})

            export LAPACKFLAGS="-DUSE_LAPACK -DUSE_MKL ${LAPACK_ILP64_FLAG} ${LAPACK_INCLUDE}"

            export LAPACKFLAGS="-DUSE_LAPACK ${LAPACK_ILP64_FLAG} ${LAPACK_INCLUDE}"

            export LAPACKLDFLAGS=$(pkg-config --libs lapack${LAPACK_LDSPEC})

            export LAPACKLDFLAGS=$(pkg-config --libs lapack${LAPACK_LDSPEC})

          fi # end of LAPACK decision tree

          fi # end of LAPACK decision tree

        fi # end of LAPACKe decision tree

        fi # end of LAPACKe decision tree

build/configure.ac

+2 −2
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ m4_define( 
        if test "x$result" = "x0"; then

        if test "x$result" = "x0"; then

          # LAPACKe was found

          # LAPACKe was found

          LAPACK_INCLUDE=$(pkg-config --cflags-only-I lapacke${LAPACK_LDSPEC})

          LAPACK_INCLUDE=$(pkg-config --cflags-only-I lapacke${LAPACK_LDSPEC})

          export LAPACKFLAGS="-DUSE_LAPACK -DUSE_MKL ${LAPACK_ILP64_FLAG} ${LAPACK_INCLUDE}"

          export LAPACKFLAGS="-DUSE_LAPACK ${LAPACK_ILP64_FLAG} ${LAPACK_INCLUDE}"

          export LAPACKLDFLAGS=$(pkg-config --libs lapacke${LAPACK_LDSPEC})

          export LAPACKLDFLAGS=$(pkg-config --libs lapacke${LAPACK_LDSPEC})

        fi # end of LAPACKe decision tree

        fi # end of LAPACKe decision tree

        if test "x${LAPACKFLAGS}${LAPACKLDFLAGS}" = "x"; then

        if test "x${LAPACKFLAGS}${LAPACKLDFLAGS}" = "x"; then
@@ -124,7 +124,7 @@ m4_define( 
          if test "x$result" = "x0"; then

          if test "x$result" = "x0"; then

            # LAPACK was found

            # LAPACK was found

            LAPACK_INCLUDE=$(pkg-config --cflags-only-I lapack${LAPACK_LDSPEC})

            LAPACK_INCLUDE=$(pkg-config --cflags-only-I lapack${LAPACK_LDSPEC})

            export LAPACKFLAGS="-DUSE_LAPACK -DUSE_MKL ${LAPACK_ILP64_FLAG} ${LAPACK_INCLUDE}"

            export LAPACKFLAGS="-DUSE_LAPACK ${LAPACK_ILP64_FLAG} ${LAPACK_INCLUDE}"

            export LAPACKLDFLAGS=$(pkg-config --libs lapack${LAPACK_LDSPEC})

            export LAPACKLDFLAGS=$(pkg-config --libs lapack${LAPACK_LDSPEC})

          fi # end of LAPACK decision tree

          fi # end of LAPACK decision tree

        fi # end of LAPACKe decision tree

        fi # end of LAPACKe decision tree