* m4/cxx.m4, examples/Makefile.am: Don't build

examples/calc++ if no C++ compiler is available.

diff --git a/ChangeLog b/ChangeLog
index 2712c547f79052b28b059cec7450ff13f692fadc..450e30ed46a40fdac2e12890d6083add66950c0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-09  Albert Chin-A-Young  <china@thewrittenword.com>
+
+       * m4/cxx.m4, examples/Makefile.am: Don't build
+       examples/calc++ if no C++ compiler is available.  (trivial change)
+

 2005-11-09  Akim Demaille  <akim@epita.fr>
 
        * src/scan-skel.l: Use a couple of asserts.
 2005-11-09  Akim Demaille  <akim@epita.fr>
 
        * src/scan-skel.l: Use a couple of asserts.

diff --git a/examples/Makefile.am b/examples/Makefile.am
index c997eb224efda8afd4c2f5383c9e4a56a00991aa..a51ba9802155177e9df807e4934104e2c09eb38c 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -16,6 +16,8 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301  USA
 
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301  USA
 

+if BISON_CXX_WORKS

 SUBDIRS = calc++
 SUBDIRS = calc++

+endif

 
 dist_noinst_SCRIPTS = extexi
 
 dist_noinst_SCRIPTS = extexi

diff --git a/m4/cxx.m4 b/m4/cxx.m4
index 210833f672e2da5c396a4978e00e5c93599a0284..71bf8f966853a62218ab7c47ba7c0a53d5fe0f6e 100644 (file)
--- a/m4/cxx.m4
+++ b/m4/cxx.m4
@@ -44,4 +44,5 @@ AC_DEFUN([BISON_TEST_FOR_WORKING_CXX_COMPILER],
  esac
 
  AC_SUBST([BISON_CXX_WORKS])
  esac
 
  AC_SUBST([BISON_CXX_WORKS])

+ AM_CONDITIONAL(BISON_CXX_WORKS, test $bison_cv_cxx_works = yes)

 ])
 ])