Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 83b1e52379e32904a661599634f235dc4078fbf1)
+++ BOOK/introduction/common/changelog.xml	(revision 7ef2c6b00982bdd0d9489079b7d82e090d2a9133)
@@ -38,4 +38,14 @@
 
     <listitem>
+      <para>06 May 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Removed unneeded configure switches specifying
+          GMP/MPFR/MPC/ISL/CLOOG in /tools.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>02 May 2014</para>
       <itemizedlist>
Index: BOOK/temp-system/64/cloog.xml
===================================================================
--- BOOK/temp-system/64/cloog.xml	(revision 83b1e52379e32904a661599634f235dc4078fbf1)
+++ BOOK/temp-system/64/cloog.xml	(revision 7ef2c6b00982bdd0d9489079b7d82e090d2a9133)
@@ -29,5 +29,5 @@
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --enable-shared --with-gmp-prefix=/tools --with-isl-prefix=/tools</userinput></screen>
+    --enable-shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/64/gcc.xml
===================================================================
--- BOOK/temp-system/64/gcc.xml	(revision 83b1e52379e32904a661599634f235dc4078fbf1)
+++ BOOK/temp-system/64/gcc.xml	(revision 7ef2c6b00982bdd0d9489079b7d82e090d2a9133)
@@ -77,8 +77,6 @@
     --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
     --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
-    --with-gmp=/tools --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
-    --with-cloog=/tools --with-system-zlib \
-    --with-native-system-header-dir=/tools/include --enable-checking=release \
-    --enable-libstdcxx-time</userinput></screen>
+    --with-system-zlib --with-native-system-header-dir=/tools/include \
+    --enable-checking=release --enable-libstdcxx-time</userinput></screen>
 
     <variablelist>
Index: BOOK/temp-system/64/isl.xml
===================================================================
--- BOOK/temp-system/64/isl.xml	(revision 83b1e52379e32904a661599634f235dc4078fbf1)
+++ BOOK/temp-system/64/isl.xml	(revision 7ef2c6b00982bdd0d9489079b7d82e090d2a9133)
@@ -29,6 +29,5 @@
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" \
   ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --with-gmp-prefix=/tools</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/common/cloog.xml
===================================================================
--- BOOK/temp-system/common/cloog.xml	(revision 83b1e52379e32904a661599634f235dc4078fbf1)
+++ BOOK/temp-system/common/cloog.xml	(revision 7ef2c6b00982bdd0d9489079b7d82e090d2a9133)
@@ -26,6 +26,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --with-gmp-prefix=/tools --with-isl-prefix=/tools</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/common/gcc.xml
===================================================================
--- BOOK/temp-system/common/gcc.xml	(revision 83b1e52379e32904a661599634f235dc4078fbf1)
+++ BOOK/temp-system/common/gcc.xml	(revision 7ef2c6b00982bdd0d9489079b7d82e090d2a9133)
@@ -75,6 +75,5 @@
   --enable-c99 --enable-shared --enable-threads=posix --disable-multilib \
   --disable-nls --enable-__cxa_atexit --enable-languages=c,c++ \
-  --disable-libstdcxx-pch --with-gmp=/tools --with-mpfr=/tools \
-  --with-mpc=/tools --with-isl=/tools --with-cloog=/tools --with-system-zlib \
+  --disable-libstdcxx-pch --with-system-zlib \
   --with-native-system-header-dir=/tools/include --disable-libssp \
   --enable-checking=release --enable-libstdcxx-time</userinput></screen>
Index: BOOK/temp-system/common/isl.xml
===================================================================
--- BOOK/temp-system/common/isl.xml	(revision 83b1e52379e32904a661599634f235dc4078fbf1)
+++ BOOK/temp-system/common/isl.xml	(revision 7ef2c6b00982bdd0d9489079b7d82e090d2a9133)
@@ -26,6 +26,5 @@
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --with-gmp-prefix=/tools</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml	(revision 83b1e52379e32904a661599634f235dc4078fbf1)
+++ BOOK/temp-system/mips64-64/gcc.xml	(revision 7ef2c6b00982bdd0d9489079b7d82e090d2a9133)
@@ -77,7 +77,6 @@
     --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
     --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
-    --with-gmp=/tools --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
-    --with-cloog=/tools --with-system-zlib --enable-checking=release \
-    --enable-libstdcxx-time --with-native-system-header-dir=/tools/include</userinput></screen>
+    --with-system-zlib --enable-checking=release --enable-libstdcxx-time \
+    --with-native-system-header-dir=/tools/include</userinput></screen>
 
     <variablelist>
Index: BOOK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision 83b1e52379e32904a661599634f235dc4078fbf1)
+++ BOOK/temp-system/mips64/gcc.xml	(revision 7ef2c6b00982bdd0d9489079b7d82e090d2a9133)
@@ -77,6 +77,5 @@
   --enable-c99 --enable-shared --enable-threads=posix \
   --enable-__cxa_atexit --disable-nls --enable-languages=c,c++ \
-  --disable-libstdcxx-pch --with-abi=64 --with-gmp=/tools --with-mpfr=/tools \
-  --with-mpc=/tools --with-isl=/tools --with-cloog=/tools --with-system-zlib \
+  --disable-libstdcxx-pch --with-abi=64 --with-system-zlib \
   --enable-checking=release --enable-libstdcxx-time \
   --with-native-system-header-dir=/tools/include</userinput></screen>
Index: BOOK/temp-system/multilib/cloog.xml
===================================================================
--- BOOK/temp-system/multilib/cloog.xml	(revision 83b1e52379e32904a661599634f235dc4078fbf1)
+++ BOOK/temp-system/multilib/cloog.xml	(revision 7ef2c6b00982bdd0d9489079b7d82e090d2a9133)
@@ -29,5 +29,5 @@
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET}  --libdir=/tools/lib64 \
-     --enable-shared --with-gmp-prefix=/tools --with-isl-prefix=/tools</userinput></screen>
+     --enable-shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/gcc.xml
===================================================================
--- BOOK/temp-system/multilib/gcc.xml	(revision 83b1e52379e32904a661599634f235dc4078fbf1)
+++ BOOK/temp-system/multilib/gcc.xml	(revision 7ef2c6b00982bdd0d9489079b7d82e090d2a9133)
@@ -77,6 +77,5 @@
   --enable-long-long --enable-c99 --enable-shared --enable-threads=posix \
   --disable-nls --enable-__cxa_atexit --enable-languages=c,c++ \
-  --disable-libstdcxx-pch --with-gmp=/tools --with-mpfr=/tools \
-  --with-mpc=/tools --with-isl=/tools --with-cloog=/tools --with-system-zlib \
+  --disable-libstdcxx-pch --with-system-zlib \
   --with-native-system-header-dir=/tools/include --disable-libssp \
   --enable-libstdcxx-time --enable-checking=release</userinput></screen>
Index: BOOK/temp-system/multilib/isl.xml
===================================================================
--- BOOK/temp-system/multilib/isl.xml	(revision 83b1e52379e32904a661599634f235dc4078fbf1)
+++ BOOK/temp-system/multilib/isl.xml	(revision 7ef2c6b00982bdd0d9489079b7d82e090d2a9133)
@@ -30,5 +30,5 @@
   ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --libdir=/tools/lib64 --with-gmp-prefix=/tools</userinput></screen>
+    --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/ppc64-64/gcc.xml
===================================================================
--- BOOK/temp-system/ppc64-64/gcc.xml	(revision 83b1e52379e32904a661599634f235dc4078fbf1)
+++ BOOK/temp-system/ppc64-64/gcc.xml	(revision 7ef2c6b00982bdd0d9489079b7d82e090d2a9133)
@@ -77,8 +77,6 @@
     --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
     --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
-    --with-gmp=/tools --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
-    --with-cloog=/tools --with-system-zlib \
-    --with-native-system-header-dir=/tools/include --enable-checking=release \
-    --enable-libstdcxx-time</userinput></screen>
+    --with-system-zlib --with-native-system-header-dir=/tools/include \
+    --enable-checking=release --enable-libstdcxx-time</userinput></screen>
 
     <variablelist>
