Allow specification of --enable-languages=default for GCC

Rename current "default" value to "abe_default".  This allows us
to build GCC's upstream default languages.

Change-Id: I7e3b573092d2747ffd3dd300cfe7a464357668a2

3 files changed, 9 insertions, 25 deletions

diff --git a/config/gcc.conf b/config/gcc.conf
index a1a7055b..5718368f 100644
--- a/config/gcc.conf
+++ b/config/gcc.conf
@@ -213,19 +213,15 @@ if test x"${build}" != x"${target}"; then
 	    fixme "\${clibrary} not specified."
 	    ;;
     esac
-
-    if test x"${with_languages}" != x"default"; then
-	languages="${with_languages}"
-    fi
 else
-    # Native builds are easy, so build almost everything
-    if test x"${with_languages}" != x"default"; then
-	languages="${with_languages}"
-    else
-	languages="c,c++,go,objc,fortran"
-    fi
+    # Native builds are easy, so build almost everything.
+    languages="c,c++,go,objc,fortran"
 fi	 
 
+if [ "$with_languages" != "abe_default" ]; then
+    languages="${with_languages}"
+fi
+
 # When building for a mingw host, supply pre-built libiconv and use GCC's
 # internal zlib (otherwise no zlib to build against).
 mingw_extraconf="--with-libiconv-prefix=$prefix/usr --with-system-zlib=no"
diff --git a/configure b/configure
index 18e0c45e..d2ac806d 100755
--- a/configure
+++ b/configure
@@ -652,7 +652,6 @@ infodir
 docdir
 oldincludedir
 includedir
-runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -739,7 +738,6 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -992,15 +990,6 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
-  -runstatedir | --runstatedir | --runstatedi | --runstated \
-  | --runstate | --runstat | --runsta | --runst | --runs \
-  | --run | --ru | --r)
-    ac_prev=runstatedir ;;
-  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-  | --run=* | --ru=* | --r=*)
-    runstatedir=$ac_optarg ;;
-
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1138,7 +1127,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir runstatedir
+		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1291,7 +1280,6 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -3652,7 +3640,7 @@ echo ""
 if test "${with_languages+set}" = set; then :
   withval=$with_languages; WITH_LANGUAGES=${withval}
 else
-  WITH_LANGUAGES='default'
+  WITH_LANGUAGES='abe_default'
 fi
 
 
diff --git a/configure.ac b/configure.ac
index 40ec7c45..0f8da336 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,7 +258,7 @@ echo ""
 AC_ARG_WITH(languages,
   AC_HELP_STRING([--with-languages], [List of languages for the compiler]),
   WITH_LANGUAGES=${withval},
-  WITH_LANGUAGES='default')
+  WITH_LANGUAGES='abe_default')
 AC_SUBST(WITH_LANGUAGES)
 
 dnl if you have SSH access to the remote machine