configure: Remove unused AM conditionals

* CMakeLists.txt: Remove FIXME for openbsd_threads and
ENABLE_GCJ_SUPPORT.
* configure.ac (openbsd_threads): Remove unused variable.
* configure.ac (OPENBSD_THREADS, ENABLE_GCJ_SUPPORT): Remove unused
AM conditional definition.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fedd3c915abaec67251073278dc85847bd030ab..d537b8a8465896ea49594f2a6e300cd9bbca395a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,7 +114,6 @@ IF(CMAKE_USE_PTHREADS_INIT)
         ENDIF()
         IF ( "HOST" MATCHES .*-.*-openbsd.*)
                 ADD_DEFINITIONS("-DGC_OPENBSD_THREADS")
-                #FIXME openbsd_threads=true
         ENDIF()
         IF ( "HOST" MATCHES .*-.*-freebsd.*)
                 MESSAGE("FreeBSD does not yet fully support threads with Boehm GC.")
@@ -203,7 +202,6 @@ ENDIF(CMAKE_USE_WIN32_THREADS_INIT)
 
 OPTION(enable_gcj_support "Support for gcj" NO)
 IF(enable_gcj_support)
-        #TODO AM_CONDITIONAL(ENABLE_GCJ_SUPPORT,     [test x"$enable_gcj_support" != xno])
         ADD_DEFINITIONS("-DGC_GCJ_SUPPORT")
 ENDIF(enable_gcj_support)
 

diff --git a/configure.ac b/configure.ac
index 76184cec6030ba0652f645e39d342347d3e1be22..47243a321fa48ff5037a7b795c6eb6378d019673 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,6 @@ case "$THREADS" in
         AC_DEFINE(GC_OPENBSD_THREADS)
         THREADDLLIBS=-pthread
         INCLUDES="$INCLUDES -pthread"
-        openbsd_threads=true
         ;;
      *-*-freebsd*)
         AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
@@ -372,7 +371,6 @@ AM_CONDITIONAL(THREADS, test x$THREADS != xnone)
 AM_CONDITIONAL(PTHREADS, test x$THREADS = xposix)
 AM_CONDITIONAL(DARWIN_THREADS, test x$darwin_threads = xtrue)
 AM_CONDITIONAL(WIN32_THREADS, test x$win32_threads = xtrue)
-AM_CONDITIONAL(OPENBSD_THREADS, test x$openbsd_threads = xtrue)
 
 case "$host" in
    powerpc-*-darwin*)
@@ -642,8 +640,6 @@ dnl enable_gcj_support=no
 AC_ARG_ENABLE(gcj-support,
     [AC_HELP_STRING([--disable-gcj-support],
         [Disable support for gcj.])])
-AM_CONDITIONAL(ENABLE_GCJ_SUPPORT,
-    [test x"$enable_gcj_support" != xno])
 if test x"$enable_gcj_support" != xno; then
     AC_DEFINE(GC_GCJ_SUPPORT, 1, [Define to include support for gcj.])
 fi