diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 41 |
1 files changed, 23 insertions, 18 deletions
@@ -744,7 +744,7 @@ TWOPI CIRCO GV DOTTY -XDOT_PY +XDOT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA @@ -7225,16 +7225,18 @@ cat >>confdefs.h <<_ACEOF _ACEOF fi -# Extract the first word of "xdot.py", so it can be a program name with args. -set dummy xdot.py; ac_word=$2 +for ac_prog in xdot, xdot.py +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_XDOT_PY+set}" = set; then +if test "${ac_cv_path_XDOT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $XDOT_PY in + case $XDOT in [\\/]* | ?:[\\/]*) - ac_cv_path_XDOT_PY="$XDOT_PY" # Let the user override the test with a path. + ac_cv_path_XDOT="$XDOT" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -7244,7 +7246,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_XDOT_PY="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_XDOT="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -7252,32 +7254,35 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_XDOT_PY" && ac_cv_path_XDOT_PY="echo xdot.py" ;; esac fi -XDOT_PY=$ac_cv_path_XDOT_PY -if test -n "$XDOT_PY"; then - { echo "$as_me:$LINENO: result: $XDOT_PY" >&5 -echo "${ECHO_T}$XDOT_PY" >&6; } +XDOT=$ac_cv_path_XDOT +if test -n "$XDOT"; then + { echo "$as_me:$LINENO: result: $XDOT" >&5 +echo "${ECHO_T}$XDOT" >&6; } else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi -if test "$XDOT_PY" != "echo xdot.py" ; then + test -n "$XDOT" && break +done +test -n "$XDOT" || XDOT="echo xdot" + +if test "$XDOT" != "echo xdot" ; then cat >>confdefs.h <<\_ACEOF -#define HAVE_XDOT_PY 1 +#define HAVE_XDOT 1 _ACEOF if test "$llvm_cv_os_type" = "MingW" ; then - XDOT_PY=`echo $XDOT_PY | sed 's/^\/\([A-Za-z]\)\//\1:\//' ` + XDOT=`echo $XDOT | sed 's/^\/\([A-Za-z]\)\//\1:\//' ` fi cat >>confdefs.h <<_ACEOF -#define LLVM_PATH_XDOT_PY "$XDOT_PY${EXEEXT}" +#define LLVM_PATH_XDOT "$XDOT${EXEEXT}" _ACEOF fi @@ -10546,7 +10551,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10549 "configure" +#line 10554 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -23588,7 +23593,7 @@ TWOPI!$TWOPI$ac_delim CIRCO!$CIRCO$ac_delim GV!$GV$ac_delim DOTTY!$DOTTY$ac_delim -XDOT_PY!$XDOT_PY$ac_delim +XDOT!$XDOT$ac_delim INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim |