configure.ac: Don't bootstrap libmpx unless --with-build-config includes bootstrap...

	* configure.ac: Don't bootstrap libmpx unless --with-build-config
	includes bootstrap-mpx.
	* configure: Regenerated.

From-SVN: r243849

diff --git a/ChangeLog b/ChangeLog
index c97158a96993773879b718e4c896ab3f9d7d788e..2e35b0104aa3533b70985cdab0033d271ed820f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-21  Jakub Jelinek  <jakub@redhat.com>
+
+       * configure.ac: Don't bootstrap libmpx unless --with-build-config
+       includes bootstrap-mpx.
+       * configure: Regenerated.
+
 2016-12-19  Chenghua Xu  <paul.hua.gm@gmail.com>
 
        * MAINTAINERS (Write After Approval): Add myself.

diff --git a/configure b/configure
index b6389e4718d7c763d481445576a27a07f2d8b8ad..b8d60964a947d4d79077b03fca9c10447a9d8562 100755 (executable)
--- a/configure
+++ b/configure
@@ -7057,9 +7057,14 @@ if echo " ${target_configdirs} " | grep " libvtv " > /dev/null 2>&1 &&
   bootstrap_target_libs=${bootstrap_target_libs}target-libvtv,
 fi
 
-# If we are building libmpx, bootstrap it.
+# If we are building libmpx and $BUILD_CONFIG contains bootstrap-mpx,
+# bootstrap it.
 if echo " ${target_configdirs} " | grep " libmpx " > /dev/null 2>&1; then
-  bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
+  case "$BUILD_CONFIG" in
+    *bootstrap-mpx* )
+      bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
+      ;;
+  esac
 fi
 
 # Determine whether gdb needs tk/tcl or not.

diff --git a/configure.ac b/configure.ac
index 51ee70507cfcaee0b3a9ef5b06d70089b96cb87f..0d6efcfe3a28e8b49dffe9d4e4042652c39c72b7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2643,9 +2643,14 @@ if echo " ${target_configdirs} " | grep " libvtv " > /dev/null 2>&1 &&
   bootstrap_target_libs=${bootstrap_target_libs}target-libvtv,
 fi
 
-# If we are building libmpx, bootstrap it.
+# If we are building libmpx and $BUILD_CONFIG contains bootstrap-mpx,
+# bootstrap it.
 if echo " ${target_configdirs} " | grep " libmpx " > /dev/null 2>&1; then
-  bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
+  case "$BUILD_CONFIG" in
+    *bootstrap-mpx* )
+      bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
+      ;;
+  esac
 fi
 
 # Determine whether gdb needs tk/tcl or not.