aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml11
-rw-r--r--chapter05/check.xml16
-rw-r--r--general.ent4
3 files changed, 28 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f0db2f8a8..039822810 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
</listitem>
-->
<listitem>
+ <para>2013-11-04</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Disable pkg-config lookups in the
+ Chapter 5 check program that may cause unwanted
+ host system libraries to be linked into check.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2013-10-21</para>
<itemizedlist>
<listitem>
diff --git a/chapter05/check.xml b/chapter05/check.xml
index a805bfab5..ec34ae723 100644
--- a/chapter05/check.xml
+++ b/chapter05/check.xml
@@ -42,7 +42,21 @@
<para>Prepare Check for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
+<screen><userinput remap="configure">PKG_CONFIG= ./configure --prefix=/tools</userinput></screen>
+
+ <variablelist>
+ <title>The meaning of the configure parameter:</title>
+
+ <varlistentry>
+ <term><parameter>PKG_CONFIG=</parameter></term>
+ <listitem>
+ <para>This tells the configure script to ignore any
+ pkg-config options that may cause the system to try to link
+ with libraries not in the <filename class="directory">/tools</filename>
+ directory.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
<para>Build the package:</para>
diff --git a/general.ent b/general.ent
index 23c5ed2bb..aee898d35 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20131021">
-<!ENTITY releasedate "October 21, 2013">
+<!ENTITY version "SVN-20131104">
+<!ENTITY releasedate "November 4, 2013">
<!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.5">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->