From 178f875aa0b8465dd94c7c16bb74197229353cbe Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 4 Sep 2012 14:49:41 -0400 Subject: [PATCH] * configure.ac: Fix --enable-languages=all. From-SVN: r190945 --- ChangeLog | 4 ++++ configure | 8 ++++---- configure.ac | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3132b4..86c63a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-09-04 Jason Merrill + + * configure.ac: Fix --enable-languages=all. + 2012-09-04 Christophe Lyon * MAINTAINERS (Write After Approval): Add myself. diff --git a/configure b/configure index 0f655b8..cd06e4e 100755 --- a/configure +++ b/configure @@ -6112,6 +6112,7 @@ if test -d ${srcdir}/gcc; then boot_language=yes fi + add_this_lang=no case ,${enable_languages}, in *,${language},*) # Language was explicitly selected; include it @@ -6122,10 +6123,9 @@ if test -d ${srcdir}/gcc; then ;; *,all,*) # 'all' was selected, select it if it is a default language - add_this_lang=${build_by_default} - ;; - *) - add_this_lang=no + if test "$language" != "c"; then + add_this_lang=${build_by_default} + fi ;; esac diff --git a/configure.ac b/configure.ac index 02174b3..9bee624 100644 --- a/configure.ac +++ b/configure.ac @@ -1758,6 +1758,7 @@ if test -d ${srcdir}/gcc; then boot_language=yes fi + add_this_lang=no case ,${enable_languages}, in *,${language},*) # Language was explicitly selected; include it @@ -1768,10 +1769,9 @@ if test -d ${srcdir}/gcc; then ;; *,all,*) # 'all' was selected, select it if it is a default language - add_this_lang=${build_by_default} - ;; - *) - add_this_lang=no + if test "$language" != "c"; then + add_this_lang=${build_by_default} + fi ;; esac -- 2.7.4