llvm.org GIT mirror llvm / be13028
* Correct the AC_DEFINE for LLVM_PATH_GRAPHVIZ to use AC_DEFINE_UNQUOTED so we actually get the path and not $GRAPHVIZ as the value. * Add a #define for the gv program (HAVE_GV) and its value LLVM_PATH_GV. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22433 91177308-0d34-0410-b5e6-96231b3b80d8 Reid Spencer 15 years ago
3 changed file(s) with 97 addition(s) and 32 deletion(s). Raw diff Collapse all Expand all
306306 AC_PATH_PROG(GRAPHVIZ, [Graphviz], [echo Graphviz])
307307 if test "$GRAPHVIZ" != "echo Graphviz" ; then
308308 AC_DEFINE([HAVE_GRAPHVIZ],[1],[Define if the Graphviz program is available])
309 AC_DEFINE([LLVM_PATH_GRAPHVIZ],"$GRAPHVIZ",
309 AC_DEFINE_UNQUOTED([LLVM_PATH_GRAPHVIZ],"$GRAPHVIZ",
310310 [Define to path to Graphviz program if found or 'echo Graphviz' otherwise])
311 fi
312 AC_PATH_PROG(GV, [gv], [echo gv])
313 if test "$GRAPHVIZ" != "echo gv" ; then
314 AC_DEFINE([HAVE_GV],[1],[Define if the gv program is available])
315 AC_DEFINE_UNQUOTED([LLVM_PATH_GV],"$GV",
316 [Define to path to gv program if found or 'echo gv' otherwise])
311317 fi
312318
313319 dnl Find the install program
474474 # include
475475 #endif"
476476
477 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_COPYRIGHT subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS LLVM_ON_UNIX LLVM_ON_WIN32 ARCH ENDIAN CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT ENABLE_OPTIMIZED JIT ENABLE_DOXYGEN TARGETS_TO_BUILD CPP CXX CXXFLAGS ac_ct_CXX LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON ifGNUmake LN_S CMP CP DATE FIND GREP MKDIR MV RANLIB ac_ct_RANLIB RM SED TAR GRAPHVIZ INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA BZIP2 DOT DOXYGEN ETAGS GROFF GZIP POD2HTML POD2MAN RUNTEST TCLSH ZIP EGREP INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL ECHO AR ac_ct_AR STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ETAGSFLAGS LLVMGCC LLVMGXX ALLOCA MMAP_FILE LLVMCC1 LLVMCC1PLUS LLVMGCCDIR SHLIBEXT LLVM_PREFIX LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR LLVM_INFODIR LLVM_MANDIR LLVM_CONFIGTIME LIBOBJS LTLIBOBJS'
477 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LLVM_COPYRIGHT subdirs build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OS LLVM_ON_UNIX LLVM_ON_WIN32 ARCH ENDIAN CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT ENABLE_OPTIMIZED JIT ENABLE_DOXYGEN TARGETS_TO_BUILD CPP CXX CXXFLAGS ac_ct_CXX LEX LEXLIB LEX_OUTPUT_ROOT FLEX YACC BISON ifGNUmake LN_S CMP CP DATE FIND GREP MKDIR MV RANLIB ac_ct_RANLIB RM SED TAR GRAPHVIZ GV INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA BZIP2 DOT DOXYGEN ETAGS GROFF GZIP POD2HTML POD2MAN RUNTEST TCLSH ZIP EGREP INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL ECHO AR ac_ct_AR STRIP ac_ct_STRIP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ETAGSFLAGS LLVMGCC LLVMGXX ALLOCA MMAP_FILE LLVMCC1 LLVMCC1PLUS LLVMGCCDIR SHLIBEXT LLVM_PREFIX LLVM_BINDIR LLVM_LIBDIR LLVM_DATADIR LLVM_DOCSDIR LLVM_ETCDIR LLVM_INCLUDEDIR LLVM_INFODIR LLVM_MANDIR LLVM_CONFIGTIME LIBOBJS LTLIBOBJS'
478478 ac_subst_files=''
479479
480480 # Initialize some variables set by options.
51005100 _ACEOF
51015101
51025102
5103 cat >>confdefs.h <<_ACEOF
5104 #define LLVM_PATH_GRAPHVIZ "$GRAPHVIZ"
5105 _ACEOF
5106
5107 fi
5108 # Extract the first word of "gv", so it can be a program name with args.
5109 set dummy gv; ac_word=$2
5110 echo "$as_me:$LINENO: checking for $ac_word" >&5
5111 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5112 if test "${ac_cv_path_GV+set}" = set; then
5113 echo $ECHO_N "(cached) $ECHO_C" >&6
5114 else
5115 case $GV in
5116 [\\/]* | ?:[\\/]*)
5117 ac_cv_path_GV="$GV" # Let the user override the test with a path.
5118 ;;
5119 *)
5120 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5121 for as_dir in $PATH
5122 do
5123 IFS=$as_save_IFS
5124 test -z "$as_dir" && as_dir=.
5125 for ac_exec_ext in '' $ac_executable_extensions; do
5126 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5127 ac_cv_path_GV="$as_dir/$ac_word$ac_exec_ext"
5128 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5129 break 2
5130 fi
5131 done
5132 done
5133
5134 test -z "$ac_cv_path_GV" && ac_cv_path_GV="echo gv"
5135 ;;
5136 esac
5137 fi
5138 GV=$ac_cv_path_GV
5139
5140 if test -n "$GV"; then
5141 echo "$as_me:$LINENO: result: $GV" >&5
5142 echo "${ECHO_T}$GV" >&6
5143 else
5144 echo "$as_me:$LINENO: result: no" >&5
5145 echo "${ECHO_T}no" >&6
5146 fi
5147
5148 if test "$GRAPHVIZ" != "echo gv" ; then
5149
51035150 cat >>confdefs.h <<\_ACEOF
5104 #define LLVM_PATH_GRAPHVIZ "$GRAPHVIZ"
5151 #define HAVE_GV 1
5152 _ACEOF
5153
5154
5155 cat >>confdefs.h <<_ACEOF
5156 #define LLVM_PATH_GV "$GV"
51055157 _ACEOF
51065158
51075159 fi
82808332 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
82818333 lt_status=$lt_dlunknown
82828334 cat > conftest.$ac_ext <
8283 #line 8284 "configure"
8335 #line 8336 "configure"
82848336 #include "confdefs.h"
82858337
82868338 #if HAVE_DLFCN_H
1027110323 ;;
1027210324 *-*-irix6*)
1027310325 # Find out which ABI we are using.
10274 echo '#line 10275 "configure"' > conftest.$ac_ext
10326 echo '#line 10327 "configure"' > conftest.$ac_ext
1027510327 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
1027610328 (eval $ac_compile) 2>&5
1027710329 ac_status=$?
1075610808
1075710809
1075810810 # Provide some information about the compiler.
10759 echo "$as_me:10760:" \
10811 echo "$as_me:10812:" \
1076010812 "checking for Fortran 77 compiler version" >&5
1076110813 ac_compiler=`set X $ac_compile; echo $2`
1076210814 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
1181311865 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1181411866 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1181511867 -e 's:$: $lt_compiler_flag:'`
11816 (eval echo "\"\$as_me:11817: $lt_compile\"" >&5)
11868 (eval echo "\"\$as_me:11869: $lt_compile\"" >&5)
1181711869 (eval "$lt_compile" 2>conftest.err)
1181811870 ac_status=$?
1181911871 cat conftest.err >&5
11820 echo "$as_me:11821: \$? = $ac_status" >&5
11872 echo "$as_me:11873: \$? = $ac_status" >&5
1182111873 if (exit $ac_status) && test -s "$ac_outfile"; then
1182211874 # The compiler can only warn and ignore the option if not recognized
1182311875 # So say no if there are warnings
1205612108 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1205712109 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1205812110 -e 's:$: $lt_compiler_flag:'`
12059 (eval echo "\"\$as_me:12060: $lt_compile\"" >&5)
12111 (eval echo "\"\$as_me:12112: $lt_compile\"" >&5)
1206012112 (eval "$lt_compile" 2>conftest.err)
1206112113 ac_status=$?
1206212114 cat conftest.err >&5
12063 echo "$as_me:12064: \$? = $ac_status" >&5
12115 echo "$as_me:12116: \$? = $ac_status" >&5
1206412116 if (exit $ac_status) && test -s "$ac_outfile"; then
1206512117 # The compiler can only warn and ignore the option if not recognized
1206612118 # So say no if there are warnings
1211612168 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1211712169 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1211812170 -e 's:$: $lt_compiler_flag:'`
12119 (eval echo "\"\$as_me:12120: $lt_compile\"" >&5)
12171 (eval echo "\"\$as_me:12172: $lt_compile\"" >&5)
1212012172 (eval "$lt_compile" 2>out/conftest.err)
1212112173 ac_status=$?
1212212174 cat out/conftest.err >&5
12123 echo "$as_me:12124: \$? = $ac_status" >&5
12175 echo "$as_me:12176: \$? = $ac_status" >&5
1212412176 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1212512177 then
1212612178 # The compiler can only warn and ignore the option if not recognized
1430114353 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1430214354 lt_status=$lt_dlunknown
1430314355 cat > conftest.$ac_ext <
14304 #line 14305 "configure"
14356 #line 14357 "configure"
1430514357 #include "confdefs.h"
1430614358
1430714359 #if HAVE_DLFCN_H
1439914451 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1440014452 lt_status=$lt_dlunknown
1440114453 cat > conftest.$ac_ext <
14402 #line 14403 "configure"
14454 #line 14455 "configure"
1440314455 #include "confdefs.h"
1440414456
1440514457 #if HAVE_DLFCN_H
1659216644 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1659316645 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1659416646 -e 's:$: $lt_compiler_flag:'`
16595 (eval echo "\"\$as_me:16596: $lt_compile\"" >&5)
16647 (eval echo "\"\$as_me:16648: $lt_compile\"" >&5)
1659616648 (eval "$lt_compile" 2>conftest.err)
1659716649 ac_status=$?
1659816650 cat conftest.err >&5
16599 echo "$as_me:16600: \$? = $ac_status" >&5
16651 echo "$as_me:16652: \$? = $ac_status" >&5
1660016652 if (exit $ac_status) && test -s "$ac_outfile"; then
1660116653 # The compiler can only warn and ignore the option if not recognized
1660216654 # So say no if there are warnings
1665216704 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1665316705 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1665416706 -e 's:$: $lt_compiler_flag:'`
16655 (eval echo "\"\$as_me:16656: $lt_compile\"" >&5)
16707 (eval echo "\"\$as_me:16708: $lt_compile\"" >&5)
1665616708 (eval "$lt_compile" 2>out/conftest.err)
1665716709 ac_status=$?
1665816710 cat out/conftest.err >&5
16659 echo "$as_me:16660: \$? = $ac_status" >&5
16711 echo "$as_me:16712: \$? = $ac_status" >&5
1666016712 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1666116713 then
1666216714 # The compiler can only warn and ignore the option if not recognized
1801318065 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1801418066 lt_status=$lt_dlunknown
1801518067 cat > conftest.$ac_ext <
18016 #line 18017 "configure"
18068 #line 18069 "configure"
1801718069 #include "confdefs.h"
1801818070
1801918071 #if HAVE_DLFCN_H
1811118163 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1811218164 lt_status=$lt_dlunknown
1811318165 cat > conftest.$ac_ext <
18114 #line 18115 "configure"
18166 #line 18167 "configure"
1811518167 #include "confdefs.h"
1811618168
1811718169 #if HAVE_DLFCN_H
1894819000 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1894919001 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1895019002 -e 's:$: $lt_compiler_flag:'`
18951 (eval echo "\"\$as_me:18952: $lt_compile\"" >&5)
19003 (eval echo "\"\$as_me:19004: $lt_compile\"" >&5)
1895219004 (eval "$lt_compile" 2>conftest.err)
1895319005 ac_status=$?
1895419006 cat conftest.err >&5
18955 echo "$as_me:18956: \$? = $ac_status" >&5
19007 echo "$as_me:19008: \$? = $ac_status" >&5
1895619008 if (exit $ac_status) && test -s "$ac_outfile"; then
1895719009 # The compiler can only warn and ignore the option if not recognized
1895819010 # So say no if there are warnings
1900819060 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
1900919061 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
1901019062 -e 's:$: $lt_compiler_flag:'`
19011 (eval echo "\"\$as_me:19012: $lt_compile\"" >&5)
19063 (eval echo "\"\$as_me:19064: $lt_compile\"" >&5)
1901219064 (eval "$lt_compile" 2>out/conftest.err)
1901319065 ac_status=$?
1901419066 cat out/conftest.err >&5
19015 echo "$as_me:19016: \$? = $ac_status" >&5
19067 echo "$as_me:19068: \$? = $ac_status" >&5
1901619068 if (exit $ac_status) && test -s out/conftest2.$ac_objext
1901719069 then
1901819070 # The compiler can only warn and ignore the option if not recognized
2104721099 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
2104821100 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2104921101 -e 's:$: $lt_compiler_flag:'`
21050 (eval echo "\"\$as_me:21051: $lt_compile\"" >&5)
21102 (eval echo "\"\$as_me:21103: $lt_compile\"" >&5)
2105121103 (eval "$lt_compile" 2>conftest.err)
2105221104 ac_status=$?
2105321105 cat conftest.err >&5
21054 echo "$as_me:21055: \$? = $ac_status" >&5
21106 echo "$as_me:21107: \$? = $ac_status" >&5
2105521107 if (exit $ac_status) && test -s "$ac_outfile"; then
2105621108 # The compiler can only warn and ignore the option if not recognized
2105721109 # So say no if there are warnings
2129021342 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
2129121343 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2129221344 -e 's:$: $lt_compiler_flag:'`
21293 (eval echo "\"\$as_me:21294: $lt_compile\"" >&5)
21345 (eval echo "\"\$as_me:21346: $lt_compile\"" >&5)
2129421346 (eval "$lt_compile" 2>conftest.err)
2129521347 ac_status=$?
2129621348 cat conftest.err >&5
21297 echo "$as_me:21298: \$? = $ac_status" >&5
21349 echo "$as_me:21350: \$? = $ac_status" >&5
2129821350 if (exit $ac_status) && test -s "$ac_outfile"; then
2129921351 # The compiler can only warn and ignore the option if not recognized
2130021352 # So say no if there are warnings
2135021402 -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
2135121403 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
2135221404 -e 's:$: $lt_compiler_flag:'`
21353 (eval echo "\"\$as_me:21354: $lt_compile\"" >&5)
21405 (eval echo "\"\$as_me:21406: $lt_compile\"" >&5)
2135421406 (eval "$lt_compile" 2>out/conftest.err)
2135521407 ac_status=$?
2135621408 cat out/conftest.err >&5
21357 echo "$as_me:21358: \$? = $ac_status" >&5
21409 echo "$as_me:21410: \$? = $ac_status" >&5
2135821410 if (exit $ac_status) && test -s out/conftest2.$ac_objext
2135921411 then
2136021412 # The compiler can only warn and ignore the option if not recognized
2353523587 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
2353623588 lt_status=$lt_dlunknown
2353723589 cat > conftest.$ac_ext <
23538 #line 23539 "configure"
23590 #line 23591 "configure"
2353923591 #include "confdefs.h"
2354023592
2354123593 #if HAVE_DLFCN_H
2363323685 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
2363423686 lt_status=$lt_dlunknown
2363523687 cat > conftest.$ac_ext <
23636 #line 23637 "configure"
23688 #line 23689 "configure"
2363723689 #include "confdefs.h"
2363823690
2363923691 #if HAVE_DLFCN_H
3129531347 s,@SED@,$SED,;t t
3129631348 s,@TAR@,$TAR,;t t
3129731349 s,@GRAPHVIZ@,$GRAPHVIZ,;t t
31350 s,@GV@,$GV,;t t
3129831351 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
3129931352 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
3130031353 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
122122
123123 /* Define if the Graphviz program is available */
124124 #undef HAVE_GRAPHVIZ
125
126 /* Define if the gv program is available */
127 #undef HAVE_GV
125128
126129 /* Define to 1 if you have the `index' function. */
127130 #undef HAVE_INDEX
393396
394397 /* Define to path to Graphviz program if found or 'echo Graphviz' otherwise */
395398 #undef LLVM_PATH_GRAPHVIZ
399
400 /* Define to path to gv program if found or 'echo gv' otherwise */
401 #undef LLVM_PATH_GV
396402
397403 /* Installation prefix directory */
398404 #undef LLVM_PREFIX