Merge pull request #62 from rrthomas/master

Fix issue #55: require a C++ compiler

4 files changed, 5 insertions, 41 deletions

diff --git a/configure.ac b/configure.ac
index b6f0aa8..a9a13c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,8 @@ AC_SUBST(ENCHANT_MICRO_VERSION)
 dnl Checks for programs.
 AC_SEARCH_LIBS([strerror],[cposix])
 AC_PROG_CC
-AC_PROG_CPP
+AC_PROG_CXX
+AX_CXX_COMPILE_STDCXX(11)
 AC_PROG_OBJC
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -44,14 +45,8 @@ ENCHANT_LT_OBJDIR=$lt_cv_objdir
 AC_SUBST(ENCHANT_LT_OBJDIR)
 gt_TYPE_SSIZE_T
 
-AC_C_CONST
-
 AC_CHECK_FUNCS(flock lockf)
 
-have_cxx=yes
-AC_PROG_CXX(,have_cxx=no)
-AX_CXX_COMPILE_STDCXX(11)
-AM_CONDITIONAL(WITH_CXX, test "x$have_cxx" = "xyes")
 
 PKG_PROG_PKG_CONFIG
 
@@ -314,9 +309,6 @@ build_ispell=yes
 
 AC_ARG_ENABLE(ispell, AS_HELP_STRING([--disable-ispell],[enable the ispell backend @<:@default=auto@:>@]), build_ispell="$enableval", build_ispell=yes)
 
-if test "x$have_cxx" = "xno"; then
-   build_ispell=no
-fi
 AM_CONDITIONAL(WITH_ISPELL, test "x$build_ispell" = "xyes")
 
 ispell_dir=${datadir}/enchant/ispell
@@ -333,9 +325,6 @@ build_myspell=yes
 
 AC_ARG_ENABLE(myspell, AS_HELP_STRING([--disable-myspell],[enable the myspell backend @<:@default=auto@:>@]), build_myspell="$enableval", build_myspell=yes)
 
-if test "x$have_cxx" = "xno"; then
-   build_myspell=no
-fi
 AM_CONDITIONAL(WITH_MYSPELL, test "x$build_myspell" = "xyes")
 
 myspell_dir=${datadir}/myspell/dicts
@@ -457,10 +446,6 @@ build_uspell=no
 check_uspell=yes
 AC_ARG_ENABLE(uspell, AS_HELP_STRING([--disable-uspell],[enable the uspell backend @<:@default=auto@:>@]), check_uspell="$enableval", check_uspell=yes)
 
-if test "x$have_cxx" = "xno"; then
-   check_uspell=no
-fi
-
 if test "x$check_uspell" != "xno"; then
    PKG_CHECK_MODULES(USPELL, [libuspell >= 1.1.0], build_uspell=yes, build_uspell=no)
 fi
@@ -511,9 +496,6 @@ build_zemberek=no
 
 AC_ARG_ENABLE(zemberek, AS_HELP_STRING([--disable-zemberek],[enable the experimental zemberek (turkish) backend @<:@default=auto@:>@]), build_zemberek="$enableval", build_zemberek=no)
 
-if test "x$have_cxx" = "xno"; then
-   build_zemberek=no
-fi
 PKG_CHECK_MODULES(ZEMBEREK, [dbus-glib-1 >= 0.62], build_zemberek=yes, build_zemberek=no)
 
 AC_SUBST(ZEMBEREK_CFLAGS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8088cd0..1a9ad73 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -18,13 +18,7 @@ EXTRA_DIST=test.pwl.orig ispell.in
 
 ldadd= $(top_builddir)/src/libenchant.la $(ENCHANT_LIBS)
 
-if WITH_CXX
-cxx_progs = enchantxx.test
-else
-cxx_progs =
-endif
-
-check_PROGRAMS = enchant.test $(cxx_progs)
+check_PROGRAMS = enchant.test enchantxx.test
 bin_PROGRAMS= enchant-lsmod enchant
 
 enchant_test_SOURCES = enchant.test.c
diff --git a/unittests/Makefile.am b/unittests/Makefile.am
index dae2122..9e352c5 100644
--- a/unittests/Makefile.am
+++ b/unittests/Makefile.am
@@ -11,13 +11,7 @@ AM_TESTS_ENVIRONMENT = \
 DEPS = $(top_builddir)/src/libenchant.la
 ldadd = $(top_builddir)/src/libenchant.la $(ENCHANT_LIBS)
 
-if WITH_CXX
-cxx_progs = main
-else
-cxx_progs =
-endif
-
-check_PROGRAMS = $(cxx_progs)
+check_PROGRAMS = main
 TESTS = main
 
 main_SOURCES = main.cpp \
diff --git a/unittests/enchant_providers/Makefile.am b/unittests/enchant_providers/Makefile.am
index 1941f74..3cbf489 100644
--- a/unittests/enchant_providers/Makefile.am
+++ b/unittests/enchant_providers/Makefile.am
@@ -8,13 +8,7 @@ AM_TESTS_ENVIRONMENT = \
 DEPS = $(top_builddir)/src/libenchant.la
 ldadd = $(top_builddir)/src/libenchant.la $(ENCHANT_LIBS)
 
-if WITH_CXX
-cxx_progs = main
-else
-cxx_progs =
-endif
-
-check_PROGRAMS = $(cxx_progs)
+check_PROGRAMS = main
 TESTS = main
 
 main_SOURCES = main.cpp \