diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2014-05-07 21:29:47 +0300 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2014-05-07 22:37:26 +0200 |
| commit | e48a821ed580cd2897b3e1b0bc88ca9245ac234c (patch) | |
| tree | 3e0d69cfae8b5af050d8a6e8cb33b42d8caf61bc | |
| parent | 6404896d8cb100e1fa8ed96166a02fc660b2f1a6 (diff) | |
configure: Don't set LD_LIBRARY_PATH when cross-compiling
Most of LD_LIBRARY_PATH adjustments are already guarded, but not all.
The patch fixes cross-compilation failure when libidn is present.
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index e0f7f739c..5c387ccba 100644 --- a/configure.ac +++ b/configure.ac @@ -2167,10 +2167,11 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then USE_AXTLS="yes" curl_ssl_msg="enabled (axTLS)" - - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_AXTLS" - export LD_LIBRARY_PATH - AC_MSG_NOTICE([Added $LIB_AXTLS to LD_LIBRARY_PATH]) + if test "x$cross_compiling" != "xyes"; then + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_AXTLS" + export LD_LIBRARY_PATH + AC_MSG_NOTICE([Added $LIB_AXTLS to LD_LIBRARY_PATH]) + fi ],[ LDFLAGS="$CLEANLDFLAGS" CPPFLAGS="$CLEANCPPFLAGS" @@ -2702,7 +2703,7 @@ if test "$want_idn" = "yes"; then if test "x$ac_cv_header_tld_h" = "xyes"; then AC_SUBST([IDN_ENABLED], [1]) curl_idn_msg="enabled" - if test -n "$IDN_DIR"; then + if test -n "$IDN_DIR" -a "x$cross_compiling" != "xyes"; then LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$IDN_DIR" export LD_LIBRARY_PATH AC_MSG_NOTICE([Added $IDN_DIR to LD_LIBRARY_PATH]) |