Ticket #8380: 100-cross_compile.2.patch

File 100-cross_compile.2.patch, 4.7 KB (added by Marcos Tadeu <marcos@…>, 6 years ago)
  • configure.ac

    a b if test X"$OPT_SSL" != Xno; then 
    15211521    ]) 
    15221522  fi 
    15231523 
    1524   if test "$OPENSSL_ENABLED" = "1"; then 
    1525     if test -n "$LIB_OPENSSL"; then 
    1526        dnl when the ssl shared libs were found in a path that the run-time 
    1527        dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH 
    1528        dnl to prevent further configure tests to fail due to this 
    1529  
    1530        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" 
    1531        export LD_LIBRARY_PATH 
    1532        AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH]) 
    1533     fi 
    1534     CURL_CHECK_OPENSSL_API 
    1535   fi 
     1524#  if test "$OPENSSL_ENABLED" = "1"; then 
     1525#    if test -n "$LIB_OPENSSL"; then 
     1526#       dnl when the ssl shared libs were found in a path that the run-time 
     1527#       dnl linker doesn't search through, we need to add it to LD_LIBRARY_PATH 
     1528#       dnl to prevent further configure tests to fail due to this 
     1529 
     1530#       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" 
     1531#       export LD_LIBRARY_PATH 
     1532#       AC_MSG_NOTICE([Added $LIB_OPENSSL to LD_LIBRARY_PATH]) 
     1533#    fi 
     1534#    CURL_CHECK_OPENSSL_API 
     1535#  fi 
    15361536 
    15371537fi 
    15381538 
    if test "$OPENSSL_ENABLED" != "1"; then 
    17571757         CPPFLAGS="$CLEANCPPFLAGS" 
    17581758       ]) 
    17591759 
    1760       if test "x$USE_GNUTLS" = "xyes"; then 
    1761         AC_MSG_NOTICE([detected GnuTLS version $version]) 
    1762  
    1763         if test -n "$gtlslib"; then 
    1764           dnl when shared libs were found in a path that the run-time 
    1765           dnl linker doesn't search through, we need to add it to 
    1766           dnl LD_LIBRARY_PATH to prevent further configure tests to fail 
    1767           dnl due to this 
    1768  
    1769           LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" 
    1770           export LD_LIBRARY_PATH 
    1771           AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH]) 
    1772         fi 
    1773       fi 
    1774  
     1760#      if test "x$USE_GNUTLS" = "xyes"; then 
     1761#        AC_MSG_NOTICE([detected GnuTLS version $version]) 
     1762# 
     1763#        if test -n "$gtlslib"; then 
     1764#          dnl when shared libs were found in a path that the run-time 
     1765#          dnl linker doesn't search through, we need to add it to 
     1766#          dnl LD_LIBRARY_PATH to prevent further configure tests to fail 
     1767#          dnl due to this 
     1768# 
     1769#          LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" 
     1770#          export LD_LIBRARY_PATH 
     1771#          AC_MSG_NOTICE([Added $gtlslib to LD_LIBRARY_PATH]) 
     1772#        fi 
     1773#      fi 
     1774# 
    17751775    fi 
    17761776 
    17771777  fi dnl GNUTLS not disabled 
  • configure

    a b rm -f core conftest.err conftest.$ac_obj 
    2063920639  fi 
    2064020640 
    2064120641  if test "$OPENSSL_ENABLED" = "1"; then 
    20642     if test -n "$LIB_OPENSSL"; then 
     20642#    if test -n "$LIB_OPENSSL"; then 
    2064320643 
    20644        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" 
    20645        export LD_LIBRARY_PATH 
    20646        { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5 
    20647 $as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;} 
    20648     fi 
     20644#       LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" 
     20645#       export LD_LIBRARY_PATH 
     20646#       { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5 
     20647#$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;} 
     20648#    fi 
    2064920649 
    2065020650  # 
    2065120651 
    2065220652  # 
    2065320653  tst_api="unknown" 
    2065420654  # 
    20655   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL headers version" >&5 
    20656 $as_echo_n "checking for OpenSSL headers version... " >&6; } 
     20655#  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL headers version" >&5 
     20656#$as_echo_n "checking for OpenSSL headers version... " >&6; } 
    2065720657 
    2065820658      if test -z "$SED"; then 
    2065920659    as_fn_error $? "SED not set. Cannot continue without SED being set." "$LINENO" 5 
    else 
    2173521735fi 
    2173621736 
    2173721737 
    21738       if test "x$USE_GNUTLS" = "xyes"; then 
    21739         { $as_echo "$as_me:${as_lineno-$LINENO}: detected GnuTLS version $version" >&5 
    21740 $as_echo "$as_me: detected GnuTLS version $version" >&6;} 
    21741  
    21742         if test -n "$gtlslib"; then 
    21743  
    21744           LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" 
    21745           export LD_LIBRARY_PATH 
    21746           { $as_echo "$as_me:${as_lineno-$LINENO}: Added $gtlslib to LD_LIBRARY_PATH" >&5 
    21747 $as_echo "$as_me: Added $gtlslib to LD_LIBRARY_PATH" >&6;} 
    21748         fi 
    21749       fi 
    21750  
     21738#      if test "x$USE_GNUTLS" = "xyes"; then 
     21739#        { $as_echo "$as_me:${as_lineno-$LINENO}: detected GnuTLS version $version" >&5 
     21740#$as_echo "$as_me: detected GnuTLS version $version" >&6;} 
     21741# 
     21742#        if test -n "$gtlslib"; then 
     21743# 
     21744#          LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gtlslib" 
     21745#          export LD_LIBRARY_PATH 
     21746#          { $as_echo "$as_me:${as_lineno-$LINENO}: Added $gtlslib to LD_LIBRARY_PATH" >&5 
     21747#$as_echo "$as_me: Added $gtlslib to LD_LIBRARY_PATH" >&6;} 
     21748#        fi 
     21749#      fi 
     21750# 
    2175121751    fi 
    2175221752 
    2175321753  fi