aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-06-09 01:06:48 +0000
committerYang Tse <yangsita@gmail.com>2008-06-09 01:06:48 +0000
commit6cd007838dcb16573c89a39fadaf56b9a76196b9 (patch)
treef99fd437e952ca17bdab3a3d4a8730ec1f79ec2b
parent72870e2c57bef41bb629e092e6d8eef0361d9ab1 (diff)
fix pkg-config reporting of private libraries needed for static linking
-rw-r--r--ares/CHANGES5
-rw-r--r--ares/RELEASE-NOTES5
-rw-r--r--ares/configure.ac3
-rw-r--r--ares/libcares.pc.in3
4 files changed, 13 insertions, 3 deletions
diff --git a/ares/CHANGES b/ares/CHANGES
index af7e57e62..d1f2de800 100644
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,10 @@
Changelog for the c-ares project
+* Jun 9 2008 (Yang Tse)
+
+- Make libcares.pc generated file for pkg-config include information relative
+ to the libraries needed for the static linking of c-ares.
+
* May 30 2008 (Yang Tse)
- Brad House fixed a missing header file inclusion in adig sample program.
diff --git a/ares/RELEASE-NOTES b/ares/RELEASE-NOTES
index 4b2eff976..bad9445c8 100644
--- a/ares/RELEASE-NOTES
+++ b/ares/RELEASE-NOTES
@@ -1,10 +1,11 @@
This is what's new and changed in the c-ares 1.5.3 release:
- o adig sample application compilation failure on some systems
+ o fix adig sample application compilation failure on some systems
+ o fix pkg-config reporting of private libraries needed for static linking
Thanks go to these friendly people for their efforts and contributions:
- Brad House
+ Brad House, Yang Tse
and obviously Daniel Stenberg
Have fun!
diff --git a/ares/configure.ac b/ares/configure.ac
index d3304ae01..0cca59e3b 100644
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -930,5 +930,8 @@ if test -n "$RANDOM_FILE" && test X"$RANDOM_FILE" != Xno ; then
[a suitable file/device to read random data from])
fi
+CARES_PRIVATE_LIBS="$LIBS"
+AC_SUBST(CARES_PRIVATE_LIBS)
+
AC_CONFIG_FILES([Makefile libcares.pc])
AC_OUTPUT
diff --git a/ares/libcares.pc.in b/ares/libcares.pc.in
index 82652cab3..df6a0aa24 100644
--- a/ares/libcares.pc.in
+++ b/ares/libcares.pc.in
@@ -3,7 +3,7 @@
# / __|____ / _` | '__/ _ \/ __|
# | (_|_____| (_| | | | __/\__ \
# \___| \__,_|_| \___||___/
-# $id: $
+# $Id$
#
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -18,3 +18,4 @@ Requires:
Requires.private:
Cflags: -I${includedir}
Libs: -L${libdir} -lcares
+Libs.private: @CARES_PRIVATE_LIBS@