1.1 --- a/configure Mon Dec 18 18:54:17 2023 +0100
1.2 +++ b/configure Wed Dec 20 16:46:14 2023 +0100
1.3 @@ -36,7 +36,6 @@
1.4 src_dir=`pwd`
1.5 DOXYGEN=`command -v doxygen`
1.6 PANDOC=`command -v pandoc`
1.7 -CMAKE=`command -v cmake`
1.8
1.9 # features
1.10
1.11 @@ -76,7 +75,6 @@
1.12 Options:
1.13 --debug add extra compile flags for debug builds
1.14 --release add extra compile flags for release builds
1.15 - --with-tests=(yes|no)
1.16 --with-docs=(all|html|api|none)
1.17
1.18 __EOF__
1.19 @@ -107,7 +105,6 @@
1.20 "--help"*) printhelp; abort_configure ;;
1.21 "--debug") BUILD_TYPE="debug" ;;
1.22 "--release") BUILD_TYPE="release" ;;
1.23 - "--with-tests="*) OPT_WITH_TESTS=${ARG#--with-tests=} ;;
1.24 "--with-docs="*) OPT_WITH_DOCS=${ARG#--with-docs=} ;;
1.25 "-"*) echo "unknown option: $ARG"; abort_configure ;;
1.26 esac
1.27 @@ -222,7 +219,6 @@
1.28 src_dir="$src_dir"
1.29 DOXYGEN="$DOXYGEN"
1.30 PANDOC="$PANDOC"
1.31 -CMAKE="$CMAKE"
1.32 __EOF__
1.33
1.34 # toolchain detection utilities
1.35 @@ -235,9 +231,6 @@
1.36 # check languages
1.37 lang_c=
1.38 lang_cpp=
1.39 -if detect_cpp_compiler ; then
1.40 - lang_cpp=1
1.41 -fi
1.42 if detect_c_compiler ; then
1.43 lang_c=1
1.44 fi
1.45 @@ -276,22 +269,6 @@
1.46 echo no
1.47 return 0
1.48 }
1.49 -dependency_error_cpp()
1.50 -{
1.51 - printf "checking for cpp... "
1.52 - # dependency cpp
1.53 - while true
1.54 - do
1.55 - if [ -z "$lang_cpp" ] ; then
1.56 - break
1.57 - fi
1.58 - echo yes
1.59 - return 1
1.60 - done
1.61 -
1.62 - echo no
1.63 - return 0
1.64 -}
1.65 dependency_error_c()
1.66 {
1.67 printf "checking for c... "
1.68 @@ -384,24 +361,6 @@
1.69 echo no
1.70 return 0
1.71 }
1.72 -dependency_error_cmake()
1.73 -{
1.74 - printf "checking for cmake... "
1.75 - # dependency cmake
1.76 - while true
1.77 - do
1.78 - if test -n "$CMAKE" > /dev/null ; then
1.79 - :
1.80 - else
1.81 - break
1.82 - fi
1.83 - echo yes
1.84 - return 1
1.85 - done
1.86 -
1.87 - echo no
1.88 - return 0
1.89 -}
1.90 dependency_error_doxygen()
1.91 {
1.92 printf "checking for doxygen... "
1.93 @@ -470,32 +429,6 @@
1.94 #
1.95 # OPTION VALUES
1.96 #
1.97 -checkopt_with_tests_yes()
1.98 -{
1.99 - VERR=0
1.100 - if dependency_error_cpp ; then
1.101 - VERR=1
1.102 - fi
1.103 - if dependency_error_cmake ; then
1.104 - VERR=1
1.105 - fi
1.106 - if [ $VERR -ne 0 ]; then
1.107 - return 1
1.108 - fi
1.109 - cat >> "$TEMP_DIR/make.mk" << __EOF__
1.110 -WITH_TESTS=yes
1.111 -
1.112 -__EOF__
1.113 - return 0
1.114 -}
1.115 -checkopt_with_tests_no()
1.116 -{
1.117 - VERR=0
1.118 - if [ $VERR -ne 0 ]; then
1.119 - return 1
1.120 - fi
1.121 - return 0
1.122 -}
1.123 checkopt_with_docs_all()
1.124 {
1.125 VERR=0
1.126 @@ -579,54 +512,6 @@
1.127
1.128 # Features
1.129
1.130 -# Option: --with-tests
1.131 -if [ -z "$OPT_WITH_TESTS" ]; then
1.132 - echo "auto-detecting option 'with-tests'"
1.133 - SAVED_ERROR="$ERROR"
1.134 - SAVED_DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED"
1.135 - ERROR=1
1.136 - while true
1.137 - do
1.138 - if checkopt_with_tests_yes ; then
1.139 - echo " with-tests: yes" >> "$TEMP_DIR/options"
1.140 - ERROR=0
1.141 - break
1.142 - fi
1.143 - if checkopt_with_tests_no ; then
1.144 - echo " with-tests: no" >> "$TEMP_DIR/options"
1.145 - ERROR=0
1.146 - break
1.147 - fi
1.148 - break
1.149 - done
1.150 - if [ $ERROR -ne 0 ]; then
1.151 - SAVED_ERROR=1
1.152 - SAVED_DEPENDENCIES_FAILED="option 'with-tests' $SAVED_DEPENDENCIES_FAILED"
1.153 - fi
1.154 - ERROR="$SAVED_ERROR"
1.155 - DEPENDENCIES_FAILED="$SAVED_DEPENDENCIES_FAILED"
1.156 -else
1.157 - echo "checking option with-tests = $OPT_WITH_TESTS"
1.158 - if false; then
1.159 - false
1.160 - elif [ "$OPT_WITH_TESTS" = "yes" ]; then
1.161 - echo " with-tests: $OPT_WITH_TESTS" >> $TEMP_DIR/options
1.162 - if checkopt_with_tests_yes ; then
1.163 - :
1.164 - else
1.165 - ERROR=1
1.166 - DEPENDENCIES_FAILED="option 'with-tests' $DEPENDENCIES_FAILED"
1.167 - fi
1.168 - elif [ "$OPT_WITH_TESTS" = "no" ]; then
1.169 - echo " with-tests: $OPT_WITH_TESTS" >> $TEMP_DIR/options
1.170 - if checkopt_with_tests_no ; then
1.171 - :
1.172 - else
1.173 - ERROR=1
1.174 - DEPENDENCIES_FAILED="option 'with-tests' $DEPENDENCIES_FAILED"
1.175 - fi
1.176 - fi
1.177 -fi
1.178 # Option: --with-docs
1.179 if [ -z "$OPT_WITH_DOCS" ]; then
1.180 echo "auto-detecting option 'with-docs'"
