# HG changeset patch
# User Rik <rik@octave.org>
# Date 1386271873 28800
# Node ID 2982b42c7469ad90e5fd3359f2d2eadd5748ed73
# Parent  e124ae274013e8d90e415024ab4fa2f5650f75be
maint: Backout cset ca72f1b73216 on gui_release branch

diff -r e124ae274013 -r 2982b42c7469 build-aux/common.mk
--- a/build-aux/common.mk	Thu Dec 05 11:30:28 2013 -0800
+++ b/build-aux/common.mk	Thu Dec 05 11:31:13 2013 -0800
@@ -105,6 +105,8 @@
 # C compiler flags.
 
 CC = @CC@
+## FIXME: CC_VERSION is deprecated and should be removed in version 3.12
+CC_VERSION = @CC_VERSION@
 GCC_VERSION = @GCC_VERSION@
 CPICFLAG = @CPICFLAG@
 XTRA_CFLAGS = @XTRA_CFLAGS@
@@ -127,6 +129,8 @@
 # C++ compiler flags.
 
 CXX = @CXX@
+## FIXME: CXX_VERSION is deprecated and should be removed in version 3.12
+CXX_VERSION = @CXX_VERSION@
 GXX_VERSION = @GXX_VERSION@
 CXXCPP = @CXXCPP@
 CXXPICFLAG = @CXXPICFLAG@
@@ -512,6 +516,7 @@
   -e "s|%OCTAVE_CONF_CANONICAL_HOST_TYPE%|\"${canonical_host_type}\"|" \
   -e "s|%OCTAVE_CONF_CARBON_LIBS%|\"${CARBON_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_CC%|\"${CC}\"|" \
+  -e "s|%OCTAVE_CONF_CC_VERSION%|\"${CC_VERSION}\"|" \
   -e "s|%OCTAVE_CONF_CCOLAMD_CPPFLAGS%|\"${CCOLAMD_CPPFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_CCOLAMD_LDFLAGS%|\"${CCOLAMD_LDFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_CCOLAMD_LIBS%|\"${CCOLAMD_LIBS}\"|" \
diff -r e124ae274013 -r 2982b42c7469 configure.ac
--- a/configure.ac	Thu Dec 05 11:30:28 2013 -0800
+++ b/configure.ac	Thu Dec 05 11:31:13 2013 -0800
@@ -305,6 +305,10 @@
 fi
 AC_SUBST(GXX_VERSION)
 
+## FIXME: CXX_VERSION is deprecated and should be removed in Octave version 3.12
+CXX_VERSION=$gxx_version
+AC_SUBST(CXX_VERSION)
+
 ### Determine which C compiler to use (we expect to find gcc).
 
 AC_PROG_CC
@@ -351,6 +355,10 @@
 fi
 AC_SUBST(GCC_VERSION)
 
+## FIXME: CC_VERSION is deprecated and should be removed in Octave version 3.12
+CC_VERSION=$GCC_VERSION
+AC_SUBST(CC_VERSION)
+
 ### Also check g++ version number, it might be different from the
 ## gcc version number.
 
diff -r e124ae274013 -r 2982b42c7469 libinterp/corefcn/toplev.cc
--- a/libinterp/corefcn/toplev.cc	Thu Dec 05 11:30:28 2013 -0800
+++ b/libinterp/corefcn/toplev.cc	Thu Dec 05 11:31:13 2013 -0800
@@ -1251,6 +1251,8 @@
     { false, "CAMD_LIBS", OCTAVE_CONF_CAMD_LIBS },
     { false, "CARBON_LIBS", OCTAVE_CONF_CARBON_LIBS },
     { false, "CC", OCTAVE_CONF_CC },
+    // FIXME: CC_VERSION is deprecated.  Remove in version 3.12
+    { false, "CC_VERSION", OCTAVE_CONF_CC_VERSION },
     { false, "CCOLAMD_CPPFLAGS", OCTAVE_CONF_CCOLAMD_CPPFLAGS },
     { false, "CCOLAMD_LDFLAGS", OCTAVE_CONF_CCOLAMD_LDFLAGS },
     { false, "CCOLAMD_LIBS", OCTAVE_CONF_CCOLAMD_LIBS },
@@ -1273,6 +1275,8 @@
     { false, "CXXCPP", OCTAVE_CONF_CXXCPP },
     { false, "CXXFLAGS", OCTAVE_CONF_CXXFLAGS },
     { false, "CXXPICFLAG", OCTAVE_CONF_CXXPICFLAG },
+    // FIXME: CXX_VERSION is deprecated.  Remove in version 3.12
+    { false, "CXX_VERSION", OCTAVE_CONF_CXX_VERSION },
     { false, "DEFAULT_PAGER", OCTAVE_DEFAULT_PAGER },
     { false, "DEFS", OCTAVE_CONF_DEFS },
     { false, "DL_LD", OCTAVE_CONF_DL_LD },