From c350d43a4dc6c1a35be23ff9d91da11617c20fcc Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Tue, 21 Oct 2008 05:31:18 +0000
Subject: [PATCH] Fixed grep's -i feature.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8688 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  5 +++++
 chapter05/grep.xml      | 13 +++++++++++--
 chapter06/grep.xml      | 18 +++++++++++++++++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2a09590fa..2a6a26461 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,11 @@
     <listitem>
       <para>2008-10-21</para>
       <itemizedlist>
+        <listitem>
+          <para>[dj] - Added '--without-included-regex' to grep instrcutions
+          in order to force the use of glibc's regex library.  This fixes the
+          -i switch for grep.</para>
+        </listitem>
         <listitem>
           <para>[dj] - Reintroduced the command to supress installation of the
           vi_VN.TCVN locale as bash is still broken with it.</para>
diff --git a/chapter05/grep.xml b/chapter05/grep.xml
index 46e3b1c42..de2600a26 100644
--- a/chapter05/grep.xml
+++ b/chapter05/grep.xml
@@ -46,10 +46,11 @@
     <para>Prepare Grep for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools \
-    --disable-perl-regexp</userinput></screen>
+    --disable-perl-regexp \
+    --without-included-regex</userinput></screen>
 
     <variablelist>
-      <title>The meaning of the configure option:</title>
+      <title>The meaning of the configure switches:</title>
 
       <varlistentry>
         <term><parameter>--disable-perl-regexp</parameter></term>
@@ -61,6 +62,14 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--without-included-regex</parameter></term>
+        <listitem>
+          <para>The configure check for glibc's regex library is broken when
+          building against glibc-2.8.  This switch forces the use of glibc's
+          regex library.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
     <para>Compile the package:</para>
diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index 22d65df95..4e9127b02 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -55,7 +55,23 @@
 
     <para>Prepare Grep for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr \
+    --bindir=/bin \
+    --without-included-regex</userinput></screen>
+
+
+    <variablelist>
+      <title>The meaning of the configure switch:</title>
+      <varlistentry>
+        <term><parameter>--without-included-regex</parameter></term>
+        <listitem>
+          <para>The configure check for glibc's regex library is broken when
+          building against glibc-2.8.  This switch forces the use of glibc's
+          regex library.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
 
     <para>Compile the package:</para>