Commit 8ef8a2b5 authored by Rob Ward's avatar Rob Ward Committed by Daniel Stenberg
Browse files

configure: don't modify LD_LIBRARY_PATH for cross compiles

parent 62d15f15

configure.ac

+30 −25
Original line number Diff line number Diff line
@@ -1548,11 +1548,12 @@ if test X"$OPT_SSL" != Xno; then 
       dnl when the ssl shared libs were found in a path that the run-time

       dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH

       dnl to prevent further configure tests to fail due to this



       if test "x$cross_compiling" != "xyes"; then

         LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL"

         export LD_LIBRARY_PATH

         AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH])

       fi

    fi

    CURL_CHECK_OPENSSL_API

  fi
@@ -1787,12 +1788,13 @@ if test "$OPENSSL_ENABLED" != "1"; then 
          dnl linker doesn't search through, we need to add it to

          dnl LD_LIBRARY_PATH to prevent further configure tests to fail

          dnl due to this



          if test "x$cross_compiling" != "xyes"; then 

            LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib"

            export LD_LIBRARY_PATH

            AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH])

          fi

        fi

      fi



    fi
@@ -1913,12 +1915,12 @@ if test "$OPENSSL_ENABLED" != "1"; then 
        dnl linker doesn't search through, we need to add it to

        dnl LD_LIBRARY_PATH to prevent further configure tests to fail

        dnl due to this



        if test "x$cross_compiling" != "xyes"; then

          LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$polarssllib"

          export LD_LIBRARY_PATH

          AC_MSG_NOTICE([Added $polarssllib to LD_LIBRARY_PATH])

        fi



      fi

    fi



  fi dnl PolarSSL not disabled
@@ -2002,11 +2004,12 @@ if test "$OPENSSL_ENABLED" != "1"; then 
        dnl linker doesn't search through, we need to add it to

        dnl LD_LIBRARY_PATH to prevent further configure tests to fail

        dnl due to this



        if test "x$cross_compiling" != "xyes"; then

          LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$cyassllib"

          export LD_LIBRARY_PATH

          AC_MSG_NOTICE([Added $cyassllib to LD_LIBRARY_PATH])

        fi

      fi



    fi
@@ -2098,11 +2101,12 @@ if test "$OPENSSL_ENABLED" != "1" -a "$GNUTLS_ENABLED" != "1"; then 
        dnl linker doesn't search through, we need to add it to

        dnl LD_LIBRARY_PATH to prevent further configure tests to fail

        dnl due to this



        if test "x$cross_compiling" != "xyes"; then

          LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$nssprefix/lib$libsuff"

          export LD_LIBRARY_PATH

          AC_MSG_NOTICE([Added $nssprefix/lib$libsuff to LD_LIBRARY_PATH])

        fi

      fi



    fi
@@ -2258,11 +2262,12 @@ if test X"$OPT_LIBSSH2" != Xno; then 
       dnl libssh2_session_handshake was added in 1.2.8

       AC_CHECK_FUNCS( libssh2_version libssh2_init libssh2_exit \

                       libssh2_scp_send64 libssh2_session_handshake)



       if test "x$cross_compiling" != "xyes"; then

         LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DIR_SSH2"

         export LD_LIBRARY_PATH

         AC_MSG_NOTICE([Added $DIR_SSH2 to LD_LIBRARY_PATH])

       fi

    fi

  else

    dnl no libssh2, revert back to clean variables

    LDFLAGS=$CLEANLDFLAGS