summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--RELEASE-NOTES1
-rw-r--r--configure.ac6
-rw-r--r--curl-config.in5
-rw-r--r--docs/curl-config.12
5 files changed, 17 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 44d761861..e56154cb4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
Changelog
+Claes Jakobsson (14 Nov 2009)
+- curl-config now accepts '--configure' to see what arguments was
+ passed to the configure script when building curl.
Daniel Stenberg (14 Nov 2009)
- Claes Jakobsson restored the configure functionality to detect NSS when
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4165591b5..851e68cc4 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -10,6 +10,7 @@ Curl and libcurl 7.19.8
This release includes the following changes:
o support SSL_FILETYPE_ENGINE for client certificate
+ o curl-config can now show the arguments used when building curl
This release includes the following bugfixes:
diff --git a/configure.ac b/configure.ac
index bc7e0e4bd..b23bc78a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,12 @@ CURL_CHECK_OPTION_CURLDEBUG
CURL_CHECK_PATH_SEPARATOR_REQUIRED
+#
+# save the configure arguments
+#
+CONFIGURE_OPTIONS="\"$ac_configure_args\""
+AC_SUBST(CONFIGURE_OPTIONS)
+
dnl SED is mandatory for configure process and libtool.
dnl Set it now, allowing it to be changed later.
AC_PATH_PROG([SED], [sed], [not_found],
diff --git a/curl-config.in b/curl-config.in
index cbe316e56..177b6354d 100644
--- a/curl-config.in
+++ b/curl-config.in
@@ -37,6 +37,7 @@ Available values for OPTION include:
--cc compiler
--cflags pre-processor and compiler flags
--checkfor [version] check for (lib)curl of the specified version
+ --configure the arguments given to configure when building curl
--features newline separated list of enabled features
--help display this help and exit
--libs library linking information
@@ -146,6 +147,10 @@ while test $# -gt 0; do
echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
;;
+ --configure)
+ echo @CONFIGURE_OPTIONS@
+ ;;
+
*)
echo "unknown option: $1"
usage 1
diff --git a/docs/curl-config.1 b/docs/curl-config.1
index a116e6ea4..b3bd3832b 100644
--- a/docs/curl-config.1
+++ b/docs/curl-config.1
@@ -42,6 +42,8 @@ Specify the oldest possible libcurl version string you want, and this
script will return 0 if the current installation is new enough or it
returns 1 and outputs a text saying that the current version is not new
enough. (Added in 7.15.4)
+.IP "--configure"
+Displays the arguments given to configure when building curl.
.IP "--feature"
Lists what particular main features the installed libcurl was built with. At
the time of writing, this list may include SSL, KRB4 or IPv6. Do not assume