generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied patches from Daniel

Browse Source
This commit is contained in:
Tatsuhiro Tsujikawa
2012-04-28 15:36:35 +09:00
committed by Daniel Stenberg
parent b5fdbe848b
commit bb1ce6cc0b
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@@ -2252,10 +2252,14 @@ if test X"$OPT_LIBMETALINK" != Xno; then
fi fi
fi fi
if test "$PKGTEST" = "yes" && test "$PKGCONFIG" != "no"; then if test "$PKGTEST" = "yes" && test "$PKGCONFIG" != "no"; then
addlib=`$PKGCONFIG --libs-only-l libmetalink` addlib=`CURL_EXPORT_PCDIR([$LIBMETALINK_PCDIR]) dnl
addld=`$PKGCONFIG --libs-only-L libmetalink` $PKGCONFIG --libs-only-l libmetalink`
addcflags=`$PKGCONFIG --cflags-only-I libmetalink` addld=`CURL_EXPORT_PCDIR([$LIBMETALINK_PCDIR]) dnl
version=`$PKGCONFIG --modversion libmetalink` $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//'` libmetalinklib=`echo $addld | $SED -e 's/-L//'`
fi fi
if test -n "$addlib"; then if test -n "$addlib"; then

3
src/tool_sdecls.h
View File

@@ -101,10 +101,7 @@ struct getout {
#define GETOUT_USEREMOTE (1<<2) /* use remote file name locally */ #define GETOUT_USEREMOTE (1<<2) /* use remote file name locally */
#define GETOUT_UPLOAD (1<<3) /* if set, -T has been used */ #define GETOUT_UPLOAD (1<<3) /* if set, -T has been used */
#define GETOUT_NOUPLOAD (1<<4) /* 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 */ #define GETOUT_METALINK (1<<5) /* set when Metalink download */
#endif /* HAVE_LIBMETALINK */
/* /*
* 'trace' enumeration represents curl's output look'n feel possibilities. * 'trace' enumeration represents curl's output look'n feel possibilities.