Mercurial > hg > ucx / file diff

--- a/configure	Mon Dec 18 18:54:17 2023 +0100
+++ b/configure	Wed Dec 20 16:46:14 2023 +0100
@@ -36,7 +36,6 @@
 src_dir=`pwd`
 DOXYGEN=`command -v doxygen`
 PANDOC=`command -v pandoc`
-CMAKE=`command -v cmake`
 
 # features
 
@@ -76,7 +75,6 @@
 Options:
   --debug                 add extra compile flags for debug builds
   --release               add extra compile flags for release builds
-  --with-tests=(yes|no)
   --with-docs=(all|html|api|none)
 
 __EOF__
@@ -107,7 +105,6 @@
         "--help"*) printhelp; abort_configure ;;
         "--debug")           BUILD_TYPE="debug" ;;
         "--release")         BUILD_TYPE="release" ;;
-        "--with-tests="*) OPT_WITH_TESTS=${ARG#--with-tests=} ;;
         "--with-docs="*) OPT_WITH_DOCS=${ARG#--with-docs=} ;;
         "-"*) echo "unknown option: $ARG"; abort_configure ;;
     esac
@@ -222,7 +219,6 @@
 src_dir="$src_dir"
 DOXYGEN="$DOXYGEN"
 PANDOC="$PANDOC"
-CMAKE="$CMAKE"
 __EOF__
 
 # toolchain detection utilities
@@ -235,9 +231,6 @@
 # check languages
 lang_c=
 lang_cpp=
-if detect_cpp_compiler ; then
-    lang_cpp=1
-fi
 if detect_c_compiler ; then
     lang_c=1
 fi
@@ -276,22 +269,6 @@
     echo no
     return 0
 }
-dependency_error_cpp()
-{
-    printf "checking for cpp... "
-    # dependency cpp
-    while true
-    do
-        if [ -z "$lang_cpp" ] ; then
-            break
-        fi
-        echo yes
-        return 1
-    done
-
-    echo no
-    return 0
-}
 dependency_error_c()
 {
     printf "checking for c... "
@@ -384,24 +361,6 @@
     echo no
     return 0
 }
-dependency_error_cmake()
-{
-    printf "checking for cmake... "
-    # dependency cmake
-    while true
-    do
-        if test -n "$CMAKE" > /dev/null ; then
-            :
-        else
-            break
-        fi
-        echo yes
-        return 1
-    done
-
-    echo no
-    return 0
-}
 dependency_error_doxygen()
 {
     printf "checking for doxygen... "
@@ -470,32 +429,6 @@
 #
 # OPTION VALUES
 #
-checkopt_with_tests_yes()
-{
-    VERR=0
-    if dependency_error_cpp ; then
-        VERR=1
-    fi
-    if dependency_error_cmake ; then
-        VERR=1
-    fi
-    if [ $VERR -ne 0 ]; then
-        return 1
-    fi
-    cat >> "$TEMP_DIR/make.mk" << __EOF__
-WITH_TESTS=yes
-
-__EOF__
-    return 0
-}
-checkopt_with_tests_no()
-{
-    VERR=0
-    if [ $VERR -ne 0 ]; then
-        return 1
-    fi
-    return 0
-}
 checkopt_with_docs_all()
 {
     VERR=0
@@ -579,54 +512,6 @@
 
 # Features
 
-# Option: --with-tests
-if [ -z "$OPT_WITH_TESTS" ]; then
-    echo "auto-detecting option 'with-tests'"
-    SAVED_ERROR="$ERROR"
-    SAVED_DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED"
-    ERROR=1
-    while true
-    do
-        if checkopt_with_tests_yes ; then
-            echo "  with-tests: yes" >> "$TEMP_DIR/options"
-            ERROR=0
-            break
-        fi
-        if checkopt_with_tests_no ; then
-            echo "  with-tests: no" >> "$TEMP_DIR/options"
-            ERROR=0
-            break
-        fi
-        break
-    done
-    if [ $ERROR -ne 0 ]; then
-        SAVED_ERROR=1
-        SAVED_DEPENDENCIES_FAILED="option 'with-tests' $SAVED_DEPENDENCIES_FAILED"
-    fi
-    ERROR="$SAVED_ERROR"
-    DEPENDENCIES_FAILED="$SAVED_DEPENDENCIES_FAILED"
-else
-    echo "checking option with-tests = $OPT_WITH_TESTS"
-    if false; then
-        false
-    elif [ "$OPT_WITH_TESTS" = "yes" ]; then
-        echo "  with-tests: $OPT_WITH_TESTS" >> $TEMP_DIR/options
-        if checkopt_with_tests_yes ; then
-            :
-        else
-            ERROR=1
-            DEPENDENCIES_FAILED="option 'with-tests' $DEPENDENCIES_FAILED"
-        fi
-    elif [ "$OPT_WITH_TESTS" = "no" ]; then
-        echo "  with-tests: $OPT_WITH_TESTS" >> $TEMP_DIR/options
-        if checkopt_with_tests_no ; then
-            :
-        else
-            ERROR=1
-            DEPENDENCIES_FAILED="option 'with-tests' $DEPENDENCIES_FAILED"
-        fi
-    fi
-fi
 # Option: --with-docs
 if [ -z "$OPT_WITH_DOCS" ]; then
     echo "auto-detecting option 'with-docs'"