summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-01-12 01:10:19 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-01-12 01:10:19 +0000
commit0e41a031b66832bcadf67476e51309fbfefbc0a4 (patch)
tree2bc7e81ed01719366fc32de2cfab0d875be15efc
parentf310a201109d65e867b2b7499d9ebc8413977a16 (diff)
downloadATCD-0e41a031b66832bcadf67476e51309fbfefbc0a4.tar.gz
ChangeLogTag: Thu Jan 12 01:08:32 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--ChangeLog12
-rw-r--r--ace/ACE.pc.in2
-rw-r--r--ace/SSL/ACE_SSL.pc.in4
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d659cf14799..331075b53ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Jan 12 01:08:32 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * ace/ACE.pc.in:
+
+ Added @LIBS@ to Libs.
+
+ * ace/SSL/ACE_SSL.pc.in:
+
+ Added @ACE_TLS_LDFLAGS@ and @ACE_TLS_LIBS@ to Libs.
+
+ Added @ACE_TLS_CPPFLAGS@ to Cflags.
+
Wed Jan 11 22:17:39 UTC 2006 Steve Huston <shuston@riverace.com>
* protocols/ace/RMCast/Template_Instantiations.cpp: Added missing
diff --git a/ace/ACE.pc.in b/ace/ACE.pc.in
index b5c4d91f3f1..90b2a9eebd7 100644
--- a/ace/ACE.pc.in
+++ b/ace/ACE.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: ACE
Description: ADAPTIVE Communication Environment
Version: @VERSION@
-Libs: -L${libdir} -lACE
+Libs: -L${libdir} -lACE @LIBS@
Cflags: -I${includedir}
diff --git a/ace/SSL/ACE_SSL.pc.in b/ace/SSL/ACE_SSL.pc.in
index 944adafc5e6..51c04a18ff1 100644
--- a/ace/SSL/ACE_SSL.pc.in
+++ b/ace/SSL/ACE_SSL.pc.in
@@ -7,5 +7,5 @@ Name: ACE_SSL
Description: ACE SSL Library
Requires: ACE
Version: @VERSION@
-Libs: -L${libdir} -lACE_SSL
-Cflags: -I${includedir}
+Libs: -L${libdir} @ACE_TLS_LDFLAGS@ -lACE_SSL @ACE_TLS_LIBS@
+Cflags: -I${includedir} @ACE_TLS_CPPFLAGS@