Look for csdp in $PATH at runtime, remove -csdpdir configure option

The csdp path computed by the configure script wasn't used at all, but
was forcing presence of csdp at configure time whereas it is not used
at all in the build process. Instead, we replace the configure-time
check with a runtime check for existence of csdp in $PATH.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12929 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 1 insertions, 61 deletions

diff --git a/configure b/configure
index 6c62a3c2b..fc77ee10c 100755
--- a/configure
+++ b/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 ##################################
 #
@@ -69,8 +69,6 @@ usage () {
     printf "\tSpecifies whether or not to compile Coqide\n"
     echo "-uim-script-path"
     printf "\tSpecifies where uim's .scm files are installed\n"
-    echo "-csdpdir <dir>"
-    printf "\tSpecifies the path of the CSDP solver intallation\n"
     echo "-browser <command>"
     printf "\tUse <command> to open URL %%s\n"
     echo "-with-doc (yes|no)"
@@ -119,8 +117,6 @@ gcc_exec=gcc
 ar_exec=ar
 ranlib_exec=ranlib
 
-csdpexec=
-
 local=false
 coqrunbyteflags_spec=no
 coqtoolsbyteflags_spec=no
@@ -217,9 +213,6 @@ while : ; do
 			  *) COQIDE=no
 		      esac
 		      shift;;
-    -csdpdir|--csdpdir)
-	                csdpdir="$2"
-			shift;;
     -browser|--browser) browser_spec=yes
 		      BROWSER=$2
 		      shift;;
@@ -660,51 +653,6 @@ if which uim-fep; then
     done
 fi
 
-# Borcher's C library for semidefinite programming (CSDP) is required for the
-# micromega plugin to be fully functional.
-#
-# We test for its presence; when not found we
-# - fail if the path was explicitely provided via the "-csdpdir" option,
-# - issue a warning else.
-
-if [ "$csdpdir" != "" ]; then
-    if [ ! -f "$csdpdir/csdp" ]; then
-	echo "Cannot find the csdp binary in $csdpdir ($csdpdir/csdp not found)."
-	echo "Configuration script failed!"
-	exit 1
-    else
-      if [ ! -x "$csdpdir/csdp" ]; then
-          echo "The csdp binary in $csdpdir is not executable: check your permissions."
-          echo "Configuration script failed!"
-          exit 1
-      fi
-    fi
-    USE_CSDP="yes"
-    CSDP=$csdpdir/csdp
-else
-    CSDP=`which csdp`
-    if [ ! -f "$CSDP" ]; then
-      echo "*Warning* Cannot find the csdp executable. Have you installed it?"
-      echo "          CSDP can be found pre-packaged as part of your software distribution,"
-      echo "          or at https://projects.coin-or.org/csdp."
-      USE_CSDP="no"
-    else
-      if [ ! -x "$CSDP" ]; then
-          echo "*Warning* The csdp binary at $CSDP is not executable: check your permissions."
-          USE_CSDP="noexec"
-      else
-          USE_CSDP="yes"
-      fi
-    fi
-fi
-
-# Finally, set the ML configuration variable to reflect the state of the CSDP
-# installation.
-case $USE_CSDP in
-  yes)          csdpexec="Some \"$CSDP\"";;
-  no|noexec)    csdpexec="None";;
-esac
-
 # strip command
 
 case $ARCH in
@@ -919,13 +867,6 @@ else
 echo "  Documentation                     : None"
 fi
 echo "  CoqIde                            : $COQIDE"
-if test "$USE_CSDP" = "yes"; then
-echo "  CSDP for Micromega                : $CSDP"
-else if test "$USE_CSDP" = "no"; then
-echo "  CSDP for Micromega                : None"
-else if test "$USE_CSDP" = "noexec"; then
-echo "  CSDP for Micromega                : $CSDP found, but is not executable"
-fi fi fi
 echo "  Web browser                       : $BROWSER"
 echo "  Coq web site                      : $WWWCOQ"
 echo ""
@@ -1069,7 +1010,6 @@ let vo_magic_number = $VOMAGIC
 let state_magic_number = $STATEMAGIC
 let exec_extension = "$EXE"
 let with_geoproof = ref $with_geoproof
-let csdp = $csdpexec
 let browser = "$BROWSER"
 let wwwcoq = "$WWWCOQ"
 let wwwrefman = wwwcoq ^ "distrib/" ^ version ^ "/refman/"