fix pkg-config reporting of private libraries needed for static linking

diff --git a/ares/CHANGES b/ares/CHANGES
index af7e57e620e6070b2e6a62758a1a4fae10b9c1f3..d1f2de8001112887239c5f9137826a4598e4341f 100644 (file)
--- 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 4b2eff97613804c7587f1c56104cda03e70d60ed..bad9445c837d9e911512bb17164005e756b3a4f7 100644 (file)
--- 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 d3304ae016cea999007217094bb1413db1e8c2ed..0cca59e3b9943d495dc7505b14ce07d366ffe64f 100644 (file)
--- 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 82652cab3f9020f65318102a175698f6fbd6371c..df6a0aa2499b6724a85078227ab487ec6b39532d 100644 (file)
--- 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@