Skip to content

Commit e1c3601

Browse files
committed
[autoconf] Regenerate autoconf configure script.
llvm-svn: 232063
1 parent 26c9f2f commit e1c3601

File tree

1 file changed

+311
-7
lines changed

1 file changed

+311
-7
lines changed

llvm/configure

+311-7
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,24 @@ TARGET_HAS_JIT
705705
TARGETS_WITH_JIT
706706
ENABLE_DOCS
707707
ENABLE_DOXYGEN
708+
enable_searchengine
709+
enable_external_search
710+
enable_server_based_search
711+
searchengine_url
712+
extra_search_mappings
713+
QHELPGENERATOR
714+
llvm_doxygen_generate_qhp
715+
llvm_doxygen_qch_filename
716+
llvm_doxygen_qhp_namespace
717+
llvm_doxygen_qhelpgenerator_path
718+
llvm_doxygen_qhp_cust_filter_name
719+
llvm_doxygen_qhp_cust_filter_attrs
720+
clang_doxygen_generate_qhp
721+
clang_doxygen_qch_filename
722+
clang_doxygen_qhp_namespace
723+
clang_doxygen_qhelpgenerator_path
724+
clang_doxygen_qhp_cust_filter_name
725+
clang_doxygen_qhp_cust_filter_attrs
708726
LLVM_ENABLE_THREADS
709727
ENABLE_PTHREADS
710728
LLVM_ENABLE_ZLIB
@@ -1416,6 +1434,11 @@ Optional Features:
14161434
--enable-jit Enable Just In Time Compiling (default is YES)
14171435
--enable-docs Build documents (default is YES)
14181436
--enable-doxygen Build doxygen documentation (default is NO)
1437+
--enable-doxygen-search Enable doxygen search support (default is NO)
1438+
--enable-doxygen-external-search
1439+
Enable doxygen exteranl search (default is NO)
1440+
--enable-doxygen-qt-help
1441+
Build Qt help files (default is NO)
14191442
--enable-threads Use threads if available (default is YES)
14201443
--enable-pthreads Use pthreads if available (default is YES)
14211444
--enable-zlib Use zlib for compression/decompression if available
@@ -1450,6 +1473,10 @@ Optional Features:
14501473
Optional Packages:
14511474
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
14521475
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
1476+
--with-doxygen-search-engine-url
1477+
Specify the external search engine for doxygen
1478+
--with-doxygen-search-mappings
1479+
Specify the extra search mapping for doxygen
14531480
--with-optimize-option Select the compiler options to use for optimized
14541481
builds
14551482
--with-extra-options Specify additional options to compile LLVM with
@@ -5114,15 +5141,231 @@ fi
51145141
case "$enableval" in
51155142
yes) ENABLE_DOXYGEN=1
51165143
;;
5117-
no) ENABLE_DOXYGEN=0
5118-
;;
5119-
default) ENABLE_DOXYGEN=0
5144+
no|default) ENABLE_DOXYGEN=0
51205145
;;
51215146
*) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-doxygen. Use \"yes\" or \"no\"" >&5
51225147
echo "$as_me: error: Invalid setting for --enable-doxygen. Use \"yes\" or \"no\"" >&2;}
51235148
{ (exit 1); exit 1; }; } ;;
51245149
esac
51255150

5151+
# Check whether --enable-doxygen-search was given.
5152+
if test "${enable_doxygen_search+set}" = set; then
5153+
enableval=$enable_doxygen_search;
5154+
else
5155+
enableval=default
5156+
fi
5157+
5158+
ENABLE_DOXYGEN_SEARCH="$enableval"
5159+
5160+
case "$enableval" in
5161+
yes|no|default) ;;
5162+
*) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-doxygen-search. Use \"yes\" or \"no\"" >&5
5163+
echo "$as_me: error: Invalid setting for --enable-doxygen-search. Use \"yes\" or \"no\"" >&2;}
5164+
{ (exit 1); exit 1; }; } ;;
5165+
esac
5166+
5167+
# Check whether --enable-doxygen-external-search was given.
5168+
if test "${enable_doxygen_external_search+set}" = set; then
5169+
enableval=$enable_doxygen_external_search;
5170+
else
5171+
enableval=default
5172+
fi
5173+
5174+
ENABLE_DOXYGEN_EXTERNAL_SEARCH="$enableval"
5175+
5176+
case "$enableval" in
5177+
yes)
5178+
case "$ENABLE_DOXYGEN_SEARCH" in
5179+
yes|default) ENABLE_DOXYGEN_SEARCH="yes" ;;
5180+
no) { { echo "$as_me:$LINENO: error: The option --enable-doxygen-external-search requires --enable-doxygen-search" >&5
5181+
echo "$as_me: error: The option --enable-doxygen-external-search requires --enable-doxygen-search" >&2;}
5182+
{ (exit 1); exit 1; }; } ;;
5183+
esac
5184+
;;
5185+
no|default) ;;
5186+
*) { { echo "$as_me:$LINENO: error: Invalid setting for --enable-doxygen-external-search. Use \"yes\" or \"no\"" >&5
5187+
echo "$as_me: error: Invalid setting for --enable-doxygen-external-search. Use \"yes\" or \"no\"" >&2;}
5188+
{ (exit 1); exit 1; }; } ;;
5189+
esac
5190+
5191+
5192+
# Check whether --with-doxygen-search-engine-url was given.
5193+
if test "${with_doxygen_search_engine_url+set}" = set; then
5194+
withval=$with_doxygen_search_engine_url;
5195+
fi
5196+
5197+
WITH_DOXYGEN_SEARCH_ENGINE_URL="$withval"
5198+
5199+
5200+
# Check whether --with-doxygen-search-mappings was given.
5201+
if test "${with_doxygen_search_mappings+set}" = set; then
5202+
withval=$with_doxygen_search_mappings;
5203+
fi
5204+
5205+
WITH_DOXYGEN_SEARCH_MAPPINGS="$withval"
5206+
5207+
case "$ENABLE_DOXYGEN_SEARCH" in
5208+
yes)
5209+
if test "$ENABLE_DOXYGEN" = "0" ; then
5210+
{ { echo "$as_me:$LINENO: error: The option --enable-doxygen-search requires --enable-doxygen." >&5
5211+
echo "$as_me: error: The option --enable-doxygen-search requires --enable-doxygen." >&2;}
5212+
{ (exit 1); exit 1; }; }
5213+
fi
5214+
5215+
enable_searchengine=YES
5216+
5217+
5218+
case "$ENABLE_DOXYGEN_EXTERNAL_SEARCH" in
5219+
yes)
5220+
enable_external_search=YES
5221+
5222+
enable_server_based_search=YES
5223+
5224+
searchengine_url=$WITH_DOXYGEN_SEARCH_ENGINE_URL
5225+
5226+
extra_search_mappings=$WITH_DOXYGEN_SEARCH_MAPPINGS
5227+
5228+
;;
5229+
5230+
no|default)
5231+
enable_external_search=NO
5232+
5233+
enable_server_based_search=NO
5234+
5235+
5236+
5237+
;;
5238+
esac
5239+
;;
5240+
5241+
no|default)
5242+
enable_searchengine=NO
5243+
5244+
5245+
enable_server_based_search=NO
5246+
5247+
enable_external_search=NO
5248+
5249+
5250+
;;
5251+
5252+
*)
5253+
{ { echo "$as_me:$LINENO: error: Invalid setting for --enable-doxygen-search. Use \"yes\" or \"no\"" >&5
5254+
echo "$as_me: error: Invalid setting for --enable-doxygen-search. Use \"yes\" or \"no\"" >&2;}
5255+
{ (exit 1); exit 1; }; }
5256+
;;
5257+
esac
5258+
5259+
# Check whether --enable-doxygen-qt-help was given.
5260+
if test "${enable_doxygen_qt_help+set}" = set; then
5261+
enableval=$enable_doxygen_qt_help;
5262+
else
5263+
enableval=default
5264+
fi
5265+
5266+
case "$enableval" in
5267+
yes)
5268+
if test "$ENABLE_DOXYGEN" = "0" ; then
5269+
{ { echo "$as_me:$LINENO: error: The option --enable-doxygen-qt-help requires --enable-doxygen." >&5
5270+
echo "$as_me: error: The option --enable-doxygen-qt-help requires --enable-doxygen." >&2;}
5271+
{ (exit 1); exit 1; }; }
5272+
fi
5273+
5274+
# Extract the first word of "qhelpgenerator", so it can be a program name with args.
5275+
set dummy qhelpgenerator; ac_word=$2
5276+
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
5277+
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
5278+
if test "${ac_cv_path_QHELPGENERATOR+set}" = set; then
5279+
echo $ECHO_N "(cached) $ECHO_C" >&6
5280+
else
5281+
case $QHELPGENERATOR in
5282+
[\\/]* | ?:[\\/]*)
5283+
ac_cv_path_QHELPGENERATOR="$QHELPGENERATOR" # Let the user override the test with a path.
5284+
;;
5285+
*)
5286+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5287+
for as_dir in $PATH
5288+
do
5289+
IFS=$as_save_IFS
5290+
test -z "$as_dir" && as_dir=.
5291+
for ac_exec_ext in '' $ac_executable_extensions; do
5292+
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
5293+
ac_cv_path_QHELPGENERATOR="$as_dir/$ac_word$ac_exec_ext"
5294+
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5295+
break 2
5296+
fi
5297+
done
5298+
done
5299+
IFS=$as_save_IFS
5300+
5301+
test -z "$ac_cv_path_QHELPGENERATOR" && ac_cv_path_QHELPGENERATOR="qhelpgenerator"
5302+
;;
5303+
esac
5304+
fi
5305+
QHELPGENERATOR=$ac_cv_path_QHELPGENERATOR
5306+
if test -n "$QHELPGENERATOR"; then
5307+
{ echo "$as_me:$LINENO: result: $QHELPGENERATOR" >&5
5308+
echo "${ECHO_T}$QHELPGENERATOR" >&6; }
5309+
else
5310+
{ echo "$as_me:$LINENO: result: no" >&5
5311+
echo "${ECHO_T}no" >&6; }
5312+
fi
5313+
5314+
5315+
5316+
llvm_doxygen_generate_qhp=YES
5317+
5318+
llvm_doxygen_qch_filename=org.llvm.qch
5319+
5320+
llvm_doxygen_qhp_namespace=org.llvm
5321+
5322+
llvm_doxygen_qhelpgenerator_path=$QHELPGENERATOR
5323+
5324+
llvm_doxygen_qhp_cust_filter_name=$PACKAGE_STRING
5325+
5326+
llvm_doxygen_qhp_cust_filter_attrs=$PACKAGE_NAME,$PACKAGE_VERSION
5327+
5328+
5329+
clang_doxygen_generate_qhp=YES
5330+
5331+
clang_doxygen_qch_filename=org.llvm.clang.qch
5332+
5333+
clang_doxygen_qhp_namespace=org.llvm.clang
5334+
5335+
clang_doxygen_qhelpgenerator_path=$QHELPGENERATOR
5336+
5337+
clang_doxygen_qhp_cust_filter_name=Clang $PACKAGE_VERSION
5338+
5339+
clang_doxygen_qhp_cust_filter_attrs=Clang,$PACKAGE_VERSION
5340+
5341+
;;
5342+
5343+
no|default)
5344+
llvm_doxygen_generate_qhp=NO
5345+
5346+
5347+
5348+
5349+
5350+
5351+
5352+
clang_doxygen_generate_qhp=NO
5353+
5354+
5355+
5356+
5357+
clang_doxygen_qhp_cust_filter_name=Clang $PACKAGE_VERSION
5358+
5359+
clang_doxygen_qhp_cust_filter_attrs=Clang,$PACKAGE_VERSION
5360+
5361+
;;
5362+
5363+
*)
5364+
{ { echo "$as_me:$LINENO: error: Invalid setting for --enable-doxygen-qt-help. Use \"yes\" or \"no\"" >&5
5365+
echo "$as_me: error: Invalid setting for --enable-doxygen-qt-help. Use \"yes\" or \"no\"" >&2;}
5366+
{ (exit 1); exit 1; }; } ;;
5367+
esac
5368+
51265369
# Check whether --enable-threads was given.
51275370
if test "${enable_threads+set}" = set; then
51285371
enableval=$enable_threads;
@@ -18610,6 +18853,24 @@ TARGET_HAS_JIT!$TARGET_HAS_JIT$ac_delim
1861018853
TARGETS_WITH_JIT!$TARGETS_WITH_JIT$ac_delim
1861118854
ENABLE_DOCS!$ENABLE_DOCS$ac_delim
1861218855
ENABLE_DOXYGEN!$ENABLE_DOXYGEN$ac_delim
18856+
enable_searchengine!$enable_searchengine$ac_delim
18857+
enable_external_search!$enable_external_search$ac_delim
18858+
enable_server_based_search!$enable_server_based_search$ac_delim
18859+
searchengine_url!$searchengine_url$ac_delim
18860+
extra_search_mappings!$extra_search_mappings$ac_delim
18861+
QHELPGENERATOR!$QHELPGENERATOR$ac_delim
18862+
llvm_doxygen_generate_qhp!$llvm_doxygen_generate_qhp$ac_delim
18863+
llvm_doxygen_qch_filename!$llvm_doxygen_qch_filename$ac_delim
18864+
llvm_doxygen_qhp_namespace!$llvm_doxygen_qhp_namespace$ac_delim
18865+
llvm_doxygen_qhelpgenerator_path!$llvm_doxygen_qhelpgenerator_path$ac_delim
18866+
llvm_doxygen_qhp_cust_filter_name!$llvm_doxygen_qhp_cust_filter_name$ac_delim
18867+
llvm_doxygen_qhp_cust_filter_attrs!$llvm_doxygen_qhp_cust_filter_attrs$ac_delim
18868+
clang_doxygen_generate_qhp!$clang_doxygen_generate_qhp$ac_delim
18869+
clang_doxygen_qch_filename!$clang_doxygen_qch_filename$ac_delim
18870+
clang_doxygen_qhp_namespace!$clang_doxygen_qhp_namespace$ac_delim
18871+
clang_doxygen_qhelpgenerator_path!$clang_doxygen_qhelpgenerator_path$ac_delim
18872+
clang_doxygen_qhp_cust_filter_name!$clang_doxygen_qhp_cust_filter_name$ac_delim
18873+
clang_doxygen_qhp_cust_filter_attrs!$clang_doxygen_qhp_cust_filter_attrs$ac_delim
1861318874
LLVM_ENABLE_THREADS!$LLVM_ENABLE_THREADS$ac_delim
1861418875
ENABLE_PTHREADS!$ENABLE_PTHREADS$ac_delim
1861518876
LLVM_ENABLE_ZLIB!$LLVM_ENABLE_ZLIB$ac_delim
@@ -18683,6 +18944,47 @@ MMAP_FILE!$MMAP_FILE$ac_delim
1868318944
SHLIBEXT!$SHLIBEXT$ac_delim
1868418945
LLVM_PREFIX!$LLVM_PREFIX$ac_delim
1868518946
LLVM_BINDIR!$LLVM_BINDIR$ac_delim
18947+
_ACEOF
18948+
18949+
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
18950+
break
18951+
elif $ac_last_try; then
18952+
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
18953+
echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
18954+
{ (exit 1); exit 1; }; }
18955+
else
18956+
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
18957+
fi
18958+
done
18959+
18960+
ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
18961+
if test -n "$ac_eof"; then
18962+
ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
18963+
ac_eof=`expr $ac_eof + 1`
18964+
fi
18965+
18966+
cat >>$CONFIG_STATUS <<_ACEOF
18967+
cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
18968+
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
18969+
_ACEOF
18970+
sed '
18971+
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
18972+
s/^/s,@/; s/!/@,|#_!!_#|/
18973+
:n
18974+
t n
18975+
s/'"$ac_delim"'$/,g/; t
18976+
s/$/\\/; p
18977+
N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
18978+
' >>$CONFIG_STATUS <conf$$subs.sed
18979+
rm -f conf$$subs.sed
18980+
cat >>$CONFIG_STATUS <<_ACEOF
18981+
CEOF$ac_eof
18982+
_ACEOF
18983+
18984+
18985+
ac_delim='%!_!# '
18986+
for ac_last_try in false false false false false :; do
18987+
cat >conf$$subs.sed <<_ACEOF
1868618988
LLVM_DATADIR!$LLVM_DATADIR$ac_delim
1868718989
LLVM_DOCSDIR!$LLVM_DOCSDIR$ac_delim
1868818990
LLVM_ETCDIR!$LLVM_ETCDIR$ac_delim
@@ -18702,7 +19004,7 @@ LIBOBJS!$LIBOBJS$ac_delim
1870219004
LTLIBOBJS!$LTLIBOBJS$ac_delim
1870319005
_ACEOF
1870419006

18705-
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
19007+
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
1870619008
break
1870719009
elif $ac_last_try; then
1870819010
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -18720,8 +19022,8 @@ if test -n "$ac_eof"; then
1872019022
fi
1872119023

1872219024
cat >>$CONFIG_STATUS <<_ACEOF
18723-
cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
18724-
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
19025+
cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
19026+
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
1872519027
_ACEOF
1872619028
sed '
1872719029
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
@@ -18734,6 +19036,8 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
1873419036
' >>$CONFIG_STATUS <conf$$subs.sed
1873519037
rm -f conf$$subs.sed
1873619038
cat >>$CONFIG_STATUS <<_ACEOF
19039+
:end
19040+
s/|#_!!_#|//g
1873719041
CEOF$ac_eof
1873819042
_ACEOF
1873919043

@@ -18981,7 +19285,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
1898119285
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
1898219286
s&@INSTALL@&$ac_INSTALL&;t t
1898319287
$ac_datarootdir_hack
18984-
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed 's/|#_!!_#|//g' >$tmp/out
19288+
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
1898519289

1898619290
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
1898719291
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

0 commit comments

Comments
 (0)