Commit faaaf626 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Added the --static-libs option to curl-config

parent 43885493

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 


                                  Changelog



Dan F (25 October 2007)

- Added the --static-libs option to curl-config



Daniel S (25 October 2007)

- Made libcurl built with NSS possible to ignore the peer verification.

  Previously it would fail if the ca bundle wasn't present, even if the code

RELEASE-NOTES

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ This release includes the following changes: 
 o added CURLOPT_OPENSOCKETFUNCTION and CURLOPT_OPENSOCKETDATA

 o CULROPT_COOKIELIST supports "FLUSH"

 o added CURLOPT_COPYPOSTFIELDS

 o added --static-libs to curl-config



This release includes the following bugfixes:

configure.ac

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ AC_SUBST(AR) 
if test "x$AR" = "xar-was-not-found-by-configure"; then

  AC_MSG_WARN([ar was not found, this may ruin your chances to build fine])

fi

AC_SUBST(libext)



dnl figure out the libcurl version

VERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curlver.h`

curl-config.in

+6 −1
Original line number Diff line number Diff line
@@ -41,10 +41,11 @@ Available values for OPTION include: 
  --cflags    pre-processor and compiler flags

  --checkfor [version] check for (lib)curl of the specified version

  --features  newline separated list of enabled features

  --protocols newline separated list of enabled protocols

  --help      display this help and exit

  --libs      library linking information

  --prefix    curl install prefix

  --protocols newline separated list of enabled protocols

  --static-libs static libcurl library linking information

  --version   output version information

  --vernum    output the version information as a number (hexadecimal)

EOF
@@ -200,6 +201,10 @@ while test $# -gt 0; do 
	fi

	;;



    --static-libs)

	echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@

	;;



    *)

        echo "unknown option: $1"

	usage 1

docs/curl-config.1

+4 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
.\" * $Id$

.\" **************************************************************************

.\"

.TH curl-config 1 "25 Jan 2004" "Curl 7.15.4" "curl-config manual"

.TH curl-config 1 "25 Oct 2007" "Curl 7.17.1" "curl-config manual"

.SH NAME

curl-config \- Get information about a libcurl installation

.SH SYNOPSIS
@@ -62,6 +62,9 @@ the time of writing, this list may include HTTP, HTTPS, FTP, FTPS, FILE, 
TELNET, LDAP, DICT. Do not assume any particular order. The protocols will

be listed using uppercase and are separated by newlines. There may be none,

one or several protocols in the list. (Added in 7.13.0)

.IP "--static-libs"

Shows the complete set of libs and other linker options you will need in order

to link your application with libcurl statically.

.IP "--version"

Outputs version information about the installed libcurl.

.IP "--vernum"