diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-04-28 15:36:35 +0900 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-05-26 23:07:53 +0200 |
| commit | bb1ce6cc0b65e04e0698896dbe0efac7959d18de (patch) | |
| tree | ecb298b5cecde588ea58f02f44b207d9aca4c86c | |
| parent | b5fdbe848bc3d088445817aa890d3f2f74ac5b02 (diff) | |
Applied patches from Daniel
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/tool_sdecls.h | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 395abaeab..9955c2731 100644 --- a/configure.ac +++ b/configure.ac @@ -2252,10 +2252,14 @@ if test X"$OPT_LIBMETALINK" != Xno; then fi fi if test "$PKGTEST" = "yes" && test "$PKGCONFIG" != "no"; then - addlib=`$PKGCONFIG --libs-only-l libmetalink` - addld=`$PKGCONFIG --libs-only-L libmetalink` - addcflags=`$PKGCONFIG --cflags-only-I libmetalink` - version=`$PKGCONFIG --modversion libmetalink` + addlib=`CURL_EXPORT_PCDIR([$LIBMETALINK_PCDIR]) dnl + $PKGCONFIG --libs-only-l libmetalink` + addld=`CURL_EXPORT_PCDIR([$LIBMETALINK_PCDIR]) dnl + $PKGCONFIG --libs-only-L libmetalink` + addcflags=`CURL_EXPORT_PCDIR([$LIBMETALINK_PCDIR]) dnl + $PKGCONFIG --cflags-only-I libmetalink` + version=`CURL_EXPORT_PCDIR([$LIBMETALINK_PCDIR]) dnl + $PKGCONFIG --modversion libmetalink` libmetalinklib=`echo $addld | $SED -e 's/-L//'` fi if test -n "$addlib"; then diff --git a/src/tool_sdecls.h b/src/tool_sdecls.h index d0b9cc27f..b0d2afdc1 100644 --- a/src/tool_sdecls.h +++ b/src/tool_sdecls.h @@ -101,10 +101,7 @@ struct getout { #define GETOUT_USEREMOTE (1<<2) /* use remote file name locally */ #define GETOUT_UPLOAD (1<<3) /* if set, -T has been used */ #define GETOUT_NOUPLOAD (1<<4) /* if set, -T "" has been used */ -#ifdef HAVE_LIBMETALINK #define GETOUT_METALINK (1<<5) /* set when Metalink download */ -#endif /* HAVE_LIBMETALINK */ - /* * 'trace' enumeration represents curl's output look'n feel possibilities. |